Remove obsolete UpgradeStatistics class from libzypp.
[platform/upstream/libzypp.git] / zypp / CMakeLists.txt
index 3507f0e..b61ef9c 100644 (file)
 # SOURCES                                                          #
 ####################################################################
 
-ADD_DEFINITIONS(-DLOCALEDIR=\\\"${CMAKE_INSTALL_PREFIX}/share/locale\\\" -DTEXTDOMAIN=\\\"zypp\\\" )
+ADD_DEFINITIONS(-DLOCALEDIR="${CMAKE_INSTALL_PREFIX}/share/locale" -DTEXTDOMAIN="zypp" )
 
-ADD_EXECUTABLE(mkarray ${CMAKE_SOURCE_DIR}/zypp/cache/schema/mkarray.c )
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
 #FILE(WRITE filename "message to write"... )
 
-ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_BINARY_DIR}/zypp/sqlite-schema.h PRE_BUILD COMMAND "${CMAKE_BINARY_DIR}/zypp/mkarray" ARGS "${CMAKE_SOURCE_DIR}/zypp/cache/schema/schema.sql" "schemaData" "${CMAKE_BINARY_DIR}/zypp/sqlite-schema.h" DEPENDS mkarray DEPENDS ${CMAKE_SOURCE_DIR}/zypp/cache/schema/schema.sql )
-
 SET( zypp_SRCS
-  Atom.cc
   ByteCount.cc
+  Capabilities.cc
+  Capability.cc
   CapMatch.cc
+  Changelog.cc
   CheckSum.cc
   Date.cc
   Dep.cc
-  Dependencies.cc
+  Digest.cc
+  DiskUsage.cc
+  DiskUsageCounter.cc
   Edition.cc
-  Language.cc
-  NVR.cc
-  NVRA.cc
-  NVRAD.cc
+  ExternalProgram.cc
+  Fetcher.cc
+  FileChecker.cc
+  Glob.cc
+  HistoryLog.cc
+  HistoryLogData.cc
+  IdString.cc
+  KeyRing.cc
+  Locks.cc
+  MediaProducts.cc
+  MediaSetAccess.cc
+  NameKindProxy.cc
+  OnMediaLocation.cc
+  Package.cc
+  Patch.cc
+  PathInfo.cc
+  Pathname.cc
+  Pattern.cc
+  PoolItem.cc
+  PoolQuery.cc
+  PoolQueryResult.cc
+  ProblemSolution.cc
+  Product.cc
+  ProgressData.cc
+  ProvideFilePolicy.cc
+  PublicKey.cc
   Range.cc
   Rel.cc
+  RepoInfo.cc
+  RepoManager.cc
+  Repository.cc
+  RepoStatus.cc
+  ResKind.cc
   ResObject.cc
   Resolvable.cc
-  ResStatus.cc
-  ResStore.cc
-  PoolItem.cc
-  ResPool.cc
-  NameKindProxy.cc
-  ResPoolProxy.cc
-  ResPoolManager.cc
   Resolver.cc
   ResolverProblem.cc
-  ProblemSolution.cc
-  Package.cc
-  Pathname.cc
-  ProgressData.cc
+  ResPool.cc
+  ResPoolProxy.cc
+  ResStatus.cc
+  ServiceInfo.cc
+  Signature.cc
   SrcPackage.cc
   SysContent.cc
   Target.cc
-  Selection.cc
-  Pattern.cc
-  Message.cc
-  Script.cc
-  Patch.cc
-  Product.cc
-  Changelog.cc
-  ExternalProgram.cc
-  PathInfo.cc
-  Digest.cc
-  Url.cc
   TmpPath.cc
-  DiskUsage.cc
-  DiskUsageCounter.cc
+  Url.cc
   VendorAttr.cc
-  UpgradeStatistics.cc
+  VendorSupportOptions.cc
   ZYpp.cc
   ZYppCommitPolicy.cc
   ZYppCommitResult.cc
-  TranslatedText.cc
   ZYppFactory.cc
-  PublicKey.cc
-  Signature.cc
-  KeyRing.cc
-  MediaSetAccess.cc
-  ProvideFilePolicy.cc
-  OnMediaLocation.cc
-  Fetcher.cc
-  FileChecker.cc
-  Repository.cc
-  RepoInfo.cc
-  RepoStatus.cc
-  RepoManager.cc
-  MediaProducts.cc
-  Locks.cc
-  ResKind.cc
+)
+SET( zypp_EARLY_SRCS
   ZConfig.cc
   Arch.cc
-  LanguageCode.cc
-  CountryCode.cc
   Locale.cc
+  CountryCode.cc
+  LanguageCode.cc
 )
 
 SET( zypp_HEADERS
-  ZConfig.h
   Arch.h
-  Atom.h
   AutoDispose.h
   Bit.h
   ByteCount.h
   Callback.h
-  CapAndItem.h
-  CapFilters.h
+  Capabilities.h
+  Capability.h
   CapMatch.h
-  CapMatchHelper.h
   Changelog.h
   CheckSum.h
   CountryCode.h
   Date.h
   Dep.h
-  Dependencies.h
   Digest.h
-  DiskUsage.h
   DiskUsageCounter.h
+  DiskUsage.h
   Edition.h
   ExternalProgram.h
   Fetcher.h
-  KVMap.h
+  FileChecker.h
+  Glob.h
+  HistoryLog.h
+  HistoryLogData.h
+  IdString.h
+  IdStringType.h
+  KeyContext.h
   KeyRing.h
-  Language.h
+  KVMap.h
   LanguageCode.h
   Locale.h
+  Locks.h
   ManagedFile.h
+  MediaProducts.h
   MediaSetAccess.h
-  Message.h
-  NVR.h
-  NVRA.h
-  NVRAD.h
   NameKindProxy.h
-  NeedAType.h
+  Vendor.h
   OnMediaLocation.h
   Package.h
   PackageKeyword.h
   Patch.h
   PathInfo.h
   Pathname.h
-  ProgressData.h
   Pattern.h
   PoolItem.h
+  PoolQuery.h
+  PoolQueryUtil.tcc
+  PoolQueryResult.h
   ProblemSolution.h
   ProblemTypes.h
   Product.h
+  ProgressData.h
   ProvideFilePolicy.h
   PublicKey.h
   Range.h
-  Rel.h
   RelCompare.h
-  ResKind.h
+  Rel.h
+  RepoInfo.h
+  RepoManager.h
+  Repository.h
+  RepoStatus.h
+  Filter.h
   ResFilters.h
+  ResKind.h
   ResObject.h
+  ResObjects.h
+  Resolvable.h
+  Resolver.h
+  ResolverProblem.h
   ResPool.h
-  ResPoolManager.h
   ResPoolProxy.h
   ResStatus.h
-  ResStore.h
   ResTraits.h
-  Resolvable.h
-  Resolver.h
-  ResolverProblem.h
-  Script.h
-  Selection.h
+  ServiceInfo.h
   Signature.h
-  SilentCallbacks.h
   SrcPackage.h
   SysContent.h
   Target.h
   TmpPath.h
-  TranslatedText.h
   TriBool.h
-  UpgradeStatistics.h
   Url.h
   VendorAttr.h
-  ZYpp.h
+  VendorSupportOptions.h
+  ZConfig.h
   ZYppCallbacks.h
   ZYppCommit.h
   ZYppCommitPolicy.h
   ZYppCommitResult.h
   ZYppFactory.h
-  FileChecker.h
-  Repository.h
-  RepoInfo.h
-  RepoStatus.h
-  RepoManager.h
-  MediaProducts.h
-  Locks.h
+  ZYpp.h
 )
 
 INSTALL(  FILES ${zypp_HEADERS} DESTINATION "${CMAKE_INSTALL_PREFIX}/include/zypp" )
 
 SET( zypp_base_SRCS
+  base/InterProcessMutex.cc
   base/SerialNumber.cc
   base/Random.cc
   base/Measure.cc
@@ -204,6 +199,8 @@ SET( zypp_base_SRCS
 )
 
 SET( zypp_base_HEADERS
+  base/InterProcessMutex.h
+  base/Collector.h
   base/SerialNumber.h
   base/Easy.h
   base/Random.h
@@ -218,15 +215,14 @@ SET( zypp_base_HEADERS
   base/UserRequestException.h
   base/ExternalDataSource.h
   base/Fd.h
+  base/Flags.h
   base/Function.h
   base/Functional.h
   base/Gettext.h
   base/GzStream.h
-  base/Hash.h
   base/IOStream.h
   base/InputStream.h
   base/Iterator.h
-  base/KindOf.h
   base/LogControl.h
   base/LogTools.h
   base/Logger.h
@@ -240,7 +236,7 @@ SET( zypp_base_HEADERS
   base/String.h
   base/Regex.h
   base/Sysconfig.h
-  base/UniqueString.h
+  base/Tr1hash.h
   base/Unit.h
   base/WatchFile.h
 )
@@ -250,23 +246,6 @@ INSTALL(  FILES
   DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/base
 )
 
-SET( zypp_data_SRCS
-  data/ResolvableData.cc
-  data/RecordId.cc
-  data/ResolvableDataConsumer.cc
-)
-
-SET( zypp_data_HEADERS
-  data/ResolvableData.h
-  data/RecordId.h
-  data/ResolvableDataConsumer.h
-)
-
-INSTALL(  FILES
-  ${zypp_data_HEADERS}
-  DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/data
-)
-
 SET( zypp_media_SRCS
   media/MediaException.cc
   media/MediaAccess.cc
@@ -280,9 +259,16 @@ SET( zypp_media_SRCS
   media/MediaCIFS.cc
   media/ProxyInfo.cc
   media/MediaCurl.cc
+  media/MediaAria2c.cc
   media/MediaISO.cc
+  media/MediaSource.cc
   media/MediaManager.cc
   media/MediaUserAuth.cc
+  media/CredentialFileReader.cc
+  media/CredentialManager.cc
+  media/CurlConfig.cc
+  media/TransferSettings.cc
+  media/MediaPriority.cc
 )
 
 SET( zypp_media_HEADERS
@@ -290,6 +276,7 @@ SET( zypp_media_HEADERS
   media/MediaCD.h
   media/MediaCIFS.h
   media/MediaCurl.h
+  media/MediaAria2c.h
   media/MediaDIR.h
   media/MediaDISK.h
   media/MediaException.h
@@ -302,6 +289,11 @@ SET( zypp_media_HEADERS
   media/MediaUserAuth.h
   media/Mount.h
   media/ProxyInfo.h
+  media/CredentialFileReader.h
+  media/CredentialManager.h
+  media/CurlConfig.h
+  media/TransferSettings.h
+  media/MediaPriority.h
 )
 
 INSTALL(  FILES
@@ -326,24 +318,26 @@ INSTALL(  FILES
 
 SET( zypp_parser_SRCS
   parser/ParseException.cc
-  parser/TagParser.cc
   parser/IniParser.cc
   parser/IniDict.cc
-  parser/LibXMLHelper.cc
-  parser/XMLNodeIterator.cc
+  parser/HistoryLogReader.cc
   parser/RepoFileReader.cc
+  parser/RepoindexFileReader.cc
+  parser/ServiceFileReader.cc
+  parser/ProductFileReader.cc
 )
 
 SET( zypp_parser_HEADERS
   parser/ParseException.h
-  parser/TagParser.h
   parser/IniParser.h
   parser/IniDict.h
-  parser/LibXMLHelper.h
+  parser/HistoryLogReader.h
   parser/ParserProgress.h
-  parser/XMLNodeIterator.h
-  parser/xml_parser_assert.h
   parser/RepoFileReader.h
+  parser/xml_escape_parser.hpp
+  parser/RepoindexFileReader.h
+  parser/ServiceFileReader.h
+  parser/ProductFileReader.h
 )
 
 INSTALL(  FILES
@@ -354,23 +348,11 @@ INSTALL(  FILES
 SET( zypp_parser_susetags_SRCS
   parser/susetags/RepoIndex.cc
   parser/susetags/ContentFileReader.cc
-  parser/susetags/PackagesFileReader.cc
-  parser/susetags/PackagesLangFileReader.cc
-  parser/susetags/PackagesDuFileReader.cc
-  parser/susetags/PatternFileReader.cc
-  parser/susetags/RepoParser.cc
 )
 
 SET( zypp_parser_susetags_HEADERS
   parser/susetags/RepoIndex.h
   parser/susetags/ContentFileReader.h
-  parser/susetags/FileReaderBase.h
-  parser/susetags/FileReaderBaseImpl.h
-  parser/susetags/PackagesFileReader.h
-  parser/susetags/PackagesLangFileReader.h
-  parser/susetags/PackagesDuFileReader.h
-  parser/susetags/PatternFileReader.h
-  parser/susetags/RepoParser.h
 )
 
 INSTALL(  FILES
@@ -399,17 +381,21 @@ SET( zypp_parser_xml_SRCS
   parser/xml/Reader.cc
   parser/xml/XmlString.cc
   parser/xml/libxmlfwd.cc
+  parser/xml/xml_escape_parser.cpp
 )
 
 SET( zypp_parser_xml_HEADERS
+  parser/xml/Parse.h
   parser/xml/Node.h
   parser/xml/ParseDef.h
   parser/xml/ParseDefConsume.h
   parser/xml/ParseDefException.h
   parser/xml/ParseDefTraits.h
   parser/xml/Reader.h
+  parser/xml/XmlEscape.h
   parser/xml/XmlString.h
   parser/xml/libxmlfwd.h
+  parser/xml/xml_escape_parser.hpp
 )
 
 INSTALL(  FILES
@@ -417,59 +403,14 @@ INSTALL(  FILES
   DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/parser/xml
 )
 
-SET( zypp_parser_xmlstore_SRCS
-  parser/xmlstore/XMLLanguageParser.cc
-  parser/xmlstore/XMLParserData.cc
-  parser/xmlstore/XMLPatchParser.cc
-  parser/xmlstore/XMLPatternParser.cc
-  parser/xmlstore/XMLProductParser.cc
-  parser/xmlstore/XMLResObjectParser.cc
-  parser/xmlstore/XMLSourceCacheParser.cc
-)
-
-SET( zypp_parser_xmlstore_HEADERS
-  parser/xmlstore/XMLLanguageParser.h
-  parser/xmlstore/XMLParserData.h
-  parser/xmlstore/XMLPatchParser.h
-  parser/xmlstore/XMLPatternParser.h
-  parser/xmlstore/XMLProductParser.h
-  parser/xmlstore/XMLResObjectParser.h
-  parser/xmlstore/XMLSourceCacheParser.h
-  parser/xmlstore/schemanames.h
-)
-
-INSTALL(  FILES
-  ${zypp_parser_xmlstore_HEADERS}
-  DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/parser/xmlstore
-)
-
 SET( zypp_parser_yum_SRCS
-  parser/yum/RepoParser.cc
-  parser/yum/FileReaderBaseImpl.cc
   parser/yum/RepomdFileReader.cc
   parser/yum/PatchesFileReader.cc
-  parser/yum/PrimaryFileReader.cc
-  parser/yum/OtherFileReader.cc
-  parser/yum/FilelistsFileReader.cc
-  parser/yum/PatchFileReader.cc
-  parser/yum/PatternFileReader.cc
-  parser/yum/ProductFileReader.cc
 )
 
 SET( zypp_parser_yum_HEADERS
-  parser/yum/RepoParser.h
-  parser/yum/RepoParserOpts.h
-  parser/yum/FileReaderBase.h
-  parser/yum/FileReaderBaseImpl.h
   parser/yum/RepomdFileReader.h
   parser/yum/PatchesFileReader.h
-  parser/yum/PrimaryFileReader.h
-  parser/yum/OtherFileReader.h
-  parser/yum/FilelistsFileReader.h
-  parser/yum/PatchFileReader.h
-  parser/yum/PatternFileReader.h
-  parser/yum/ProductFileReader.h
-  parser/yum/schemanames.h
 )
 
 INSTALL(  FILES
@@ -477,6 +418,20 @@ INSTALL(  FILES
   DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/parser/yum
 )
 
+SET( zypp_parser_ws_SRCS
+  parser/ws/WebpinResultFileReader.cc
+)
+
+SET( zypp_parser_ws_HEADERS
+  parser/ws/WebpinResultFileReader.h
+)
+
+INSTALL(  FILES
+  ${zypp_parser_ws_HEADERS}
+  DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/parser/ws
+)
+
+
 SET( zypp_pool_SRCS
   pool/GetResolvablesToInsDel.cc
   pool/PoolImpl.cc
@@ -488,6 +443,7 @@ SET( zypp_pool_HEADERS
   pool/PoolImpl.h
   pool/PoolStats.h
   pool/PoolTraits.h
+  pool/ByIdent.h
 )
 
 INSTALL(  FILES
@@ -497,33 +453,41 @@ INSTALL(  FILES
 
 SET( zypp_solver_detail_SRCS
   solver/detail/Helper.cc
-#  solver/detail/InstallOrder.cc
+  solver/detail/InstallOrder.cc
   solver/detail/ProblemSolutionIgnore.cc
-  solver/detail/ProblemSolutionInstall.cc
-  solver/detail/ProblemSolutionKeep.cc
-  solver/detail/ProblemSolutionUninstall.cc
-  solver/detail/ProblemSolutionUnlock.cc
   solver/detail/ProblemSolutionCombi.cc
   solver/detail/Resolver.cc
-#  solver/detail/ResolverUpgrade.cc
+  solver/detail/ResolverUpgrade.cc
   solver/detail/Resolver_problems.cc
   solver/detail/SolutionAction.cc
   solver/detail/Testcase.cc
+  solver/detail/SolverQueueItem.cc
+  solver/detail/SolverQueueItemInstall.cc
+  solver/detail/SolverQueueItemDelete.cc
+  solver/detail/SolverQueueItemUpdate.cc
+  solver/detail/SolverQueueItemInstallOneOf.cc
+  solver/detail/SolverQueueItemLock.cc
+  solver/detail/SATResolver.cc
+  solver/detail/SystemCheck.cc
 )
 
 SET( zypp_solver_detail_HEADERS
   solver/detail/Helper.h
-#  solver/detail/InstallOrder.h
+  solver/detail/InstallOrder.h
   solver/detail/ProblemSolutionIgnore.h
-  solver/detail/ProblemSolutionInstall.h
-  solver/detail/ProblemSolutionKeep.h
-  solver/detail/ProblemSolutionUninstall.h
-  solver/detail/ProblemSolutionUnlock.h
   solver/detail/ProblemSolutionCombi.h
   solver/detail/Resolver.h
   solver/detail/SolutionAction.h
   solver/detail/Testcase.h
   solver/detail/Types.h
+  solver/detail/SolverQueueItem.h
+  solver/detail/SolverQueueItemInstall.h
+  solver/detail/SolverQueueItemDelete.h
+  solver/detail/SolverQueueItemUpdate.h
+  solver/detail/SolverQueueItemInstallOneOf.h
+  solver/detail/SolverQueueItemLock.h
+  solver/detail/SATResolver.h
+  solver/detail/SystemCheck.h
 )
 
 INSTALL(  FILES
@@ -532,27 +496,30 @@ INSTALL(  FILES
 )
 
 SET( zypp_sat_SRCS
-  sat/detail/PoolImpl.cc
   sat/Pool.cc
-  sat/Repo.cc
   sat/Solvable.cc
-  IdString.cc
-  Capability.cc
-  Capabilities.cc
-  sat/SATResolver.cc
+  sat/SolvableSet.cc
+  sat/SolvIterMixin.cc
+  sat/WhatProvides.cc
+  sat/WhatObsoletes.cc
+  sat/LocaleSupport.cc
+  sat/LookupAttr.cc
+  sat/SolvAttr.cc
+  sat/AttrMatcher.cc
 )
 
 SET( zypp_sat_HEADERS
-  sat/detail/PoolMember.h
-  sat/detail/PoolImpl.h
   sat/Pool.h
-  sat/Repo.h
   sat/Solvable.h
-  IdString.h
-  IdStringType.h
-  Capability.h
-  Capabilities.h
-  sat/SATResolver.h
+  sat/SolvableSet.h
+  sat/SolvIterMixin.h
+  sat/WhatProvides.h
+  sat/WhatObsoletes.h
+  sat/LocaleSupport.h
+  sat/LookupAttr.h
+  sat/LookupAttrTools.h
+  sat/SolvAttr.h
+  sat/AttrMatcher.h
 )
 
 INSTALL(  FILES
@@ -560,8 +527,25 @@ INSTALL(  FILES
   DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/sat
 )
 
+SET( zypp_sat_detail_SRCS
+  sat/detail/PoolImpl.cc
+)
+
+SET( zypp_sat_detail_HEADERS
+  sat/detail/PoolMember.h
+  sat/detail/PoolImpl.h
+)
+
+INSTALL(  FILES
+  ${zypp_sat_detail_HEADERS}
+  DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/sat/detail
+)
+
+
 SET( zypp_target_SRCS
-  target/CommitLog.cc
+  target/RequestedLocalesFile.cc
+  target/SoftLocksFile.cc
+  target/HardLocksFile.cc
   target/CommitPackageCache.cc
   target/CommitPackageCacheImpl.cc
   target/CommitPackageCacheReadAhead.cc
@@ -571,7 +555,9 @@ SET( zypp_target_SRCS
 )
 
 SET( zypp_target_HEADERS
-  target/CommitLog.h
+  target/RequestedLocalesFile.h
+  target/SoftLocksFile.h
+  target/HardLocksFile.h
   target/CommitPackageCache.h
   target/CommitPackageCacheImpl.h
   target/CommitPackageCacheReadAhead.h
@@ -586,12 +572,10 @@ INSTALL(  FILES
 )
 
 SET( zypp_target_hal_SRCS
-  target/hal/Hal.cc
   target/hal/HalContext.cc
 )
 
 SET( zypp_target_hal_HEADERS
-  target/hal/Hal.h
   target/hal/HalContext.h
   target/hal/HalException.h
 )
@@ -627,6 +611,7 @@ SET( zypp_target_rpm_SRCS
 SET( zypp_target_rpm_HEADERS
   target/rpm/BinHeader.h
   target/rpm/RpmCallbacks.h
+  target/rpm/RpmFlags.h
   target/rpm/RpmDb.h
   target/rpm/RpmException.h
   target/rpm/RpmHeader.h
@@ -639,28 +624,6 @@ INSTALL(  FILES
   DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/target/rpm
 )
 
-SET( zypp_target_store_SRCS
-  target/store/Backend.cc
-  target/store/PersistentStorage.cc
-  target/store/XMLFilesBackend.cc
-  target/store/serialize.cc
-  target/store/xml_escape_parser.cpp
-)
-
-SET( zypp_target_store_HEADERS
-  target/store/Backend.h
-  target/store/PersistentStorage.h
-  target/store/XMLFilesBackend.h
-  target/store/parser_utils.hpp
-  target/store/serialize.h
-  target/store/xml_escape_parser.hpp
-)
-
-INSTALL(  FILES
-  ${zypp_target_store_HEADERS}
-  DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/target/store
-)
-
 SET( zypp_thread_SRCS
   thread/Mutex.cc
 )
@@ -678,11 +641,6 @@ INSTALL(  FILES
 )
 
 SET( zypp_ui_SRCS
-  ui/PatchContents.cc
-  ui/PatchContentsImpl.cc
-  ui/PatternContents.cc
-  ui/PatternContentsImpl.cc
-  ui/PatternExpander.cc
   ui/Selectable.cc
   ui/SelectableImpl.cc
   ui/Status.cc
@@ -690,11 +648,6 @@ SET( zypp_ui_SRCS
 )
 
 SET( zypp_ui_HEADERS
-  ui/PatchContents.h
-  ui/PatchContentsImpl.h
-  ui/PatternContents.h
-  ui/PatternContentsImpl.h
-  ui/PatternExpander.h
   ui/SelFilters.h
   ui/Selectable.h
   ui/SelectableImpl.h
@@ -738,62 +691,12 @@ INSTALL(  FILES
   DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/zypp_detail
 )
 
-SET( zypp_cache_SRCS
-  ${CMAKE_BINARY_DIR}/zypp/sqlite-schema.h
-  cache/CacheInitializer.cc
-  cache/CacheException.cc
-  cache/Attribute.cc
-  cache/CacheTypes.cc
-  cache/ResolvableQuery.cc
-  #cache/CacheStore.cc
-  cache/SolvStore.cc
-  cache/CacheFSCK.cc
-  cache/Utils.cc
-)
-
-SET( zypp_cache_HEADERS
-  cache/Attribute.h
-  cache/CacheAttributes.h
-  cache/CacheTypes.h
-  cache/CacheInitializer.h
-  cache/CacheException.h
-  #cache/CacheStore.h
-  cache/SolvStore.h
-  cache/CacheFSCK.h
-  cache/ResolvableQuery.h
-  cache/Utils.h
-)
-
-INSTALL(  FILES
-  ${zypp_cache_HEADERS}
-  DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/cache
-)
-
-SET( zypp_cache_sqlite3x_SRCS
-  cache/sqlite3x/sqlite3x_command.cpp
-  cache/sqlite3x/sqlite3x_connection.cpp
-  cache/sqlite3x/sqlite3x_exception.cpp
-  cache/sqlite3x/sqlite3x_reader.cpp
-  cache/sqlite3x/sqlite3x_transaction.cpp
-)
-
-SET( zypp_cache_sqlite3x_HEADERS
-  cache/sqlite3x/sqlite3x.hpp
-)
-
-#INSTALL(  FILES
-#  ${zypp_cache_sqlite3x_HEADERS}
-#  DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/cache/sqlite3x
-#)
-
 SET( zypp_repo_SRCS
-  repo/dummy.cc
-  repo/RepositoryImpl.cc
   repo/RepoException.cc
   repo/RepoType.cc
+  repo/ServiceType.cc
   repo/PackageProvider.cc
   repo/SrcPackageProvider.cc
-  repo/ScriptProvider.cc
   repo/RepoProvideFile.cc
   repo/DeltaCandidates.cc
   repo/Applydeltarpm.cc
@@ -802,15 +705,15 @@ SET( zypp_repo_SRCS
   repo/MediaInfoDownloader.cc
   repo/Downloader.cc
   repo/RepoVariables.cc
+  repo/RepoInfoBase.cc
 )
 
 SET( zypp_repo_HEADERS
-  repo/RepositoryImpl.h
   repo/RepoException.h
   repo/RepoType.h
+  repo/ServiceType.h
   repo/PackageProvider.h
   repo/SrcPackageProvider.h
-  repo/ScriptProvider.h
   repo/RepoProvideFile.h
   repo/DeltaCandidates.h
   repo/Applydeltarpm.h
@@ -819,6 +722,8 @@ SET( zypp_repo_HEADERS
   repo/MediaInfoDownloader.h
   repo/Downloader.h
   repo/RepoVariables.h
+  repo/RepoInfoBase.h
+  repo/RepoInfoBaseImpl.h
 )
 
 INSTALL( FILES
@@ -826,14 +731,6 @@ INSTALL( FILES
   DESTINATION ${CMAKE_INSTALL_PREFIX}/include/zypp/repo
 )
 
-SET( zypp_repo_cached_SRCS
-  repo/cached/RepoImpl.cc
-)
-
-SET( zypp_repo_cached_HEADERS
-  repo/cached/RepoImpl.h
-)
-
 SET( zypp_repo_yum_SRCS
   repo/yum/Downloader.cc
   repo/yum/ResourceType.cc
@@ -852,25 +749,30 @@ SET( zypp_repo_susetags_HEADERS
   repo/susetags/Downloader.h
 )
 
+SET( zypp_ws_SRCS
+  ws/WebpinResult.cc
+)
+
+SET( zypp_ws_HEADERS
+  ws/WebpinResult.h
+)
+
+
 SET( zypp_lib_SRCS
-${zypp_cache_SRCS}
-${zypp_cache_sqlite3x_SRCS}
 ${zypp_pool_SRCS}
 ${zypp_parser_susetags_SRCS}
-${zypp_parser_xmlstore_SRCS}
 ${zypp_parser_xml_SRCS}
 ${zypp_parser_yum_SRCS}
 ${zypp_parser_plaindir_SRCS}
+${zypp_parser_ws_SRCS}
 ${zypp_parser_SRCS}
 ${zypp_media_proxyinfo_SRCS}
 ${zypp_media_SRCS}
 ${zypp_url_SRCS}
 ${zypp_repo_SRCS}
-${zypp_repo_cached_SRCS}
 ${zypp_repo_yum_SRCS}
 ${zypp_repo_susetags_SRCS}
 ${zypp_repo_data_SRCS}
-${zypp_target_store_SRCS}
 ${zypp_target_rpm_SRCS}
 ${zypp_target_hal_SRCS}
 ${zypp_target_modalias_SRCS}
@@ -878,9 +780,12 @@ ${zypp_target_SRCS}
 ${zypp_solver_detail_SRCS}
 ${zypp_ui_SRCS}
 ${zypp_thread_SRCS}
+${zypp_ws_SRCS}
 ${zypp_SRCS}
 ${zypp_zypp_detail_SRCS}
 ${zypp_sat_SRCS}
+${zypp_sat_detail_SRCS}
+${zypp_EARLY_SRCS}
 ${zypp_base_SRCS}
 )
 
@@ -891,19 +796,18 @@ ${zypp_parser_susetags_HEADERS}
 ${zypp_parser_yum_HEADERS}
 ${zypp_parser_plaindir_HEADERS}
 ${zypp_parser_xml_HEADERS}
+${zypp_parser_ws_HEADERS}
 ${zypp_parser_HEADERS}
-${zypp_cache_HEADERS}
-${zypp_cache_sqlite3x_HEADERS}
 ${zypp_ui_HEADERS}
-${zypp_parser_xmlstore_HEADERS}
 ${zypp_media_HEADERS}
 ${zypp_target_hal_HEADERS}
 ${zypp_media_proxyinfo_HEADERS}
 ${zypp_base_HEADERS}
 ${zypp_solver_detail_HEADERS}
 ${zypp_sat_HEADERS}
-${zypp_target_store_HEADERS}
+${zypp_sat_detail_HEADERS}
 ${zypp_url_HEADERS}
+${zypp_ws_HEADERS}
 ${zypp_HEADERS}
 ${zypp_zypp_detail_HEADERS}
 ${zypp_thread_HEADERS}
@@ -934,8 +838,6 @@ SET_LOGGROUP( "satsolver" ${zypp_sat_SRCS} )
 #SET_LOGGROUP( "group" ${zypp_parser_yum2_SRCS} )
 #SET_LOGGROUP( "group" ${zypp_capability_SRCS} )
 #SET_LOGGROUP( "group" ${zypp_ui_SRCS} )
-#SET_LOGGROUP( "group" ${zypp_parser_xmlstore_SRCS} )
-#SET_LOGGROUP( "group" ${zypp_data_SRCS} )
 #SET_LOGGROUP( "group" ${zypp_media_SRCS} )
 #SET_LOGGROUP( "group" ${zypp_target_hal_SRCS} )
 #SET_LOGGROUP( "group" ${zypp_parser_xml_SRCS} )
@@ -944,7 +846,6 @@ SET_LOGGROUP( "satsolver" ${zypp_sat_SRCS} )
 #SET_LOGGROUP( "group" ${zypp_base_SRCS} )
 #SET_LOGGROUP( "group" ${zypp_solver_detail_SRCS} )
 #SET_LOGGROUP( "group" ${zypp_sat_SRCS} )
-#SET_LOGGROUP( "group" ${zypp_target_store_SRCS} )
 #SET_LOGGROUP( "group" ${zypp_url_SRCS} )
 #SET_LOGGROUP( "group" ${zypp_source_SRCS} )
 #SET_LOGGROUP( "group" ${zypp_parser_SRCS} )
@@ -961,27 +862,28 @@ SET_LOGGROUP( "satsolver" ${zypp_sat_SRCS} )
 ADD_LIBRARY(zypp SHARED ${zypp_lib_SRCS})
 SET_TARGET_PROPERTIES( zypp PROPERTIES VERSION "${LIBZYPP_VERSION_INFO}" )
 SET_TARGET_PROPERTIES( zypp PROPERTIES SOVERSION "${LIBZYPP_SOVERSION_INFO}" )
+SET_TARGET_PROPERTIES( zypp PROPERTIES LINK_FLAGS "--as-needed" )
 ADD_DEPENDENCIES(zypp schema_header)
 # System libraries
-TARGET_LINK_LIBRARIES(zypp util )
+SET(UTIL_LIBRARY util)
+#SET(SIGNALS_LIBRARY boost_signals)
+SET(SIGNALS_LIBRARY boost_signals-mt)
+TARGET_LINK_LIBRARIES(zypp ${UTIL_LIBRARY} )
 TARGET_LINK_LIBRARIES(zypp ${DBUS_LIBRARY} )
-TARGET_LINK_LIBRARIES(zypp dbus-glib-1 )
-TARGET_LINK_LIBRARIES(zypp ${GLIB_LIBRARY} )
 TARGET_LINK_LIBRARIES(zypp ${RPM_LIBRARY} )
 TARGET_LINK_LIBRARIES(zypp ${GETTEXT_LIBRARIES} )
 TARGET_LINK_LIBRARIES(zypp ${HAL_LIBRARY} )
 TARGET_LINK_LIBRARIES(zypp ${HAL_STORAGE_LIBRARY} )
 TARGET_LINK_LIBRARIES(zypp ${CURL_LIBRARY} )
 TARGET_LINK_LIBRARIES(zypp ${LIBXML_LIBRARY} )
-TARGET_LINK_LIBRARIES(zypp ${SQLITE_LIBRARY} )
 TARGET_LINK_LIBRARIES(zypp ${ZLIB_LIBRARY} )
-TARGET_LINK_LIBRARIES(zypp ${SATSOLVER_LIBRARY} )
+TARGET_LINK_LIBRARIES(zypp ${SATSOLVER_LIBRARY} ${SATSOLVER_EXT_LIBRARY} ${EXPAT_LIBRARY})
+TARGET_LINK_LIBRARIES(zypp ${OPENSSL_LIBRARIES} )
+TARGET_LINK_LIBRARIES(zypp ${CRYPTO_LIBRARIES} )
+TARGET_LINK_LIBRARIES(zypp ${SIGNALS_LIBRARY} )
 
 INSTALL(TARGETS zypp LIBRARY DESTINATION ${LIB_INSTALL_DIR} )
 
 # install XML schemas
-FILE( GLOB YUM_SCHEMA_FILES ${CMAKE_SOURCE_DIR}/zypp/parser/yum/schema/*.rng )
+FILE( GLOB YUM_SCHEMA_FILES ${LIBZYPP_SOURCE_DIR}/zypp/parser/yum/schema/*.rng )
 INSTALL(FILES ${YUM_SCHEMA_FILES} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/zypp/schema/yum" )
-
-FILE( GLOB XMLSTORE_SCHEMA_FILES ${CMAKE_SOURCE_DIR}/zypp/parser/xmlstore/schema/*.rng )
-INSTALL(FILES ${XMLSTORE_SCHEMA_FILES} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/zypp/schema/xmlstore" )