projects
/
platform
/
upstream
/
libzypp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
cfd6bcb
)
zypper port starts. zypp2 to zypp
author
Duncan Mac-Vicar P
<dmacvicar@suse.de>
Wed, 6 Jun 2007 14:56:01 +0000
(14:56 +0000)
committer
Duncan Mac-Vicar P
<dmacvicar@suse.de>
Wed, 6 Jun 2007 14:56:01 +0000
(14:56 +0000)
19 files changed:
CMakeLists.txt
patch
|
blob
|
history
devel/devel.dmacvicar/CacheStore_tp.cc
patch
|
blob
|
history
devel/devel.dmacvicar/CachedSource_tp.cc
patch
|
blob
|
history
devel/devel.dmacvicar/RepositoryManager_tp.cc
patch
|
blob
|
history
devel/devel.dmacvicar/YUMReader_tp.cc
patch
|
blob
|
history
devel/devel.dmacvicar/mediaset.cc
patch
|
blob
|
history
devel/devel.dmacvicar/sqlitetime.cc
patch
|
blob
|
history
devel/devel.dmacvicar/target_iterate_by_kind.cc
patch
|
blob
|
history
devel/devel.dmacvicar/testbed.cc
patch
|
blob
|
history
devel/devel.jkupec/YUMParser_test.cc
patch
|
blob
|
history
devel/devel.ma/Parse.cc
patch
|
blob
|
history
tests/cache/CMakeLists.txt
patch
|
blob
|
history
tests/cache/CacheInitializer_test.cc
patch
|
blob
|
history
tests/cache/CacheQuery_test.cc
patch
|
blob
|
history
tests/cache/CacheStore_test.cc
patch
|
blob
|
history
tests/zypp/CMakeLists.txt
patch
|
blob
|
history
tests/zypp/RepoManager_test.cc
patch
|
blob
|
history
tools/cachetools/CMakeLists.txt
patch
|
blob
|
history
tools/cachetools/zypp-cache.cc
patch
|
blob
|
history
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
f83bcd6
..
4ee839b
100644
(file)
--- 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( zypp )
-ADD_SUBDIRECTORY( zypp2 )
+
#
ADD_SUBDIRECTORY( zypp2 )
# do not build devel by default
ADD_SUBDIRECTORY( devel EXCLUDE_FROM_ALL )
ADD_SUBDIRECTORY( tools )
# 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
(file)
--- 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 "zypp/detail/PackageImplIf.h"
#include "zypp/Package.h"
-#include "zypp
2
/cache/CacheInitializer.h"
-#include "zypp
2
/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"
#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
(file)
--- 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 "zypp/Product.h"
#include "zypp/detail/PackageImplIf.h"
#include "zypp/Package.h"
-#include "zypp
2
/RepositoryFactory.h"
-#include "zypp
2
/repo/cached/RepoImpl.h"
+#include "zypp/RepositoryFactory.h"
+#include "zypp/repo/cached/RepoImpl.h"
#include "zypp/data/ResolvableData.h"
using namespace std;
#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
(file)
--- 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 "zypp/Product.h"
#include "zypp/detail/PackageImplIf.h"
#include "zypp/Package.h"
-#include "zypp
2
/RepositoryFactory.h"
-#include "zypp
2
/RepoInfo.h"
+#include "zypp/RepositoryFactory.h"
+#include "zypp/RepoInfo.h"
-#include "zypp
2
/repo/cached/RepoImpl.h"
+#include "zypp/repo/cached/RepoImpl.h"
#include "zypp/data/ResolvableData.h"
#include "zypp/data/ResolvableData.h"
-#include "zypp
2
/RepoManager.h"
-#include "zypp
2
/RepoInfo.h"
+#include "zypp/RepoManager.h"
+#include "zypp/RepoInfo.h"
using namespace std;
using namespace std;
diff --git
a/devel/devel.dmacvicar/YUMReader_tp.cc
b/devel/devel.dmacvicar/YUMReader_tp.cc
index
cfa0c98
..
df7a0a0
100644
(file)
--- 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 "zypp/data/ResolvableDataConsumer.h"
#include "zypp/base/Measure.h"
#include "zypp/detail/ResObjectFactory.h"
-#include "zypp
2
/parser/yum/YUMParser.h"
-#include "zypp
2
/repo/memory/PackageImpl.h"
+#include "zypp/parser/yum/YUMParser.h"
+#include "zypp/repo/memory/PackageImpl.h"
#undef ZYPP_BASE_LOGGER_LOGGROUP
#undef ZYPP_BASE_LOGGER_LOGGROUP
diff --git
a/devel/devel.dmacvicar/mediaset.cc
b/devel/devel.dmacvicar/mediaset.cc
index
a4e2d75
..
49639ba
100644
(file)
--- 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 "zypp/ZYppFactory.h"
#include "zypp/MediaSetAccess.h"
-#include "zypp
2
/source/yum/YUMSourceCacher.h"
+#include "zypp/source/yum/YUMSourceCacher.h"
using namespace zypp::detail;
using namespace zypp::detail;
diff --git
a/devel/devel.dmacvicar/sqlitetime.cc
b/devel/devel.dmacvicar/sqlitetime.cc
index
60293aa
..
92db934
100644
(file)
--- a/
devel/devel.dmacvicar/sqlitetime.cc
+++ b/
devel/devel.dmacvicar/sqlitetime.cc
@@
-4,7
+4,7
@@
#include <fstream>
#include "sqlite3.h"
#include <fstream>
#include "sqlite3.h"
-#include "zypp
2
/cache/sqlite3x/sqlite3x.hpp"
+#include "zypp/cache/sqlite3x/sqlite3x.hpp"
#include <zypp/base/Logger.h>
#include <zypp/base/Measure.h>
#include <zypp/base/Logger.h>
#include <zypp/base/Measure.h>
diff --git
a/devel/devel.dmacvicar/target_iterate_by_kind.cc
b/devel/devel.dmacvicar/target_iterate_by_kind.cc
index
a4e2d75
..
49639ba
100644
(file)
--- 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 "zypp/ZYppFactory.h"
#include "zypp/MediaSetAccess.h"
-#include "zypp
2
/source/yum/YUMSourceCacher.h"
+#include "zypp/source/yum/YUMSourceCacher.h"
using namespace zypp::detail;
using namespace zypp::detail;
diff --git
a/devel/devel.dmacvicar/testbed.cc
b/devel/devel.dmacvicar/testbed.cc
index
400bacb
..
9d3d0ef
100644
(file)
--- 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 "zypp/Product.h"
#include "zypp/detail/PackageImplIf.h"
#include "zypp/Package.h"
-#include "zypp
2
/RepositoryFactory.h"
-#include "zypp
2
/repo/cached/RepoImpl.h"
+#include "zypp/RepositoryFactory.h"
+#include "zypp/repo/cached/RepoImpl.h"
#include "zypp/data/ResolvableData.h"
using namespace std;
#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
(file)
--- 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 "zypp/base/Logger.h"
#include "zypp/base/LogControl.h"
#include "zypp/base/Measure.h"
-#include "zypp
2
/cache/CacheStore.h"
+#include "zypp/cache/CacheStore.h"
#include "zypp/parser/yum/RepoParser.h"
#undef ZYPP_BASE_LOGGER_LOGGROUP
#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
(file)
--- 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 "zypp/parser/susetags/ContentFileReader.h"
#include "zypp/parser/susetags/RepoIndex.h"
-#include "zypp
2
/parser/susetags/RepoParser.h"
-#include "zypp
2
/cache/CacheStore.h"
+#include "zypp/parser/susetags/RepoParser.h"
+#include "zypp/cache/CacheStore.h"
using namespace std;
using namespace zypp;
using namespace std;
using namespace zypp;
@@
-134,7
+134,7
@@
namespace zypp
///////////////////////////////////////////////////////////////////
using namespace zypp::parser::susetags;
///////////////////////////////////////////////////////////////////
using namespace zypp::parser::susetags;
-#include "zypp
2
/cache/CacheStore.h"
+#include "zypp/cache/CacheStore.h"
void consumeIndex( const parser::susetags::RepoIndex_Ptr & index_r )
{
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
(file)
--- 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 )
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(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(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 )
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
(file)
--- 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 "zypp/base/Logger.h"
#include "zypp/Arch.h"
#include "zypp/TmpPath.h"
-#include "zypp
2
/cache/CacheInitializer.h"
-#include "zypp
2
/cache/sqlite3x/sqlite3x.hpp"
+#include "zypp/cache/CacheInitializer.h"
+#include "zypp/cache/sqlite3x/sqlite3x.hpp"
// Boost.Test
#include <boost/test/floating_point_comparison.hpp>
// Boost.Test
#include <boost/test/floating_point_comparison.hpp>
diff --git
a/tests/cache/CacheQuery_test.cc
b/tests/cache/CacheQuery_test.cc
index
cded069
..
baaeacf
100644
(file)
--- 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 "zypp/ZYppFactory.h"
#include "zypp/TmpPath.h"
-#include "zypp
2
/cache/CacheStore.h"
+#include "zypp/cache/CacheStore.h"
#include "zypp/data/ResolvableData.h"
#include "zypp/data/ResolvableData.h"
-#include "zypp
2
/cache/ResolvableQuery.h"
+#include "zypp/cache/ResolvableQuery.h"
#include "zypp/parser/yum/RepoParser.h"
using namespace std;
#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
(file)
--- 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 "zypp/base/Measure.h"
#include "zypp/capability/CapabilityImpl.h"
#include "zypp/data/ResolvableData.h"
-#include "zypp
2
/cache/CacheStore.h"
-#include "zypp
2
/RepoInfo.h"
-#include "zypp
2
/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"
#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
(file)
--- 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( 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)
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
(file)
--- 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 "zypp/TmpPath.h"
#include "zypp/ResStore.h"
-#include "zypp
2
/RepoManager.h"
+#include "zypp/RepoManager.h"
#include <boost/test/unit_test.hpp>
#include <boost/test/parameterized_test.hpp>
#include <boost/test/unit_test.hpp>
#include <boost/test/parameterized_test.hpp>
diff --git
a/tools/cachetools/CMakeLists.txt
b/tools/cachetools/CMakeLists.txt
index
1407164
..
7b412ca
100644
(file)
--- 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 )
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
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
(file)
--- 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 "zypp/ZYpp.h"
#include "zypp/zypp_detail/ZYppReadOnlyHack.h"
#include "zypp/ZYppFactory.h"
-#include "zypp
2
/cache/CacheFSCK.h"
+#include "zypp/cache/CacheFSCK.h"
#undef ZYPP_BASE_LOGGER_LOGGROUP
#define ZYPP_BASE_LOGGER_LOGGROUP "zypp-cache"
#undef ZYPP_BASE_LOGGER_LOGGROUP
#define ZYPP_BASE_LOGGER_LOGGROUP "zypp-cache"