Author: aschnell Date: Tue Jul 24 17:14:37 2007 New Revision: 6185 URL: http://svn.opensuse.org/viewcvs/zypp?rev=6185&view=rev Log: - some cleanup Added: trunk/libzypp-bindings/swig/python/python.i - copied, changed from r6176, trunk/libzypp-bindings/swig/python.i trunk/libzypp-bindings/swig/ruby/ruby.i - copied unchanged from r6176, trunk/libzypp-bindings/swig/ruby.i Removed: trunk/libzypp-bindings/swig/python.i trunk/libzypp-bindings/swig/ruby.i Modified: trunk/libzypp-bindings/swig/python/CMakeLists.txt trunk/libzypp-bindings/swig/ruby/CMakeLists.txt trunk/libzypp-bindings/swig/zypp.i Modified: trunk/libzypp-bindings/swig/python/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/python/CMakeLists.txt?rev=6185&r1=6184&r2=6185&view=diff ============================================================================== --- trunk/libzypp-bindings/swig/python/CMakeLists.txt (original) +++ trunk/libzypp-bindings/swig/python/CMakeLists.txt Tue Jul 24 17:14:37 2007 @@ -1,4 +1,6 @@ +SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-strict-aliasing") + FIND_PACKAGE(PythonLibs REQUIRED) MESSAGE( STATUS "Python include path: ${PYTHON_INCLUDE_PATH}" ) @@ -18,7 +20,7 @@ COMMAND ${SWIG_EXECUTABLE} -c++ -python -xmlout ${CMAKE_CURRENT_BINARY_DIR}/parse.xml -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 + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../*.i ${CMAKE_CURRENT_SOURCE_DIR}/*.i ) ADD_CUSTOM_TARGET( glue Copied: trunk/libzypp-bindings/swig/python/python.i (from r6176, trunk/libzypp-bindings/swig/python.i) URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/python/python.i?p2=trunk/libzypp-bindings/swig/python/python.i&p1=trunk/libzypp-bindings/swig/python.i&r1=6176&r2=6185&rev=6185&view=diff ============================================================================== --- trunk/libzypp-bindings/swig/python.i (original) +++ trunk/libzypp-bindings/swig/python/python.i Tue Jul 24 17:14:37 2007 @@ -1,6 +1,6 @@ -%define iter( cl ) -%extend cl { +%define iter( cls ) +%extend cls { %pythoncode %{ def __iter__(self): r = self.range() @@ -10,4 +10,4 @@ %} }; %enddef - + Modified: trunk/libzypp-bindings/swig/ruby/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/ruby/CMakeLists.txt?rev=6185&r1=6184&r2=6185&view=diff ============================================================================== --- trunk/libzypp-bindings/swig/ruby/CMakeLists.txt (original) +++ trunk/libzypp-bindings/swig/ruby/CMakeLists.txt Tue Jul 24 17:14:37 2007 @@ -1,4 +1,6 @@ +SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-strict-aliasing") + FIND_PACKAGE(Ruby REQUIRED) MESSAGE( STATUS "Ruby arch dir: ${RUBY_ARCH_DIR}" ) MESSAGE( STATUS "Ruby include path: ${RUBY_INCLUDE_PATH}" ) @@ -12,7 +14,7 @@ COMMAND ${SWIG_EXECUTABLE} -c++ -ruby -autorename -xmlout ${CMAKE_CURRENT_BINARY_DIR}/parse.xml -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 + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../*.i ${CMAKE_CURRENT_SOURCE_DIR}/*.i ) ADD_CUSTOM_TARGET( glue Modified: trunk/libzypp-bindings/swig/zypp.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/zypp.i?rev=6185&r1=6184&r2=6185&view=diff ============================================================================== --- trunk/libzypp-bindings/swig/zypp.i (original) +++ trunk/libzypp-bindings/swig/zypp.i Tue Jul 24 17:14:37 2007 @@ -109,7 +109,7 @@ #ifdef SWIGRUBY -%include "ruby.i" +%include "ruby/ruby.i" /* define iterators using swig macros */ iter2( ResStore, ResObject* ) @@ -117,6 +117,12 @@ #endif +#ifdef SWIGPYTHON + +%include "python/python.i" + +#endif + class ZYpp { -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org