Author: dmacvicar Date: Wed Feb 20 10:26:33 2008 New Revision: 8826 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8826&view=rev Log: - still does not compile but at least swig does not hang on the python part Modified: trunk/libzypp-bindings/swig/ResPool.i trunk/libzypp-bindings/swig/ZYppFactory.i trunk/libzypp-bindings/swig/python/CMakeLists.txt trunk/libzypp-bindings/swig/python/python.i Modified: trunk/libzypp-bindings/swig/ResPool.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/ResPool.i?r... ============================================================================== --- trunk/libzypp-bindings/swig/ResPool.i (original) +++ trunk/libzypp-bindings/swig/ResPool.i Wed Feb 20 10:26:33 2008 @@ -1,4 +1,4 @@ - +namespace zypp { %apply unsigned { ResPool::size_type }; %nodefault ResPool; @@ -7,6 +7,8 @@ %ignore ResPool::byNameBegin; %ignore ResPool::byNameEnd; + + class ResPool { friend std::ostream & operator<<( std::ostream & str, const ResPool & obj ); @@ -41,16 +43,10 @@ /** */ size_type size() const; - /** \name Iterate through all PoolItems (all kinds). */ - //@{ - /** */ - const_iterator begin() const - { return make_filter_begin( pool::ByPoolItem(), store() ); } /** */ - const_iterator end() const - { return make_filter_end( pool::ByPoolItem(), store() ); } - //@} - + const_iterator begin() const; + const_iterator end() const; + public: /** Return the corresponding \ref PoolItem. * Pool and sat pool should be in sync. Returns an empty @@ -366,3 +362,5 @@ } #endif + +} Modified: trunk/libzypp-bindings/swig/ZYppFactory.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/ZYppFactory... ============================================================================== --- trunk/libzypp-bindings/swig/ZYppFactory.i (original) +++ trunk/libzypp-bindings/swig/ZYppFactory.i Wed Feb 20 10:26:33 2008 @@ -1,4 +1,7 @@ +namespace zypp +{ %template(ZYpp_Ptr) intrusive_ptr<ZYpp>; +} %include <zypp/ZYppFactory.h> Modified: trunk/libzypp-bindings/swig/python/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/python/CMak... ============================================================================== --- trunk/libzypp-bindings/swig/python/CMakeLists.txt (original) +++ trunk/libzypp-bindings/swig/python/CMakeLists.txt Wed Feb 20 10:26:33 2008 @@ -16,7 +16,7 @@ ADD_CUSTOM_COMMAND ( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/zypp_wrap.cxx COMMAND ${CMAKE_COMMAND} -E echo_append "Creating wrapper code for python..." - COMMAND ${SWIG_EXECUTABLE} -DZYPP_DEPRECATED -c++ -python -o ${CMAKE_CURRENT_BINARY_DIR}/zypp_wrap.cxx -I${ZYPP_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../zypp.i + COMMAND ${SWIG_EXECUTABLE} -v -DZYPP_DEPRECATED -c++ -python -o ${CMAKE_CURRENT_BINARY_DIR}/zypp_wrap.cxx -I${ZYPP_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../zypp.i COMMAND ${CMAKE_COMMAND} -E echo "Done." WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../*.i ${CMAKE_CURRENT_SOURCE_DIR}/*.i Modified: trunk/libzypp-bindings/swig/python/python.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/python/pyth... ============================================================================== --- trunk/libzypp-bindings/swig/python/python.i (original) +++ trunk/libzypp-bindings/swig/python/python.i Wed Feb 20 10:26:33 2008 @@ -12,9 +12,21 @@ // Just to avoid warnings. %ignore operator<<; + namespace repo + { + // These operators must be ignored otherwise the wrapper does + // not compile (using swig 1.3.29). + %ignore operator==; + %ignore operator!=; + + // Just to avoid warnings. + %ignore operator<<; + } + } + %define iter( cls ) %extend cls { %pythoncode %{ -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org