Author: dmacvicar Date: Wed Apr 16 17:29:34 2008 New Revision: 46755 URL: http://svn.opensuse.org/viewcvs/yast?rev=46755&view=rev Log: - remove logging - fix builtins Modified: trunk/ruby-bindings/examples/ruby/Bar.rb trunk/ruby-bindings/src/CMakeLists.txt trunk/ruby-bindings/src/ruby/CMakeLists.txt trunk/ruby-bindings/src/ruby/Y2RubyTypeConv.cc trunk/ruby-bindings/src/ruby/YCP.cc trunk/ruby-bindings/src/ruby/ycp.rb Modified: trunk/ruby-bindings/examples/ruby/Bar.rb URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/examples/ruby/Bar.rb?rev=46755&r1=46754&r2=46755&view=diff ============================================================================== --- trunk/ruby-bindings/examples/ruby/Bar.rb (original) +++ trunk/ruby-bindings/examples/ruby/Bar.rb Wed Apr 16 17:29:34 2008 @@ -1,8 +1,9 @@ -require 'yast' +require 'ycp' +require 'ycp/scr' module Bar def self.try - m = YaST::Module.new("SCR") - return m.Execute(".target.bash", "firefox").class.to_s + m = YaST::SCR + return m.execute(".target.bash", "firefox").class.to_s end end Modified: trunk/ruby-bindings/src/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/src/CMakeLists.txt?rev=46755&r1=46754&r2=46755&view=diff ============================================================================== --- trunk/ruby-bindings/src/CMakeLists.txt (original) +++ trunk/ruby-bindings/src/CMakeLists.txt Wed Apr 16 17:29:34 2008 @@ -1,2 +1,2 @@ -ADD_SUBDIRECTORY(swig) + ADD_SUBDIRECTORY(ruby) \ No newline at end of file Modified: trunk/ruby-bindings/src/ruby/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/src/ruby/CMakeLists.txt?rev=46755&r1=46754&r2=46755&view=diff ============================================================================== --- trunk/ruby-bindings/src/ruby/CMakeLists.txt (original) +++ trunk/ruby-bindings/src/ruby/CMakeLists.txt Wed Apr 16 17:29:34 2008 @@ -39,21 +39,20 @@ # add the automatically determined parts of the RPATH # which point to directories outside the build tree to the install RPATH SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) - INCLUDE_DIRECTORIES( ${RUBY_INCLUDE_PATH} ) INCLUDE_DIRECTORIES( ${YAST_INCLUDE_DIR} ) -ADD_LIBRARY( yastx SHARED ${yast_ruby_module_SRCS}) -SET_TARGET_PROPERTIES( yastx PROPERTIES PREFIX "" ) -TARGET_LINK_LIBRARIES( yastx ${YAST_LIBRARY} ) -TARGET_LINK_LIBRARIES( yastx ${YAST_YCP_LIBRARY} ) -TARGET_LINK_LIBRARIES( yastx ${YAST_PLUGIN_WFM_LIBRARY} ) -TARGET_LINK_LIBRARIES( yastx ${YAST_PLUGIN_SCR_LIBRARY} ) -TARGET_LINK_LIBRARIES( yastx ${RUBY_LIBRARY} ) -INSTALL(TARGETS yastx LIBRARY DESTINATION ${RUBY_VENDORARCH_DIR} ) +ADD_LIBRARY( ycpx SHARED ${yast_ruby_module_SRCS}) +SET_TARGET_PROPERTIES( ycpx PROPERTIES PREFIX "" ) +TARGET_LINK_LIBRARIES( ycpx ${YAST_LIBRARY} ) +TARGET_LINK_LIBRARIES( ycpx ${YAST_YCP_LIBRARY} ) +TARGET_LINK_LIBRARIES( ycpx ${YAST_PLUGIN_WFM_LIBRARY} ) +TARGET_LINK_LIBRARIES( ycpx ${YAST_PLUGIN_SCR_LIBRARY} ) +TARGET_LINK_LIBRARIES( ycpx ${RUBY_LIBRARY} ) +INSTALL(TARGETS ycpx LIBRARY DESTINATION ${RUBY_VENDORARCH_DIR} ) -INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/yast.rb DESTINATION ${RUBY_VENDORLIB_DIR} ) +INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/ycp.rb DESTINATION ${RUBY_VENDORLIB_DIR} ) ADD_LIBRARY( py2lang_ruby SHARED ${ruby_yast_plugin_SRCS}) TARGET_LINK_LIBRARIES( py2lang_ruby ${YAST_LIBRARY} ) Modified: trunk/ruby-bindings/src/ruby/Y2RubyTypeConv.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/src/ruby/Y2RubyTypeConv.cc?rev=46755&r1=46754&r2=46755&view=diff ============================================================================== --- trunk/ruby-bindings/src/ruby/Y2RubyTypeConv.cc (original) +++ trunk/ruby-bindings/src/ruby/Y2RubyTypeConv.cc Wed Apr 16 17:29:34 2008 @@ -113,7 +113,7 @@ VALUE rbhash; rbhash = rb_hash_new(); YCPMap map = ycpval->asMap(); - y2internal("map size %d\n", (int) map.size()); + //y2internal("map size %d\n", (int) map.size()); for ( YCPMapIterator it = map.begin(); it != map.end(); ++it ) { @@ -128,7 +128,7 @@ VALUE rblist; rblist = rb_ary_new(); YCPList list = ycpval->asList(); - y2internal("list size %d\n",list.size()); + //y2internal("list size %d\n",list.size()); for (int i=0; i < list.size(); i++) { rb_ary_push( rblist, ycpvalue_2_rbvalue(list.value(i))); Modified: trunk/ruby-bindings/src/ruby/YCP.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/src/ruby/YCP.cc?rev=46755&r1=46754&r2=46755&view=diff ============================================================================== --- trunk/ruby-bindings/src/ruby/YCP.cc (original) +++ trunk/ruby-bindings/src/ruby/YCP.cc Wed Apr 16 17:29:34 2008 @@ -534,7 +534,7 @@ extern "C" { void - Init_yastx() + Init_ycpx() { YCPPathSearch::initialize (); init_wfm(); Modified: trunk/ruby-bindings/src/ruby/ycp.rb URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/src/ruby/ycp.rb?rev=46755&r1=46754&r2=46755&view=diff ============================================================================== --- trunk/ruby-bindings/src/ruby/ycp.rb (original) +++ trunk/ruby-bindings/src/ruby/ycp.rb Wed Apr 16 17:29:34 2008 @@ -18,10 +18,8 @@ # 2 of the License, or (at your option) any later version. # -ENV['LD_LIBRARY_PATH'] = "/usr/lib/YaST2/plugin" - # Load the native part (.so) -require 'yastx' +require 'ycpx' module YaST def y2_logger_helper(*args) @@ -217,4 +215,4 @@ end end -end # module YaST \ No newline at end of file +end # module YaST -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org