So, remove the linking of libglib.

Also don't link in some dead code (most of the susetags and yum parser).
I'm leaving in the sources files for now, it helps to look at them
sometimes while developing the sat-solver parsers.

diff --git a/tests/parser/yum/CMakeLists.txt b/tests/parser/yum/CMakeLists.txt
index 7893bb6..44d1901 100644 (file)
--- a/tests/parser/yum/CMakeLists.txt
+++ b/tests/parser/yum/CMakeLists.txt
@@ -1,2 +1 @@
-
-ADD_TESTS(RepomdFileReader PatchesFileReader PatchFileReader)
\ No newline at end of file
+ADD_TESTS(RepomdFileReader PatchesFileReader)

diff --git a/tests/parser/yum/PatchFileReader_test.cc b/tests/parser/yum/PatchFileReader_test.cc
deleted file mode 100644 (file)
index 1d8e4bc..0000000
--- a/tests/parser/yum/PatchFileReader_test.cc
+++ /dev/null
@@ -1,68 +0,0 @@
-#include <boost/test/auto_unit_test.hpp>
-
-#include "zypp/base/Easy.h"
-#include "zypp/Url.h"
-#include "zypp/PathInfo.h"
-#include "zypp/Pathname.h"
-#include "zypp/data/ResolvableData.h"
-#include "zypp/parser/yum/PatchFileReader.h"
-
-using namespace std;
-using namespace boost::unit_test;
-using namespace zypp;
-using namespace zypp::parser::yum;
-
-#define DATADIR (Pathname(TESTS_SRC_DIR) + "parser/yum/data")
-
-struct Check_fetchmsttfonts
-{
-  bool operator()( const data::Patch_Ptr & data_r )
-  {
-    BOOST_CHECK( data_r );
-    if ( data_r )
-    {
-      BOOST_CHECK_EQUAL( data_r->name, "fetchmsttfonts.sh" );
-      BOOST_CHECK_EQUAL( data_r->edition, Edition("4347", "0") );
-      BOOST_CHECK_EQUAL( data_r->arch, Arch_noarch );
-
-      BOOST_CHECK_EQUAL( data_r->summary.text().size(), 41 );
-      BOOST_CHECK_EQUAL( data_r->description.text().size(), 296 );
-      BOOST_CHECK_EQUAL( data_r->licenseToConfirm.text().size(), 4911 );
-
-      BOOST_CHECK_EQUAL( data_r->id, "fetchmsttfonts.sh-4347" );
-      BOOST_CHECK_EQUAL( data_r->timestamp, Date(20070919) );
-      BOOST_CHECK_EQUAL( data_r->category, "optional" );
-
-      BOOST_CHECK_EQUAL( data_r->atoms.size(), 1 );
-      if ( data_r->atoms.size() == 1 )
-      {
-        data::Script_Ptr scr( dynamic_pointer_cast<data::Script>( *data_r->atoms.begin() ) );
-        if ( scr )
-        {
-          BOOST_CHECK_EQUAL( scr->name, "fetchmsttfonts.sh-4347-patch-fetchmsttfonts.sh-2" );
-          BOOST_CHECK_EQUAL( scr->edition, Edition("4347", "1") );
-          BOOST_CHECK_EQUAL( scr->arch, Arch_noarch );
-
-          BOOST_CHECK_EQUAL( scr->doScript.size(), 3718);
-          BOOST_CHECK_EQUAL( scr->undoScript.size(), 0 );
-        }
-        else
-        {
-          BOOST_CHECK_MESSAGE( false, "Atom is not a Script" );
-        }
-      }
-    }
-    return true;
-  }
-};
-
-void patch_read_test( const Pathname & file_r )
-{
-  cout << "Testing : " << file_r << endl;
-  PatchFileReader( file_r, Check_fetchmsttfonts() );
-}
-
-BOOST_AUTO_TEST_CASE(patch_read)
-{
-  patch_read_test(DATADIR + "patch-fetchmsttfonts.sh-4347.xml");
-}

diff --git a/zypp/CMakeLists.txt b/zypp/CMakeLists.txt
index 5682fad..d88fb4a 100644 (file)
--- a/zypp/CMakeLists.txt
+++ b/zypp/CMakeLists.txt
@@ -356,11 +356,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
+  #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
@@ -420,16 +420,16 @@ INSTALL(  FILES
 )
 
 SET( zypp_parser_yum_SRCS
-  parser/yum/RepoParser.cc
-  parser/yum/FileReaderBaseImpl.cc
+  #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
+  #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
@@ -866,7 +866,6 @@ ADD_DEPENDENCIES(zypp schema_header)
 # System libraries
 TARGET_LINK_LIBRARIES(zypp util )
 TARGET_LINK_LIBRARIES(zypp ${DBUS_LIBRARY} )
-TARGET_LINK_LIBRARIES(zypp dbus-glib-1 )
 TARGET_LINK_LIBRARIES(zypp ${RPM_LIBRARY} )
 TARGET_LINK_LIBRARIES(zypp ${GETTEXT_LIBRARIES} )
 TARGET_LINK_LIBRARIES(zypp ${HAL_LIBRARY} )