- some cleanup

diff --git a/swig/python/CMakeLists.txt b/swig/python/CMakeLists.txt
index 9d7158d..591940d 100644 (file)
--- a/swig/python/CMakeLists.txt
+++ b/swig/python/CMakeLists.txt
@@ -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 @@ ADD_CUSTOM_COMMAND (
    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

diff --git a/swig/python.i b/swig/python/python.i
similarity index 82%
rename from swig/python.i
rename to swig/python/python.i
index 1c9ea7f..f7826ec 100644 (file)
--- a/swig/python.i
+++ b/swig/python/python.i
@@ -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
-    
+

diff --git a/swig/ruby/CMakeLists.txt b/swig/ruby/CMakeLists.txt
index cb28e54..48d1616 100644 (file)
--- a/swig/ruby/CMakeLists.txt
+++ b/swig/ruby/CMakeLists.txt
@@ -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 @@ ADD_CUSTOM_COMMAND (
    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

diff --git a/swig/ruby.i b/swig/ruby/ruby.i
similarity index 100%
rename from swig/ruby.i
rename to swig/ruby/ruby.i

diff --git a/swig/zypp.i b/swig/zypp.i
index 45bfb6b..68ec6de 100644 (file)
--- a/swig/zypp.i
+++ b/swig/zypp.i
@@ -109,7 +109,7 @@ class intrusive_ptr {
 
 #ifdef SWIGRUBY
 
-%include "ruby.i"
+%include "ruby/ruby.i"
 
 /* define iterators using swig macros */
 iter2( ResStore, ResObject* )
@@ -117,6 +117,12 @@ auto_iterator( std::list<RepoInfo>, RepoInfo )
 
 #endif
 
+#ifdef SWIGPYTHON
+
+%include "python/python.i"
+
+#endif
+
 
 class ZYpp
 {