From 259bd5219513859c22f5273fb40b7e9d70896242 Mon Sep 17 00:00:00 2001 From: Duncan Mac-Vicar P Date: Wed, 6 Jun 2007 14:56:01 +0000 Subject: [PATCH] zypper port starts. zypp2 to zypp --- CMakeLists.txt | 2 +- devel/devel.dmacvicar/CacheStore_tp.cc | 4 ++-- devel/devel.dmacvicar/CachedSource_tp.cc | 4 ++-- devel/devel.dmacvicar/RepositoryManager_tp.cc | 10 +++++----- devel/devel.dmacvicar/YUMReader_tp.cc | 4 ++-- devel/devel.dmacvicar/mediaset.cc | 2 +- devel/devel.dmacvicar/sqlitetime.cc | 2 +- devel/devel.dmacvicar/target_iterate_by_kind.cc | 2 +- devel/devel.dmacvicar/testbed.cc | 4 ++-- devel/devel.jkupec/YUMParser_test.cc | 2 +- devel/devel.ma/Parse.cc | 6 +++--- tests/cache/CMakeLists.txt | 3 --- tests/cache/CacheInitializer_test.cc | 4 ++-- tests/cache/CacheQuery_test.cc | 4 ++-- tests/cache/CacheStore_test.cc | 6 +++--- tests/zypp/CMakeLists.txt | 2 +- tests/zypp/RepoManager_test.cc | 2 +- tools/cachetools/CMakeLists.txt | 1 - tools/cachetools/zypp-cache.cc | 2 +- 19 files changed, 31 insertions(+), 35 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f83bcd6..4ee839b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -178,7 +178,7 @@ INSTALL( FILES ${CMAKE_SOURCE_DIR}/cmake/modules/FindZypp.cmake DESTINATION ${CM #################################################################### ADD_SUBDIRECTORY( zypp ) -ADD_SUBDIRECTORY( zypp2 ) +#ADD_SUBDIRECTORY( zypp2 ) # do not build devel by default ADD_SUBDIRECTORY( devel EXCLUDE_FROM_ALL ) ADD_SUBDIRECTORY( tools ) diff --git a/devel/devel.dmacvicar/CacheStore_tp.cc b/devel/devel.dmacvicar/CacheStore_tp.cc index acfe3ae..20b8fb6 100644 --- a/devel/devel.dmacvicar/CacheStore_tp.cc +++ b/devel/devel.dmacvicar/CacheStore_tp.cc @@ -12,8 +12,8 @@ #include "zypp/detail/PackageImplIf.h" #include "zypp/Package.h" -#include "zypp2/cache/CacheInitializer.h" -#include "zypp2/cache/CacheStore.h" +#include "zypp/cache/CacheInitializer.h" +#include "zypp/cache/CacheStore.h" #include "zypp/data/ResolvableData.h" #include "zypp/data/RecordId.h" #include "zypp/capability/CapabilityImpl.h" diff --git a/devel/devel.dmacvicar/CachedSource_tp.cc b/devel/devel.dmacvicar/CachedSource_tp.cc index 59fc637..3343c76 100644 --- a/devel/devel.dmacvicar/CachedSource_tp.cc +++ b/devel/devel.dmacvicar/CachedSource_tp.cc @@ -10,8 +10,8 @@ #include "zypp/Product.h" #include "zypp/detail/PackageImplIf.h" #include "zypp/Package.h" -#include "zypp2/RepositoryFactory.h" -#include "zypp2/repo/cached/RepoImpl.h" +#include "zypp/RepositoryFactory.h" +#include "zypp/repo/cached/RepoImpl.h" #include "zypp/data/ResolvableData.h" using namespace std; diff --git a/devel/devel.dmacvicar/RepositoryManager_tp.cc b/devel/devel.dmacvicar/RepositoryManager_tp.cc index 21dc8a7..0b203f3 100644 --- a/devel/devel.dmacvicar/RepositoryManager_tp.cc +++ b/devel/devel.dmacvicar/RepositoryManager_tp.cc @@ -11,14 +11,14 @@ #include "zypp/Product.h" #include "zypp/detail/PackageImplIf.h" #include "zypp/Package.h" -#include "zypp2/RepositoryFactory.h" -#include "zypp2/RepoInfo.h" +#include "zypp/RepositoryFactory.h" +#include "zypp/RepoInfo.h" -#include "zypp2/repo/cached/RepoImpl.h" +#include "zypp/repo/cached/RepoImpl.h" #include "zypp/data/ResolvableData.h" -#include "zypp2/RepoManager.h" -#include "zypp2/RepoInfo.h" +#include "zypp/RepoManager.h" +#include "zypp/RepoInfo.h" using namespace std; diff --git a/devel/devel.dmacvicar/YUMReader_tp.cc b/devel/devel.dmacvicar/YUMReader_tp.cc index cfa0c98..df7a0a0 100644 --- a/devel/devel.dmacvicar/YUMReader_tp.cc +++ b/devel/devel.dmacvicar/YUMReader_tp.cc @@ -6,8 +6,8 @@ #include "zypp/data/ResolvableDataConsumer.h" #include "zypp/base/Measure.h" #include "zypp/detail/ResObjectFactory.h" -#include "zypp2/parser/yum/YUMParser.h" -#include "zypp2/repo/memory/PackageImpl.h" +#include "zypp/parser/yum/YUMParser.h" +#include "zypp/repo/memory/PackageImpl.h" #undef ZYPP_BASE_LOGGER_LOGGROUP diff --git a/devel/devel.dmacvicar/mediaset.cc b/devel/devel.dmacvicar/mediaset.cc index a4e2d75..49639ba 100644 --- a/devel/devel.dmacvicar/mediaset.cc +++ b/devel/devel.dmacvicar/mediaset.cc @@ -30,7 +30,7 @@ #include "zypp/ZYppFactory.h" #include "zypp/MediaSetAccess.h" -#include "zypp2/source/yum/YUMSourceCacher.h" +#include "zypp/source/yum/YUMSourceCacher.h" using namespace zypp::detail; diff --git a/devel/devel.dmacvicar/sqlitetime.cc b/devel/devel.dmacvicar/sqlitetime.cc index 60293aa..92db934 100644 --- a/devel/devel.dmacvicar/sqlitetime.cc +++ b/devel/devel.dmacvicar/sqlitetime.cc @@ -4,7 +4,7 @@ #include #include "sqlite3.h" -#include "zypp2/cache/sqlite3x/sqlite3x.hpp" +#include "zypp/cache/sqlite3x/sqlite3x.hpp" #include #include diff --git a/devel/devel.dmacvicar/target_iterate_by_kind.cc b/devel/devel.dmacvicar/target_iterate_by_kind.cc index a4e2d75..49639ba 100644 --- a/devel/devel.dmacvicar/target_iterate_by_kind.cc +++ b/devel/devel.dmacvicar/target_iterate_by_kind.cc @@ -30,7 +30,7 @@ #include "zypp/ZYppFactory.h" #include "zypp/MediaSetAccess.h" -#include "zypp2/source/yum/YUMSourceCacher.h" +#include "zypp/source/yum/YUMSourceCacher.h" using namespace zypp::detail; diff --git a/devel/devel.dmacvicar/testbed.cc b/devel/devel.dmacvicar/testbed.cc index 400bacb..9d3d0ef 100644 --- a/devel/devel.dmacvicar/testbed.cc +++ b/devel/devel.dmacvicar/testbed.cc @@ -10,8 +10,8 @@ #include "zypp/Product.h" #include "zypp/detail/PackageImplIf.h" #include "zypp/Package.h" -#include "zypp2/RepositoryFactory.h" -#include "zypp2/repo/cached/RepoImpl.h" +#include "zypp/RepositoryFactory.h" +#include "zypp/repo/cached/RepoImpl.h" #include "zypp/data/ResolvableData.h" using namespace std; diff --git a/devel/devel.jkupec/YUMParser_test.cc b/devel/devel.jkupec/YUMParser_test.cc index 584fb04..73df2dc 100644 --- a/devel/devel.jkupec/YUMParser_test.cc +++ b/devel/devel.jkupec/YUMParser_test.cc @@ -3,7 +3,7 @@ #include "zypp/base/Logger.h" #include "zypp/base/LogControl.h" #include "zypp/base/Measure.h" -#include "zypp2/cache/CacheStore.h" +#include "zypp/cache/CacheStore.h" #include "zypp/parser/yum/RepoParser.h" #undef ZYPP_BASE_LOGGER_LOGGROUP diff --git a/devel/devel.ma/Parse.cc b/devel/devel.ma/Parse.cc index 2fd4850..2556a71 100644 --- a/devel/devel.ma/Parse.cc +++ b/devel/devel.ma/Parse.cc @@ -29,8 +29,8 @@ #include "zypp/parser/susetags/ContentFileReader.h" #include "zypp/parser/susetags/RepoIndex.h" -#include "zypp2/parser/susetags/RepoParser.h" -#include "zypp2/cache/CacheStore.h" +#include "zypp/parser/susetags/RepoParser.h" +#include "zypp/cache/CacheStore.h" using namespace std; using namespace zypp; @@ -134,7 +134,7 @@ namespace zypp /////////////////////////////////////////////////////////////////// using namespace zypp::parser::susetags; -#include "zypp2/cache/CacheStore.h" +#include "zypp/cache/CacheStore.h" void consumeIndex( const parser::susetags::RepoIndex_Ptr & index_r ) { diff --git a/tests/cache/CMakeLists.txt b/tests/cache/CMakeLists.txt index 186a914..f755bdd 100644 --- a/tests/cache/CMakeLists.txt +++ b/tests/cache/CMakeLists.txt @@ -1,16 +1,13 @@ ADD_EXECUTABLE(CacheInitializer CacheInitializer_test.cc) TARGET_LINK_LIBRARIES(CacheInitializer boost_unit_test_framework ) -TARGET_LINK_LIBRARIES(CacheInitializer zypp2 ) TARGET_LINK_LIBRARIES(CacheInitializer zypp ) ADD_EXECUTABLE(CacheStore CacheStore_test.cc SimplePackagesParser.cc) TARGET_LINK_LIBRARIES(CacheStore boost_unit_test_framework ) -TARGET_LINK_LIBRARIES(CacheStore zypp2 ) TARGET_LINK_LIBRARIES(CacheStore zypp ) ADD_EXECUTABLE(CacheQuery CacheQuery_test.cc SimplePackagesParser.cc) TARGET_LINK_LIBRARIES(CacheQuery boost_unit_test_framework ) -TARGET_LINK_LIBRARIES(CacheQuery zypp2 ) TARGET_LINK_LIBRARIES(CacheQuery zypp ) ADD_TEST(CacheInitializer ${CMAKE_CURRENT_BINARY_DIR}/CacheInitializer ${CMAKE_CURRENT_SOURCE_DIR}/data ) diff --git a/tests/cache/CacheInitializer_test.cc b/tests/cache/CacheInitializer_test.cc index 02af27a..2220403 100644 --- a/tests/cache/CacheInitializer_test.cc +++ b/tests/cache/CacheInitializer_test.cc @@ -6,8 +6,8 @@ #include "zypp/base/Logger.h" #include "zypp/Arch.h" #include "zypp/TmpPath.h" -#include "zypp2/cache/CacheInitializer.h" -#include "zypp2/cache/sqlite3x/sqlite3x.hpp" +#include "zypp/cache/CacheInitializer.h" +#include "zypp/cache/sqlite3x/sqlite3x.hpp" // Boost.Test #include diff --git a/tests/cache/CacheQuery_test.cc b/tests/cache/CacheQuery_test.cc index cded069..baaeacf 100644 --- a/tests/cache/CacheQuery_test.cc +++ b/tests/cache/CacheQuery_test.cc @@ -13,9 +13,9 @@ #include "zypp/ZYppFactory.h" #include "zypp/TmpPath.h" -#include "zypp2/cache/CacheStore.h" +#include "zypp/cache/CacheStore.h" #include "zypp/data/ResolvableData.h" -#include "zypp2/cache/ResolvableQuery.h" +#include "zypp/cache/ResolvableQuery.h" #include "zypp/parser/yum/RepoParser.h" using namespace std; diff --git a/tests/cache/CacheStore_test.cc b/tests/cache/CacheStore_test.cc index 87aad66..ea7e73f 100644 --- a/tests/cache/CacheStore_test.cc +++ b/tests/cache/CacheStore_test.cc @@ -13,9 +13,9 @@ #include "zypp/base/Measure.h" #include "zypp/capability/CapabilityImpl.h" #include "zypp/data/ResolvableData.h" -#include "zypp2/cache/CacheStore.h" -#include "zypp2/RepoInfo.h" -#include "zypp2/repo/cached/RepoImpl.h" +#include "zypp/cache/CacheStore.h" +#include "zypp/RepoInfo.h" +#include "zypp/repo/cached/RepoImpl.h" #include "zypp/Url.h" #include "zypp/NVRA.h" #include "zypp/PathInfo.h" diff --git a/tests/zypp/CMakeLists.txt b/tests/zypp/CMakeLists.txt index edb6cdc..680316a 100644 --- a/tests/zypp/CMakeLists.txt +++ b/tests/zypp/CMakeLists.txt @@ -47,7 +47,7 @@ ADD_EXECUTABLE( FileChecker FileChecker_test.cc ) TARGET_LINK_LIBRARIES( FileChecker zypp boost_unit_test_framework ) ADD_EXECUTABLE( RepoManager RepoManager_test.cc ) -TARGET_LINK_LIBRARIES( RepoManager zypp zypp2 boost_unit_test_framework ) +TARGET_LINK_LIBRARIES( RepoManager zypp boost_unit_test_framework ) ADD_TEST(ArchTest ${CMAKE_CURRENT_BINARY_DIR}/Arch) ADD_TEST(UrlTest ${CMAKE_CURRENT_BINARY_DIR}/Url) diff --git a/tests/zypp/RepoManager_test.cc b/tests/zypp/RepoManager_test.cc index 0ae1a7a..f0a8158 100644 --- a/tests/zypp/RepoManager_test.cc +++ b/tests/zypp/RepoManager_test.cc @@ -11,7 +11,7 @@ #include "zypp/TmpPath.h" #include "zypp/ResStore.h" -#include "zypp2/RepoManager.h" +#include "zypp/RepoManager.h" #include #include diff --git a/tools/cachetools/CMakeLists.txt b/tools/cachetools/CMakeLists.txt index 1407164..7b412ca 100644 --- a/tools/cachetools/CMakeLists.txt +++ b/tools/cachetools/CMakeLists.txt @@ -5,7 +5,6 @@ zypp-cache.cc ADD_EXECUTABLE( zypp-cache ${zyppcache_SRC} ) TARGET_LINK_LIBRARIES( zypp-cache zypp ) -TARGET_LINK_LIBRARIES( zypp-cache zypp2 ) TARGET_LINK_LIBRARIES( zypp-cache xml2 ) #INSTALL(TARGETS zypp-query-pool RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/zypp ) \ No newline at end of file diff --git a/tools/cachetools/zypp-cache.cc b/tools/cachetools/zypp-cache.cc index 6ffd9fa..b6ba682 100644 --- a/tools/cachetools/zypp-cache.cc +++ b/tools/cachetools/zypp-cache.cc @@ -6,7 +6,7 @@ #include "zypp/ZYpp.h" #include "zypp/zypp_detail/ZYppReadOnlyHack.h" #include "zypp/ZYppFactory.h" -#include "zypp2/cache/CacheFSCK.h" +#include "zypp/cache/CacheFSCK.h" #undef ZYPP_BASE_LOGGER_LOGGROUP #define ZYPP_BASE_LOGGER_LOGGROUP "zypp-cache" -- 2.7.4