Author: dmacvicar
Date: Tue Mar 11 00:48:30 2008
New Revision: 45335
URL: http://svn.opensuse.org/viewcvs/yast?rev=45335&view=rev
Log:
start looking on how to wrap the new independant ui library
Added:
trunk/ruby-bindings/src/swig/yui.i
trunk/ruby-bindings/src/swig/yui.rb
- copied, changed from r44787, trunk/ruby-bindings/src/swig/ycp.rb
Modified:
trunk/ruby-bindings/src/swig/CMakeLists.txt
trunk/ruby-bindings/src/swig/ycp.rb
Modified: trunk/ruby-bindings/src/swig/CMakeLists.txt
URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/src/swig/CMakeLists.txt?rev=45335&r1=45334&r2=45335&view=diff
==============================================================================
--- trunk/ruby-bindings/src/swig/CMakeLists.txt (original)
+++ trunk/ruby-bindings/src/swig/CMakeLists.txt Tue Mar 11 00:48:30 2008
@@ -1,32 +1,44 @@
-SET( SWIG_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/ycp_wrap.cxx" )
-SET( SWIG_INPUT "${CMAKE_CURRENT_SOURCE_DIR}/ycp.i" )
+MACRO(swig_wrap_lib name)
+ SET( SWIG_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${name}_wrap.cxx" )
+ SET( SWIG_INPUT "${CMAKE_CURRENT_SOURCE_DIR}/${name}.i" )
-ADD_CUSTOM_COMMAND (
- OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/ycp_wrap.cxx
+ ADD_CUSTOM_COMMAND (
+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${name}_wrap.cxx
COMMAND ${CMAKE_COMMAND} -E echo_append "Creating wrapper code..."
-#COMMAND ${SWIG_EXECUTABLE} -c++ -ruby -autorename -xmlout parse.xml -I/usr/include swig/zypp.i
- COMMAND ${SWIG_EXECUTABLE} -I${YAST_INCLUDE_DIR} -c++ -ruby -autorename -xmlout ${CMAKE_CURRENT_BINARY_DIR}/parse.xml -o ${CMAKE_CURRENT_BINARY_DIR}/ycp_wrap.cxx -I${ZYPP_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/ycp.i
+ #COMMAND ${SWIG_EXECUTABLE} -c++ -ruby -autorename -xmlout parse.xml -I/usr/include swig/zypp.i
+ COMMAND ${SWIG_EXECUTABLE} -I${YAST_INCLUDE_DIR} -c++ -ruby -autorename -xmlout ${CMAKE_CURRENT_BINARY_DIR}/parse.xml -o ${CMAKE_CURRENT_BINARY_DIR}/${name}_wrap.cxx -I${ZYPP_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/${name}.i
COMMAND ${CMAKE_COMMAND} -E echo "Done."
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
- DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/ycp.i
+ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${name}.i
)
-ADD_CUSTOM_TARGET( glue
- DEPENDS ${SWIG_OUTPUT}
-)
-
-ADD_LIBRARY( ycpx SHARED "${CMAKE_CURRENT_BINARY_DIR}/ycp_wrap.cxx" )
-SET_TARGET_PROPERTIES( ycpx PROPERTIES PREFIX "" )
-ADD_DEPENDENCIES( ycpx glue )
+ ADD_CUSTOM_TARGET( ${name}_glue
+ DEPENDS ${SWIG_OUTPUT}
+ )
+
+ ADD_LIBRARY( ${name}x SHARED "${CMAKE_CURRENT_BINARY_DIR}/${name}_wrap.cxx" )
+ SET_TARGET_PROPERTIES( ${name}x PROPERTIES PREFIX "" )
+ ADD_DEPENDENCIES( ${name}x ${name}_glue )
+ENDMACRO(swig_wrap_lib)
INCLUDE_DIRECTORIES( ${RUBY_INCLUDE_PATH} )
INCLUDE_DIRECTORIES( ${YAST_INCLUDE_DIR} )
+
+swig_wrap_lib(ycp)
+swig_wrap_lib(yui)
+
TARGET_LINK_LIBRARIES( ycpx ${YAST_LIBRARY} )
-TARGET_LINK_LIBRARIES( ycpx ${YAST_YCP_LIBRARY} )
+TARGET_LINK_LIBRARIES( ycpx ${YAST_${NAME}_LIBRARY} )
TARGET_LINK_LIBRARIES( ycpx ${YAST_PLUGIN_WFM_LIBRARY} )
TARGET_LINK_LIBRARIES( ycpx ${RUBY_LIBRARY} )
INSTALL(TARGETS ycpx LIBRARY DESTINATION ${RUBY_ARCH_DIR} )
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/ycp.rb DESTINATION
+${RUBY_VENDORLIB_DIR} )
+
+INSTALL(TARGETS yuix LIBRARY DESTINATION ${RUBY_ARCH_DIR} )
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/ui.rb DESTINATION
+${RUBY_VENDORLIB_DIR} )
+
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/ycp.rb DESTINATION ${RUBY_VENDORLIB_DIR} )
\ No newline at end of file
Modified: trunk/ruby-bindings/src/swig/ycp.rb
URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/src/swig/ycp.rb?rev=45335&r1=45334&r2=45335&view=diff
==============================================================================
--- trunk/ruby-bindings/src/swig/ycp.rb (original)
+++ trunk/ruby-bindings/src/swig/ycp.rb Tue Mar 11 00:48:30 2008
@@ -21,4 +21,4 @@
ENV['LD_LIBRARY_PATH'] = "/usr/lib/YaST2/plugin"
# Load the native part (.so)
-require 'ycpx'
\ No newline at end of file
+require 'ycpx'
Added: trunk/ruby-bindings/src/swig/yui.i
URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/src/swig/yui.i?rev=45335&view=auto
==============================================================================
--- trunk/ruby-bindings/src/swig/yui.i (added)
+++ trunk/ruby-bindings/src/swig/yui.i Tue Mar 11 00:48:30 2008
@@ -0,0 +1,7 @@
+%module yuix
+
+%{
+#include