Author: dmacvicar
Date: Wed May 23 14:32:01 2007
New Revision: 5608
URL: http://svn.opensuse.org/viewcvs/zypp?rev=5608&view=rev
Log:
- generate schema.h with schema.sql data during build.
this way, the schema can still be maintained out of code
but during built t is grabed in code, so testcases don't
need the schema installed for example.
Added:
trunk/libzypp/zypp2/cache/schema/mkarray.c
Removed:
trunk/libzypp/zypp2/Lazy.cc
trunk/libzypp/zypp2/Lazy.h
Modified:
trunk/libzypp/zypp2/CMakeLists.txt
trunk/libzypp/zypp2/cache/CacheInitializer.cpp
Modified: trunk/libzypp/zypp2/CMakeLists.txt
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp2/CMakeLists.txt?rev=5608&r1=5607&r2=5608&view=diff
==============================================================================
--- trunk/libzypp/zypp2/CMakeLists.txt (original)
+++ trunk/libzypp/zypp2/CMakeLists.txt Wed May 23 14:32:01 2007
@@ -8,13 +8,17 @@
# SOURCES #
####################################################################
+ADD_EXECUTABLE(mkarray ${CMAKE_SOURCE_DIR}/zypp2/cache/schema/mkarray.c )
+
+#FILE(WRITE filename "message to write"... )
+
+ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_BINARY_DIR}/zypp2/schema.h PRE_BUILD COMMAND "${CMAKE_BINARY_DIR}/zypp2/mkarray" ARGS "${CMAKE_SOURCE_DIR}/zypp2/cache/schema/schema.sql" "schemaData" "${CMAKE_BINARY_DIR}/zypp2/schema.h" DEPENDS mkarray)
SET( zypp2_SRCS
Repository.cc
RepositoryInfo.cc
RepositoryManager.cc
RepositoryFactory.cc
- Lazy.cc
dummy.cc
)
@@ -24,7 +28,6 @@
RepositoryManager.h
RepositoryFactory.h
CommiterIface.h
- Lazy.h
)
#INSTALL( FILES ${zypp2_HEADERS}
@@ -32,6 +35,7 @@
#)
SET( zypp2_cache_SRCS
+ ${CMAKE_BINARY_DIR}/zypp2/schema.h
cache/CacheInitializer.cpp
cache/CacheTypes.cc
# cache/QueryFactory.cc
@@ -112,14 +116,6 @@
repository/memory/DSrcPackageImpl.h
)
-SET( zypp2_parser_susetags_SRCS
- parser/susetags/RepoParser.cc
-)
-
-SET( zypp2_parser_susetags_HEADERS
- parser/susetags/RepoParser.h
-)
-
SET( zypp2_parser_yum_SRCS
parser/yum/YUMParser.cc
)
@@ -141,7 +137,6 @@
${zypp2_repository_cached_SRCS}
${zypp2_repository_data_SRCS}
${zypp2_cache_sqlite3x_SRCS}
-${zypp2_parser_susetags_SRCS}
${zypp2_parser_yum_SRCS}
)
@@ -150,11 +145,11 @@
${zypp2_HEADERS}
${zypp2_cache_HEADERS}
${zypp2_cache_sqlite3x_HEADERS}
-${zypp2_parser_susetags_HEADERS}
${zypp2_parser_yum_HEADERS}
)
ADD_LIBRARY(zypp2 SHARED ${zypp2_lib_SRCS})
+ADD_DEPENDENCIES(zypp2 schema_header)
# System libraries
TARGET_LINK_LIBRARIES(zypp2 boost_filesystem boost_regex util )
Modified: trunk/libzypp/zypp2/cache/CacheInitializer.cpp
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp2/cache/CacheInitializer.cpp?rev=5608&r1=5607&r2=5608&view=diff
==============================================================================
--- trunk/libzypp/zypp2/cache/CacheInitializer.cpp (original)
+++ trunk/libzypp/zypp2/cache/CacheInitializer.cpp Wed May 23 14:32:01 2007
@@ -19,6 +19,8 @@
#include "zypp/target/store/PersistentStorage.h"
#include "zypp2/cache/Utils.h"
+#include "schema.h"
+
#define ZYPP_DB_FILE "/var/lib/zypp/zypp.db"
using namespace sqlite3x;
Added: trunk/libzypp/zypp2/cache/schema/mkarray.c
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp2/cache/schema/mkarray.c?rev=5608&view=auto
==============================================================================
--- trunk/libzypp/zypp2/cache/schema/mkarray.c (added)
+++ trunk/libzypp/zypp2/cache/schema/mkarray.c Wed May 23 14:32:01 2007
@@ -0,0 +1,134 @@
+/*
+ * mkarray - make a c array containing the input file.
+ *
+ * this file is part of the makeutil package:
+ * http://sourceforge.net/projects/makeutil/
+ * http://www.cybermesa.com/~aisa/makeutil/
+ *
+ * this file is hereby placed in the public domain.
+ * aisa0@users.sourceforge.net, aisa@cybermesa.com
+ */
+
+static char rcsid[]="$Id: mkarray.c,v 1.2 2004/12/11 18:21:51 aisa0 Exp $";
+
+#include