Author: mlandres
Date: Tue Nov 18 18:45:19 2008
New Revision: 11708
URL: http://svn.opensuse.org/viewcvs/zypp?rev=11708&view=rev
Log:
- Linking libexpat required to support loading helix files.
- Add class filesystem::Glob to find pathnames matching a pattern
by using ::glob.
Added:
trunk/libzypp/zypp/Glob.cc
trunk/libzypp/zypp/Glob.h
Modified:
trunk/libzypp/CMakeLists.txt
trunk/libzypp/VERSION.cmake
trunk/libzypp/package/libzypp.changes
trunk/libzypp/zypp/CMakeLists.txt
Modified: trunk/libzypp/CMakeLists.txt
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/CMakeLists.txt?rev=11708&r1=11707&r2=11708&view=diff
==============================================================================
--- trunk/libzypp/CMakeLists.txt (original)
+++ trunk/libzypp/CMakeLists.txt Tue Nov 18 18:45:19 2008
@@ -114,6 +114,9 @@
INCLUDE_DIRECTORIES( ${SATSOLVER_INCLUDE_DIR} )
ENDIF( NOT SATSOLVER_FOUND )
+# satsolver uses expat and has open references to it:
+FIND_PACKAGE(EXPAT REQUIRED)
+
FIND_PACKAGE(OpenSSL REQUIRED)
FIND_PROGRAM( DOXYGEN doxygen )
Modified: trunk/libzypp/VERSION.cmake
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/VERSION.cmake?rev=11708&r1=11707&r2=11708&view=diff
==============================================================================
--- trunk/libzypp/VERSION.cmake (original)
+++ trunk/libzypp/VERSION.cmake Tue Nov 18 18:45:19 2008
@@ -61,7 +61,7 @@
SET(LIBZYPP_MAJOR "5")
SET(LIBZYPP_COMPATMINOR "23")
SET(LIBZYPP_MINOR "24")
-SET(LIBZYPP_PATCH "0")
+SET(LIBZYPP_PATCH "1")
#
# LAST RELEASED: 5.23.0 (23)
# (The number in parenthesis is LIBZYPP_COMPATMINOR)
Modified: trunk/libzypp/package/libzypp.changes
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?rev=11708&r1=11707&r2=11708&view=diff
==============================================================================
--- trunk/libzypp/package/libzypp.changes (original)
+++ trunk/libzypp/package/libzypp.changes Tue Nov 18 18:45:19 2008
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Tue Nov 18 18:37:30 CET 2008 - ma@suse.de
+
+- Add class filesystem::Glob to find pathnames matching a pattern
+ by using ::glob.
+- revision 11708
+
+-------------------------------------------------------------------
Thu Nov 13 11:07:56 CET 2008 - schubi@suse.de
- Taking care for ppc64 while distupgrade (bnc #443685)
Modified: trunk/libzypp/zypp/CMakeLists.txt
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/CMakeLists.txt?rev=11708&r1=11707&r2=11708&view=diff
==============================================================================
--- trunk/libzypp/zypp/CMakeLists.txt (original)
+++ trunk/libzypp/zypp/CMakeLists.txt Tue Nov 18 18:45:19 2008
@@ -24,6 +24,7 @@
ExternalProgram.cc
Fetcher.cc
FileChecker.cc
+ Glob.cc
HistoryLog.cc
IdString.cc
KeyRing.cc
@@ -103,6 +104,7 @@
ExternalProgram.h
Fetcher.h
FileChecker.h
+ Glob.h
HistoryLog.h
IdString.h
IdStringType.h
@@ -868,7 +870,7 @@
TARGET_LINK_LIBRARIES(zypp ${CURL_LIBRARY} )
TARGET_LINK_LIBRARIES(zypp ${LIBXML_LIBRARY} )
TARGET_LINK_LIBRARIES(zypp ${ZLIB_LIBRARY} )
-TARGET_LINK_LIBRARIES(zypp ${SATSOLVER_LIBRARY} )
+TARGET_LINK_LIBRARIES(zypp ${SATSOLVER_LIBRARY} ${EXPAT_LIBRARY})
TARGET_LINK_LIBRARIES(zypp ${OPENSSL_LIBRARIES} )
TARGET_LINK_LIBRARIES(zypp ${CRYPTO_LIBRARIES} )
TARGET_LINK_LIBRARIES(zypp ${SIGNALS_LIBRARY} )
Added: trunk/libzypp/zypp/Glob.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Glob.cc?rev=11708&view=auto
==============================================================================
--- trunk/libzypp/zypp/Glob.cc (added)
+++ trunk/libzypp/zypp/Glob.cc Tue Nov 18 18:45:19 2008
@@ -0,0 +1,53 @@
+/*---------------------------------------------------------------------\
+| ____ _ __ __ ___ |
+| |__ / \ / / . \ . \ |
+| / / \ V /| _/ _/ |
+| / /__ | | | | | | |
+| /_____||_| |_| |_| |
+| |
+\---------------------------------------------------------------------*/
+/** \file zypp/Glob.cc
+ *
+*/
+#include <iostream>
+#include "zypp/base/LogTools.h"
+
+#include "zypp/Glob.h"
+
+using std::endl;
+
+///////////////////////////////////////////////////////////////////
+namespace zypp
+{ /////////////////////////////////////////////////////////////////
+ ///////////////////////////////////////////////////////////////////
+ namespace filesystem
+ { /////////////////////////////////////////////////////////////////
+
+ int Glob::add( const std::string & pattern_r, Flags flags_r )
+ {
+ static Flags _APPEND( GLOB_APPEND ); // not published
+ if ( ! flags_r )
+ flags_r = _defaultFlags;
+ if ( _result )
+ flags_r |= _APPEND;
+ else
+ _result.reset( new ::glob_t );
+ return( _lastGlobReturn = ::glob( pattern_r.c_str(), flags_r, NULL, &(*_result) ) );
+ }
+
+ /******************************************************************
+ **
+ ** FUNCTION NAME : operator<<
+ ** FUNCTION TYPE : std::ostream &
+ */
+ std::ostream & operator<<( std::ostream & str, const Glob & obj )
+ {
+ return dumpRange( str << "(" << obj.size() << ")", obj.begin(), obj.end() );
+ }
+
+ /////////////////////////////////////////////////////////////////
+ } // namespace filesystem
+ ///////////////////////////////////////////////////////////////////
+ /////////////////////////////////////////////////////////////////
+} // namespace zypp
+///////////////////////////////////////////////////////////////////
Added: trunk/libzypp/zypp/Glob.h
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Glob.h?rev=11708&view=auto
==============================================================================
--- trunk/libzypp/zypp/Glob.h (added)
+++ trunk/libzypp/zypp/Glob.h Tue Nov 18 18:45:19 2008
@@ -0,0 +1,217 @@
+/*---------------------------------------------------------------------\
+| ____ _ __ __ ___ |
+| |__ / \ / / . \ . \ |
+| / / \ V /| _/ _/ |
+| / /__ | | | | | | |
+| /_____||_| |_| |_| |
+| |
+\---------------------------------------------------------------------*/
+/** \file zypp/Glob.h
+ *
+*/
+#ifndef ZYPP_GLOB_H
+#define ZYPP_GLOB_H
+
+extern "C"
+{
+#include