From 712e1cdd3078a55b99ff313d90c20af5ad9ab5bb Mon Sep 17 00:00:00 2001 From: Duncan Mac-Vicar P Date: Mon, 17 Jul 2006 11:46:31 +0000 Subject: [PATCH] move new classes to zypp2 to make a parallel refactoring --- Makefile.am | 2 +- configure.ac | 6 ++- testsuite/cache/Makefile.am | 2 +- zypp/Makefile.am | 2 +- zypp/source/yum/Makefile.am | 7 +-- zypp2/Makefile.am | 54 ++++++++++++++++++++++ {zypp => zypp2}/cache/KnownSourcesCache.cpp | 0 {zypp => zypp2}/cache/KnownSourcesCache.h | 0 {zypp => zypp2}/cache/Makefile.am | 8 ++-- {zypp => zypp2}/cache/SourceCache.cpp | 0 {zypp => zypp2}/cache/SourceCache.h | 0 {zypp => zypp2}/cache/SourceCacheInitializer.cpp | 0 {zypp => zypp2}/cache/SourceCacheInitializer.h | 0 {zypp => zypp2}/cache/SourceCacher.cpp | 0 {zypp => zypp2}/cache/SourceCacher.h | 0 {zypp => zypp2}/cache/Utils.cpp | 0 {zypp => zypp2}/cache/Utils.h | 0 {zypp => zypp2}/cache/sqlite3x/Makefile.am | 6 +-- {zypp => zypp2}/cache/sqlite3x/sqlite3x.hpp | 0 .../cache/sqlite3x/sqlite3x_command.cpp | 0 .../cache/sqlite3x/sqlite3x_connection.cpp | 0 .../cache/sqlite3x/sqlite3x_exception.cpp | 0 {zypp => zypp2}/cache/sqlite3x/sqlite3x_reader.cpp | 0 .../cache/sqlite3x/sqlite3x_transaction.cpp | 0 zypp2/source/Makefile.am | 24 ++++++++++ zypp2/source/yum/Makefile.am | 24 ++++++++++ {zypp => zypp2}/source/yum/YUMSourceCacher.cc | 0 {zypp => zypp2}/source/yum/YUMSourceCacher.h | 0 28 files changed, 118 insertions(+), 17 deletions(-) create mode 100644 zypp2/Makefile.am rename {zypp => zypp2}/cache/KnownSourcesCache.cpp (100%) rename {zypp => zypp2}/cache/KnownSourcesCache.h (100%) rename {zypp => zypp2}/cache/Makefile.am (63%) rename {zypp => zypp2}/cache/SourceCache.cpp (100%) rename {zypp => zypp2}/cache/SourceCache.h (100%) rename {zypp => zypp2}/cache/SourceCacheInitializer.cpp (100%) rename {zypp => zypp2}/cache/SourceCacheInitializer.h (100%) rename {zypp => zypp2}/cache/SourceCacher.cpp (100%) rename {zypp => zypp2}/cache/SourceCacher.h (100%) rename {zypp => zypp2}/cache/Utils.cpp (100%) rename {zypp => zypp2}/cache/Utils.h (100%) rename {zypp => zypp2}/cache/sqlite3x/Makefile.am (66%) rename {zypp => zypp2}/cache/sqlite3x/sqlite3x.hpp (100%) rename {zypp => zypp2}/cache/sqlite3x/sqlite3x_command.cpp (100%) rename {zypp => zypp2}/cache/sqlite3x/sqlite3x_connection.cpp (100%) rename {zypp => zypp2}/cache/sqlite3x/sqlite3x_exception.cpp (100%) rename {zypp => zypp2}/cache/sqlite3x/sqlite3x_reader.cpp (100%) rename {zypp => zypp2}/cache/sqlite3x/sqlite3x_transaction.cpp (100%) create mode 100644 zypp2/source/Makefile.am create mode 100644 zypp2/source/yum/Makefile.am rename {zypp => zypp2}/source/yum/YUMSourceCacher.cc (100%) rename {zypp => zypp2}/source/yum/YUMSourceCacher.h (100%) diff --git a/Makefile.am b/Makefile.am index 72b7d3e..12d907a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,7 +4,7 @@ # Do NOT list 'devel' in subdirs. It's developers playgound # and must not prevent anything from building. -SUBDIRS = zypp testsuite po doc +SUBDIRS = zypp zypp2 testsuite po doc ## ################################################## diff --git a/configure.ac b/configure.ac index fa4f472..bbe93a7 100644 --- a/configure.ac +++ b/configure.ac @@ -254,8 +254,10 @@ AC_OUTPUT( po/Makefile.in\ zypp/solver/Makefile \ zypp/solver/detail/Makefile \ zypp/data/Makefile \ - zypp/cache/Makefile \ - zypp/cache/sqlite3x/Makefile + zypp2/cache/Makefile \ + zypp2/cache/sqlite3x/Makefile + zypp2/source/Makefile \ + zypp2/source/yum/Makefile \ zypp/source/Makefile \ zypp/source/plaindir/Makefile \ zypp/source/susetags/Makefile \ diff --git a/testsuite/cache/Makefile.am b/testsuite/cache/Makefile.am index 8912f63..8b0134b 100644 --- a/testsuite/cache/Makefile.am +++ b/testsuite/cache/Makefile.am @@ -13,7 +13,7 @@ check_PROGRAMS = SourceCacheInitializer ## ################################################## -LDADD = $(top_srcdir)/zypp/lib@PACKAGE@.la +LDADD = $(top_srcdir)/zypp/lib@PACKAGE@.la $(top_srcdir)/zypp/lib@PACKAGE@2.la ## ################################################## diff --git a/zypp/Makefile.am b/zypp/Makefile.am index 3af75ff..26b8c19 100644 --- a/zypp/Makefile.am +++ b/zypp/Makefile.am @@ -2,7 +2,7 @@ ## ################################################## SUBDIRS = base thread url media capability detail pool parser \ - data source cache target solver zypp_detail ui + data source target solver zypp_detail ui AM_CXXFLAGS = -DZYPP_BASE_LOGGER_LOGGROUP=\"zypp\" diff --git a/zypp/source/yum/Makefile.am b/zypp/source/yum/Makefile.am index db6862d..ea9a15f 100644 --- a/zypp/source/yum/Makefile.am +++ b/zypp/source/yum/Makefile.am @@ -19,9 +19,7 @@ sourceyuminclude_HEADERS = \ YUMPatchImpl.h \ YUMGroupImpl.h \ YUMPatternImpl.h \ - YUMProductImpl.h \ - YUMSourceCacher.h - + YUMProductImpl.h noinst_LTLIBRARIES = lib@PACKAGE@_source_yum.la @@ -36,7 +34,6 @@ lib@PACKAGE@_source_yum_la_SOURCES = \ YUMPatchImpl.cc \ YUMGroupImpl.cc \ YUMPatternImpl.cc \ - YUMProductImpl.cc \ - YUMSourceCacher.cc + YUMProductImpl.cc ## ################################################## diff --git a/zypp2/Makefile.am b/zypp2/Makefile.am new file mode 100644 index 0000000..6d499a6 --- /dev/null +++ b/zypp2/Makefile.am @@ -0,0 +1,54 @@ +## Process this file with automake to produce Makefile.in +## ################################################## + +SUBDIRS = cache + +AM_CXXFLAGS = -DZYPP_BASE_LOGGER_LOGGROUP=\"zypp2\" + +## ################################################## + +pkginclude_HEADERS = + +## ################################################## + +lib_LTLIBRARIES = lib@PACKAGE@2.la + +## ################################################## + +lib@PACKAGE@2_la_SOURCES = + +lib@PACKAGE@_la_LDFLAGS = @LIBZYPP_VERSION_INFO@ + +lib@PACKAGE@_la_LIBADD = cache/lib@PACKAGE@2_cache.la \ + -lboost_filesystem \ + -lsqlite3 \ + -lutil +# !!! base/lib@PACKAGE@_base.la MUST BE THE LAST zypp lib linked + +## ################################################## + +EXTRA_DIST = @DOXYGEN/* + +# + +# Automatically inserted by insert_install_target +# DO NOT REMOVE THE TAGS! + +# Install header files only if different to version already installed - +# prevent unnecessary installations to keep make dependency changes +# and thus rebuilds for dependent packages as low as possible. + +install-pkgincludeHEADERS: $(pkginclude_HEADERS) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(pkgincludedir) + @list='$(pkginclude_HEADERS)'; \ + for p in $$list; do \ + if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \ + if ! cmp -s $$d$$p $(DESTDIR)$(pkgincludedir)/$$p; then \ + echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgincludedir)/$$p"; \ + $(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgincludedir)/$$p; \ + fi \ + done + +# + diff --git a/zypp/cache/KnownSourcesCache.cpp b/zypp2/cache/KnownSourcesCache.cpp similarity index 100% rename from zypp/cache/KnownSourcesCache.cpp rename to zypp2/cache/KnownSourcesCache.cpp diff --git a/zypp/cache/KnownSourcesCache.h b/zypp2/cache/KnownSourcesCache.h similarity index 100% rename from zypp/cache/KnownSourcesCache.h rename to zypp2/cache/KnownSourcesCache.h diff --git a/zypp/cache/Makefile.am b/zypp2/cache/Makefile.am similarity index 63% rename from zypp/cache/Makefile.am rename to zypp2/cache/Makefile.am index 5a60eed..0c72f14 100644 --- a/zypp/cache/Makefile.am +++ b/zypp2/cache/Makefile.am @@ -10,15 +10,15 @@ cacheinclude_HEADERS = SourceCache.h SourceCacheInitializer.h SourceCacher.h Kno ## ################################################## -noinst_LTLIBRARIES = lib@PACKAGE@_cache.la +noinst_LTLIBRARIES = lib@PACKAGE@2_cache.la ## ################################################## -lib@PACKAGE@_cache_la_SOURCES = SourceCache.cpp SourceCacheInitializer.cpp SourceCacher.cpp KnownSourcesCache.cpp Utils.cpp +lib@PACKAGE@2_cache_la_SOURCES = SourceCache.cpp SourceCacheInitializer.cpp SourceCacher.cpp KnownSourcesCache.cpp Utils.cpp -lib@PACKAGE@_cache_la_LDFLAGS = @LIBZYPP_VERSION_INFO@ +lib@PACKAGE@2_cache_la_LDFLAGS = @LIBZYPP_VERSION_INFO@ -lib@PACKAGE@_cache_la_LIBADD = sqlite3x/lib@PACKAGE@_sqlite3x.la +lib@PACKAGE@2_cache_la_LIBADD = sqlite3x/lib@PACKAGE@2_sqlite3x.la ## hal/lib@PACKAGE@_cache_hal.la \ ## modalias/lib@PACKAGE@_cache_modalias.la \ ## store/lib@PACKAGE@_cache_store.la diff --git a/zypp/cache/SourceCache.cpp b/zypp2/cache/SourceCache.cpp similarity index 100% rename from zypp/cache/SourceCache.cpp rename to zypp2/cache/SourceCache.cpp diff --git a/zypp/cache/SourceCache.h b/zypp2/cache/SourceCache.h similarity index 100% rename from zypp/cache/SourceCache.h rename to zypp2/cache/SourceCache.h diff --git a/zypp/cache/SourceCacheInitializer.cpp b/zypp2/cache/SourceCacheInitializer.cpp similarity index 100% rename from zypp/cache/SourceCacheInitializer.cpp rename to zypp2/cache/SourceCacheInitializer.cpp diff --git a/zypp/cache/SourceCacheInitializer.h b/zypp2/cache/SourceCacheInitializer.h similarity index 100% rename from zypp/cache/SourceCacheInitializer.h rename to zypp2/cache/SourceCacheInitializer.h diff --git a/zypp/cache/SourceCacher.cpp b/zypp2/cache/SourceCacher.cpp similarity index 100% rename from zypp/cache/SourceCacher.cpp rename to zypp2/cache/SourceCacher.cpp diff --git a/zypp/cache/SourceCacher.h b/zypp2/cache/SourceCacher.h similarity index 100% rename from zypp/cache/SourceCacher.h rename to zypp2/cache/SourceCacher.h diff --git a/zypp/cache/Utils.cpp b/zypp2/cache/Utils.cpp similarity index 100% rename from zypp/cache/Utils.cpp rename to zypp2/cache/Utils.cpp diff --git a/zypp/cache/Utils.h b/zypp2/cache/Utils.h similarity index 100% rename from zypp/cache/Utils.h rename to zypp2/cache/Utils.h diff --git a/zypp/cache/sqlite3x/Makefile.am b/zypp2/cache/sqlite3x/Makefile.am similarity index 66% rename from zypp/cache/sqlite3x/Makefile.am rename to zypp2/cache/sqlite3x/Makefile.am index 5543f97..76f3c16 100644 --- a/zypp/cache/sqlite3x/Makefile.am +++ b/zypp2/cache/sqlite3x/Makefile.am @@ -10,11 +10,11 @@ sqlite3xinclude_HEADERS = sqlite3x.hpp ## ################################################## -noinst_LTLIBRARIES = lib@PACKAGE@_sqlite3x.la +noinst_LTLIBRARIES = lib@PACKAGE@2_sqlite3x.la ## ################################################## -lib@PACKAGE@_sqlite3x_la_SOURCES = sqlite3x_command.cpp sqlite3x_connection.cpp \ +lib@PACKAGE@2_sqlite3x_la_SOURCES = sqlite3x_command.cpp sqlite3x_connection.cpp \ sqlite3x_exception.cpp sqlite3x_reader.cpp sqlite3x_transaction.cpp -lib@PACKAGE@_sqlite3x_la_LDFLAGS = -lsqlite3 @LIBZYPP_VERSION_INFO@ +lib@PACKAGE@2_sqlite3x_la_LDFLAGS = -lsqlite3 @LIBZYPP_VERSION_INFO@ diff --git a/zypp/cache/sqlite3x/sqlite3x.hpp b/zypp2/cache/sqlite3x/sqlite3x.hpp similarity index 100% rename from zypp/cache/sqlite3x/sqlite3x.hpp rename to zypp2/cache/sqlite3x/sqlite3x.hpp diff --git a/zypp/cache/sqlite3x/sqlite3x_command.cpp b/zypp2/cache/sqlite3x/sqlite3x_command.cpp similarity index 100% rename from zypp/cache/sqlite3x/sqlite3x_command.cpp rename to zypp2/cache/sqlite3x/sqlite3x_command.cpp diff --git a/zypp/cache/sqlite3x/sqlite3x_connection.cpp b/zypp2/cache/sqlite3x/sqlite3x_connection.cpp similarity index 100% rename from zypp/cache/sqlite3x/sqlite3x_connection.cpp rename to zypp2/cache/sqlite3x/sqlite3x_connection.cpp diff --git a/zypp/cache/sqlite3x/sqlite3x_exception.cpp b/zypp2/cache/sqlite3x/sqlite3x_exception.cpp similarity index 100% rename from zypp/cache/sqlite3x/sqlite3x_exception.cpp rename to zypp2/cache/sqlite3x/sqlite3x_exception.cpp diff --git a/zypp/cache/sqlite3x/sqlite3x_reader.cpp b/zypp2/cache/sqlite3x/sqlite3x_reader.cpp similarity index 100% rename from zypp/cache/sqlite3x/sqlite3x_reader.cpp rename to zypp2/cache/sqlite3x/sqlite3x_reader.cpp diff --git a/zypp/cache/sqlite3x/sqlite3x_transaction.cpp b/zypp2/cache/sqlite3x/sqlite3x_transaction.cpp similarity index 100% rename from zypp/cache/sqlite3x/sqlite3x_transaction.cpp rename to zypp2/cache/sqlite3x/sqlite3x_transaction.cpp diff --git a/zypp2/source/Makefile.am b/zypp2/source/Makefile.am new file mode 100644 index 0000000..ceed323 --- /dev/null +++ b/zypp2/source/Makefile.am @@ -0,0 +1,24 @@ +## Process this file with automake to produce Makefile.in +## ################################################## + +SUBDIRS = yum + +INCLUDES = \ + -DZYPP_BASE_LOGGER_LOGGROUP=\"source2\" + +## ################################################## + +sourceincludedir = $(pkgincludedir)/source + +sourceinclude_HEADERS = + +noinst_LTLIBRARIES = lib@PACKAGE@2_source.la + +## ################################################## + +lib@PACKAGE@2_source_la_SOURCES = + +lib@PACKAGE@_source_la_LIBADD = \ + yum/lib@PACKAGE@2_source_yum.la + +## ################################################## diff --git a/zypp2/source/yum/Makefile.am b/zypp2/source/yum/Makefile.am new file mode 100644 index 0000000..4dc9b63 --- /dev/null +++ b/zypp2/source/yum/Makefile.am @@ -0,0 +1,24 @@ +## Process this file with automake to produce Makefile.in +## ################################################## + +SUBDIRS = + +INCLUDES = \ + -DZYPP_BASE_LOGGER_LOGGROUP=\"yum\" + +## ################################################## + +sourceyumincludedir = $(pkgincludedir)/source/yum + +sourceyuminclude_HEADERS = \ + YUMSourceCacher.h + + +noinst_LTLIBRARIES = lib@PACKAGE@2_source_yum.la + +## ################################################## + +lib@PACKAGE@2_source_yum_la_SOURCES = \ + YUMSourceCacher.cc + +## ################################################## diff --git a/zypp/source/yum/YUMSourceCacher.cc b/zypp2/source/yum/YUMSourceCacher.cc similarity index 100% rename from zypp/source/yum/YUMSourceCacher.cc rename to zypp2/source/yum/YUMSourceCacher.cc diff --git a/zypp/source/yum/YUMSourceCacher.h b/zypp2/source/yum/YUMSourceCacher.h similarity index 100% rename from zypp/source/yum/YUMSourceCacher.h rename to zypp2/source/yum/YUMSourceCacher.h -- 2.7.4