Adappt to boost-1.39

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 488537a..082b255 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -63,6 +63,16 @@ FIND_PACKAGE(SWIG REQUIRED)
 
 FIND_PACKAGE(Zypp REQUIRED)
 
+SET( SWIG_DEFINITIONS -DZYPP_DEPRECATED )
+
+FIND_PATH( BOOST_SMARTPTR_INCLUDE_DIR boost/smart_ptr/shared_ptr.hpp
+       /usr/include
+       /usr/local/include
+)
+IF( BOOST_SMARTPTR_INCLUDE_DIR )
+       SET( SWIG_DEFINITIONS ${SWIG_DEFINITIONS} -DBOOST_SMARTPTR_INCLUDE_DIR )
+ENDIF( BOOST_SMARTPTR_INCLUDE_DIR )
+
 # Now into SWIG
 
 ADD_SUBDIRECTORY(swig)

diff --git a/VERSION.cmake b/VERSION.cmake
index 4692e34..446415e 100644 (file)
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -1,3 +1,3 @@
 SET(VERSION_MAJOR "0")
 SET(VERSION_MINOR "5")
-SET(VERSION_PATCH "0")
+SET(VERSION_PATCH "1")

diff --git a/package/libzypp-bindings.changes b/package/libzypp-bindings.changes
index 9c911e0..866bbf6 100644 (file)
--- a/package/libzypp-bindings.changes
+++ b/package/libzypp-bindings.changes
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Mon Aug  3 16:47:24 CEST 2009 - ma@suse.de
+
+- Adappt to boost-1.39
+- version 0.5.1
+
+-------------------------------------------------------------------
 Tue Jul 14 14:57:44 CEST 2009 - ma@suse.de
 
 - Fix specfile data.

diff --git a/swig/perl5/CMakeLists.txt b/swig/perl5/CMakeLists.txt
index c0c5b3e..80c4420 100644 (file)
--- a/swig/perl5/CMakeLists.txt
+++ b/swig/perl5/CMakeLists.txt
@@ -32,7 +32,7 @@ endif(COMMAND cmake_policy)
 ADD_CUSTOM_COMMAND (
    OUTPUT  ${SWIG_OUTPUT}
    COMMAND ${CMAKE_COMMAND} -E echo_append "Creating wrapper code for perl..."
-   COMMAND ${SWIG_EXECUTABLE} -DZYPP_DEPRECATED -c++ -perl5 -o ${SWIG_OUTPUT} -I${ZYPP_INCLUDE_DIR} ${SWIG_INPUT}
+   COMMAND ${SWIG_EXECUTABLE} ${SWIG_DEFINITIONS} -c++ -perl5 -o ${SWIG_OUTPUT} -I${ZYPP_INCLUDE_DIR} ${SWIG_INPUT}
    COMMAND ${CMAKE_COMMAND} -E echo "Done."
    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../*.i ${CMAKE_CURRENT_SOURCE_DIR}/*.i

diff --git a/swig/python/CMakeLists.txt b/swig/python/CMakeLists.txt
index dc30317..864c0cb 100644 (file)
--- a/swig/python/CMakeLists.txt
+++ b/swig/python/CMakeLists.txt
@@ -24,7 +24,7 @@ MESSAGE(STATUS "Python include path: ${PYTHON_INCLUDE_PATH}")
 ADD_CUSTOM_COMMAND (
    OUTPUT  ${SWIG_OUTPUT}
    COMMAND ${CMAKE_COMMAND} -E echo_append "Creating wrapper code for python..."
-   COMMAND ${SWIG_EXECUTABLE} -v -DZYPP_DEPRECATED -c++ -python  -o ${SWIG_OUTPUT} -I${ZYPP_INCLUDE_DIR} ${SWIG_INPUT}
+   COMMAND ${SWIG_EXECUTABLE} -v ${SWIG_DEFINITIONS} -c++ -python  -o ${SWIG_OUTPUT} -I${ZYPP_INCLUDE_DIR} ${SWIG_INPUT}
    COMMAND ${CMAKE_COMMAND} -E echo "Done."
    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../*.i ${CMAKE_CURRENT_SOURCE_DIR}/*.i

diff --git a/swig/ruby/CMakeLists.txt b/swig/ruby/CMakeLists.txt
index c683a27..41c7efd 100644 (file)
--- a/swig/ruby/CMakeLists.txt
+++ b/swig/ruby/CMakeLists.txt
@@ -16,7 +16,7 @@ MESSAGE(STATUS "Ruby include path: ${RUBY_INCLUDE_PATH}")
 ADD_CUSTOM_COMMAND (
    OUTPUT  "${SWIG_OUTPUT}"
    COMMAND ${CMAKE_COMMAND} -E echo_append "Creating wrapper code for Ruby..."
-   COMMAND ${SWIG_EXECUTABLE} -DZYPP_DEPRECATED -c++ -ruby -autorename -o ${SWIG_OUTPUT} -I${ZYPP_INCLUDE_DIR} ${SWIG_INPUT}
+   COMMAND ${SWIG_EXECUTABLE} ${SWIG_DEFINITIONS} -c++ -ruby -autorename -o ${SWIG_OUTPUT} -I${ZYPP_INCLUDE_DIR} ${SWIG_INPUT}
    COMMAND ${CMAKE_COMMAND} -E echo "Done."
    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../*.i ${CMAKE_CURRENT_SOURCE_DIR}/*.i

diff --git a/swig/zypp.i b/swig/zypp.i
index cabcde8..67c17ae 100644 (file)
--- a/swig/zypp.i
+++ b/swig/zypp.i
@@ -88,10 +88,17 @@ namespace zypp {
 %include "perl5/perl.i"
 #endif
 
+#ifdef BOOST_SMARTPTR_INCLUDE_DIR
+%import <boost/smart_ptr/scoped_ptr.hpp>
+%import <boost/smart_ptr/shared_ptr.hpp>
+%import <boost/smart_ptr/weak_ptr.hpp>
+%import <boost/smart_ptr/intrusive_ptr.hpp>
+#else
 %import <boost/scoped_ptr.hpp>
 %import <boost/shared_ptr.hpp>
 %import <boost/weak_ptr.hpp>
 %import <boost/intrusive_ptr.hpp>
+#endif
 %import <zypp/base/PtrTypes.h>
 %import <zypp/base/Flags.h>