October 2011 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r66201 - in /trunk/ruby-bindings/src/ruby: Y2RubyTypeConv.cc Y2RubyTypeConv.h YRuby.cc
by mvidner＠svn2.opensuse.org 03 Oct '11

03 Oct '11

Author: mvidner Date: Mon Oct 3 17:23:29 2011 New Revision: 66201 URL: http://svn.opensuse.org/viewcvs/yast?rev=66201&view=rev Log: Removed some exception logic, as it is no longer raised. This reverts commit 419482f6631963305142c8cbc1a4da2bb03a5abe. "Don't raise a Ruby exception when returning to YCP (->segv). Log and return nil." Modified: trunk/ruby-bindings/src/ruby/Y2RubyTypeConv.cc trunk/ruby-bindings/src/ruby/Y2RubyTypeConv.h trunk/ruby-bindings/src/ruby/YRuby.cc Modified: trunk/ruby-bindings/src/ruby/Y2RubyTypeConv.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/src/ruby/Y2RubyTyp… ============================================================================== --- trunk/ruby-bindings/src/ruby/Y2RubyTypeConv.cc (original) +++ trunk/ruby-bindings/src/ruby/Y2RubyTypeConv.cc Mon Oct 3 17:23:29 2011 @@ -46,8 +46,6 @@ #include <ycp/YCPExternal.h> #include <ycp/Import.h> -#include <y2util/stringutil.h> - #include "Y2RubyTypePath.h" #include "Y2RubyTypeTerm.h" @@ -203,7 +201,7 @@ */ YCPValue -rbvalue_2_ycpvalue( VALUE value, ConversionFlags flags ) +rbvalue_2_ycpvalue( VALUE value ) { //VALUE klass = rb_funcall( value, rb_intern("class"), 0); //std::cout << StringValuePtr( rb_funcall( klass, rb_intern("to_s"), 0)) << " | " << StringValuePtr(rb_funcall( value, rb_intern("inspect"), 0)) << std::endl; @@ -250,15 +248,6 @@ } return rbobject_2_ycpexternal(value); - /* - string msg = stringutil::form("Conversion of Ruby type %s not supported", class_name); - if (flags & DONT_RAISE) { - y2error("%s", msg.c_str()); - } else { - rb_raise(rb_eTypeError, msg.c_str()); - } - return YCPVoid(); - */ } } } Modified: trunk/ruby-bindings/src/ruby/Y2RubyTypeConv.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/src/ruby/Y2RubyTyp… ============================================================================== --- trunk/ruby-bindings/src/ruby/Y2RubyTypeConv.h (original) +++ trunk/ruby-bindings/src/ruby/Y2RubyTypeConv.h Mon Oct 3 17:23:29 2011 @@ -32,17 +32,12 @@ extern "C" VALUE ycpvalue_2_rbvalue( YCPValue ycpval ); -enum ConversionFlags { - NONE, - DONT_RAISE, -}; - /** * Converts a Ruby Value into a YCPValue * Supports neested lists and maps using recursion. */ YCPValue -rbvalue_2_ycpvalue( VALUE value, ConversionFlags flags = NONE); +rbvalue_2_ycpvalue( VALUE value ); /** Modified: trunk/ruby-bindings/src/ruby/YRuby.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/src/ruby/YRuby.cc?… ============================================================================== --- trunk/ruby-bindings/src/ruby/YRuby.cc (original) +++ trunk/ruby-bindings/src/ruby/YRuby.cc Mon Oct 3 17:23:29 2011 @@ -222,6 +222,6 @@ //VALUE result = rb_funcall( module, rb_intern(function.c_str()), 2, INT2NUM(2), INT2NUM(3) ); y2milestone( "Called function '%s' in module '%s'", function.c_str(), module_name.c_str()); } - return rbvalue_2_ycpvalue(result, DONT_RAISE); + return rbvalue_2_ycpvalue(result); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66200 - /trunk/ruby-bindings/src/ruby/Y2RubyTypeConv.cc
by mvidner＠svn2.opensuse.org 03 Oct '11

03 Oct '11

Author: mvidner Date: Mon Oct 3 17:23:26 2011 New Revision: 66200 URL: http://svn.opensuse.org/viewcvs/yast?rev=66200&view=rev Log: Pass ruby objects as YCPExternal FIXME no reference counting Modified: trunk/ruby-bindings/src/ruby/Y2RubyTypeConv.cc Modified: trunk/ruby-bindings/src/ruby/Y2RubyTypeConv.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/src/ruby/Y2RubyTyp… ============================================================================== --- trunk/ruby-bindings/src/ruby/Y2RubyTypeConv.cc (original) +++ trunk/ruby-bindings/src/ruby/Y2RubyTypeConv.cc Mon Oct 3 17:23:26 2011 @@ -43,6 +43,7 @@ #include <ycp/YCPSymbol.h> #include <ycp/YCPPath.h> #include <ycp/YCPVoid.h> +#include <ycp/YCPExternal.h> #include <ycp/Import.h> #include <y2util/stringutil.h> @@ -97,6 +98,14 @@ } +#define YCP_EXTERNAL_MAGIC "Ruby object" + +static YCPExternal rbobject_2_ycpexternal( VALUE value ) +{ + YCPExternal ex((void*) value, string(YCP_EXTERNAL_MAGIC), NULL); + return ex; +} + /** * * ycpvalue_2_rbvalue @@ -171,6 +180,14 @@ YCPSymbol symbol = ycpval->asSymbol(); return rb_intern(symbol->symbol_cstr()); } + else if (ycpval->isExternal()) + { + YCPExternal ex = ycpval->asExternal(); + if (ex->magic() == string(YCP_EXTERNAL_MAGIC)) { + return (VALUE)(ex->payload()); // FIXME reference counting + } + y2error("Unexpected magic '%s'.", (ex->magic()).c_str()); + } rb_raise( rb_eTypeError, "Conversion of YCP type %s not supported", ycpval->toString().c_str() ); return Qnil; } @@ -232,6 +249,8 @@ return ryast_yterm_from_rterm(value); } + return rbobject_2_ycpexternal(value); + /* string msg = stringutil::form("Conversion of Ruby type %s not supported", class_name); if (flags & DONT_RAISE) { y2error("%s", msg.c_str()); @@ -239,6 +258,7 @@ rb_raise(rb_eTypeError, msg.c_str()); } return YCPVoid(); + */ } } } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66199 - /trunk/ruby-bindings/tests/ycp/ruby_object.ycp
by mvidner＠svn2.opensuse.org 03 Oct '11

03 Oct '11

Author: mvidner Date: Mon Oct 3 17:23:24 2011 New Revision: 66199 URL: http://svn.opensuse.org/viewcvs/yast?rev=66199&view=rev Log: Fail the YCP test if shcme is not http Modified: trunk/ruby-bindings/tests/ycp/ruby_object.ycp Modified: trunk/ruby-bindings/tests/ycp/ruby_object.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/tests/ycp/ruby_obj… ============================================================================== --- trunk/ruby-bindings/tests/ycp/ruby_object.ycp (original) +++ trunk/ruby-bindings/tests/ycp/ruby_object.ycp Mon Oct 3 17:23:24 2011 @@ -11,4 +11,5 @@ any my_uri = URI::parse("http://www.ruby-lang.org/"); string scheme = (string) URI::scheme(my_uri); y2milestone("scheme: %1", scheme); + return scheme == "http"; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66198 - in /trunk/ruby-bindings/src/ruby: Y2RubyTypeConv.cc Y2RubyTypeConv.h YRuby.cc
by mvidner＠svn2.opensuse.org 03 Oct '11

03 Oct '11

Author: mvidner Date: Mon Oct 3 17:23:22 2011 New Revision: 66198 URL: http://svn.opensuse.org/viewcvs/yast?rev=66198&view=rev Log: Don't raise a Ruby exception when returning to YCP (->segv). Log and return nil. Modified: trunk/ruby-bindings/src/ruby/Y2RubyTypeConv.cc trunk/ruby-bindings/src/ruby/Y2RubyTypeConv.h trunk/ruby-bindings/src/ruby/YRuby.cc Modified: trunk/ruby-bindings/src/ruby/Y2RubyTypeConv.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/src/ruby/Y2RubyTyp… ============================================================================== --- trunk/ruby-bindings/src/ruby/Y2RubyTypeConv.cc (original) +++ trunk/ruby-bindings/src/ruby/Y2RubyTypeConv.cc Mon Oct 3 17:23:22 2011 @@ -45,6 +45,8 @@ #include <ycp/YCPVoid.h> #include <ycp/Import.h> +#include <y2util/stringutil.h> + #include "Y2RubyTypePath.h" #include "Y2RubyTypeTerm.h" @@ -184,7 +186,7 @@ */ YCPValue -rbvalue_2_ycpvalue( VALUE value ) +rbvalue_2_ycpvalue( VALUE value, ConversionFlags flags ) { //VALUE klass = rb_funcall( value, rb_intern("class"), 0); //std::cout << StringValuePtr( rb_funcall( klass, rb_intern("to_s"), 0)) << " | " << StringValuePtr(rb_funcall( value, rb_intern("inspect"), 0)) << std::endl; @@ -229,8 +231,14 @@ { return ryast_yterm_from_rterm(value); } - rb_raise( rb_eTypeError, "Conversion of Ruby type %s not supported", class_name); - return YCPValue(); + + string msg = stringutil::form("Conversion of Ruby type %s not supported", class_name); + if (flags & DONT_RAISE) { + y2error("%s", msg.c_str()); + } else { + rb_raise(rb_eTypeError, msg.c_str()); + } + return YCPVoid(); } } } Modified: trunk/ruby-bindings/src/ruby/Y2RubyTypeConv.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/src/ruby/Y2RubyTyp… ============================================================================== --- trunk/ruby-bindings/src/ruby/Y2RubyTypeConv.h (original) +++ trunk/ruby-bindings/src/ruby/Y2RubyTypeConv.h Mon Oct 3 17:23:22 2011 @@ -32,12 +32,17 @@ extern "C" VALUE ycpvalue_2_rbvalue( YCPValue ycpval ); +enum ConversionFlags { + NONE, + DONT_RAISE, +}; + /** * Converts a Ruby Value into a YCPValue * Supports neested lists and maps using recursion. */ YCPValue -rbvalue_2_ycpvalue( VALUE value ); +rbvalue_2_ycpvalue( VALUE value, ConversionFlags flags = NONE); /** Modified: trunk/ruby-bindings/src/ruby/YRuby.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/src/ruby/YRuby.cc?… ============================================================================== --- trunk/ruby-bindings/src/ruby/YRuby.cc (original) +++ trunk/ruby-bindings/src/ruby/YRuby.cc Mon Oct 3 17:23:22 2011 @@ -222,6 +222,6 @@ //VALUE result = rb_funcall( module, rb_intern(function.c_str()), 2, INT2NUM(2), INT2NUM(3) ); y2milestone( "Called function '%s' in module '%s'", function.c_str(), module_name.c_str()); } - return rbvalue_2_ycpvalue(result); + return rbvalue_2_ycpvalue(result, DONT_RAISE); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66197 - in /trunk/ruby-bindings/tests/ruby: module-arch.rb modules/ modules/Arch.ybc modules/Arch.ycp ycp_import.rb ycp_iterators.rb
by mvidner＠svn2.opensuse.org 03 Oct '11

03 Oct '11

Author: mvidner Date: Mon Oct 3 17:23:17 2011 New Revision: 66197 URL: http://svn.opensuse.org/viewcvs/yast?rev=66197&view=rev Log: Added a mock Arch not to buldrequire yast2.rpm for tests ybc file included on purpose in hope of simplifying things Added: trunk/ruby-bindings/tests/ruby/modules/ trunk/ruby-bindings/tests/ruby/modules/Arch.ybc trunk/ruby-bindings/tests/ruby/modules/Arch.ycp (with props) Modified: trunk/ruby-bindings/tests/ruby/module-arch.rb trunk/ruby-bindings/tests/ruby/ycp_import.rb trunk/ruby-bindings/tests/ruby/ycp_iterators.rb Modified: trunk/ruby-bindings/tests/ruby/module-arch.rb URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/tests/ruby/module-… ============================================================================== --- trunk/ruby-bindings/tests/ruby/module-arch.rb (original) +++ trunk/ruby-bindings/tests/ruby/module-arch.rb Mon Oct 3 17:23:17 2011 @@ -4,6 +4,7 @@ $:.unshift "../../build/src/ruby" # ycpx.so $:.unshift "../../src/ruby" # ycp.rb +ENV["Y2DIR"] = File.dirname(__FILE__) require 'test/unit' Added: trunk/ruby-bindings/tests/ruby/modules/Arch.ybc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/tests/ruby/modules… ============================================================================== Files trunk/ruby-bindings/tests/ruby/modules/Arch.ybc (added) and trunk/ruby-bindings/tests/ruby/modules/Arch.ybc Mon Oct 3 17:23:17 2011 differ Added: trunk/ruby-bindings/tests/ruby/modules/Arch.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/tests/ruby/modules… ============================================================================== --- trunk/ruby-bindings/tests/ruby/modules/Arch.ycp (added) +++ trunk/ruby-bindings/tests/ruby/modules/Arch.ycp Mon Oct 3 17:23:17 2011 @@ -0,0 +1,14 @@ +// mock Arch +{ + module "Arch"; + + global boolean sparc32() { + return false; + } + global boolean is_xen() { + return false; + } + global string arch_short() { + return "ZX Spectrum"; + } +} Modified: trunk/ruby-bindings/tests/ruby/ycp_import.rb URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/tests/ruby/ycp_imp… ============================================================================== --- trunk/ruby-bindings/tests/ruby/ycp_import.rb (original) +++ trunk/ruby-bindings/tests/ruby/ycp_import.rb Mon Oct 3 17:23:17 2011 @@ -4,6 +4,7 @@ $:.unshift "../../build/src/ruby" $:.unshift "../../src/ruby" +ENV["Y2DIR"] = File.dirname(__FILE__) require 'test/unit' require 'ycp' Modified: trunk/ruby-bindings/tests/ruby/ycp_iterators.rb URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/tests/ruby/ycp_ite… ============================================================================== --- trunk/ruby-bindings/tests/ruby/ycp_iterators.rb (original) +++ trunk/ruby-bindings/tests/ruby/ycp_iterators.rb Mon Oct 3 17:23:17 2011 @@ -6,6 +6,7 @@ $:.unshift "../../build/src/ruby" $:.unshift "../../src/ruby" +ENV["Y2DIR"] = File.dirname(__FILE__) require 'test/unit' require 'ycp' -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66196 - in /trunk/ruby-bindings/tests/ycp: CMakeLists.txt URI.rb ruby_object.ycp
by mvidner＠svn2.opensuse.org 03 Oct '11

03 Oct '11

Author: mvidner Date: Mon Oct 3 17:23:14 2011 New Revision: 66196 URL: http://svn.opensuse.org/viewcvs/yast?rev=66196&view=rev Log: Test passing Ruby objects to and from YCP. (shouldnt work yet) Added: trunk/ruby-bindings/tests/ycp/URI.rb trunk/ruby-bindings/tests/ycp/ruby_object.ycp (with props) Modified: trunk/ruby-bindings/tests/ycp/CMakeLists.txt Modified: trunk/ruby-bindings/tests/ycp/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/tests/ycp/CMakeLis… ============================================================================== --- trunk/ruby-bindings/tests/ycp/CMakeLists.txt (original) +++ trunk/ruby-bindings/tests/ycp/CMakeLists.txt Mon Oct 3 17:23:14 2011 @@ -5,3 +5,4 @@ enable_testing() add_test(from_ycp ${CMAKE_CURRENT_SOURCE_DIR}/run_ycp_test.sh ${CMAKE_CURRENT_SOURCE_DIR}/ruby_from_ycp.ycp) +add_test(ruby_object ${CMAKE_CURRENT_SOURCE_DIR}/run_ycp_test.sh ${CMAKE_CURRENT_SOURCE_DIR}/ruby_object.ycp) Added: trunk/ruby-bindings/tests/ycp/URI.rb URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/tests/ycp/URI.rb?r… ============================================================================== --- trunk/ruby-bindings/tests/ycp/URI.rb (added) +++ trunk/ruby-bindings/tests/ycp/URI.rb Mon Oct 3 17:23:14 2011 @@ -0,0 +1,11 @@ +require 'uri' +module URI + # URI::parse works even without glue? + #def self.parse(uri_string) + + #end + + def self.scheme(instance) + instance.scheme + end +end Added: trunk/ruby-bindings/tests/ycp/ruby_object.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/tests/ycp/ruby_obj… ============================================================================== --- trunk/ruby-bindings/tests/ycp/ruby_object.ycp (added) +++ trunk/ruby-bindings/tests/ycp/ruby_object.ycp Mon Oct 3 17:23:14 2011 @@ -0,0 +1,14 @@ +// +{ + // URI is a local ruby file to glue the standard uri.rb + import "URI"; + + // Ruby: + // uri = URI.parse("http://www.ruby-lang.org/") + // assert_equal "http", uri.scheme + + // my_uri is an opaque ruby object + any my_uri = URI::parse("http://www.ruby-lang.org/"); + string scheme = (string) URI::scheme(my_uri); + y2milestone("scheme: %1", scheme); +} -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66195 - in /trunk/ruby-bindings: CMakeLists.txt src/CMakeLists.txt src/ruby/CMakeLists.txt
by mvidner＠svn2.opensuse.org 03 Oct '11

03 Oct '11

Author: mvidner Date: Mon Oct 3 17:23:12 2011 New Revision: 66195 URL: http://svn.opensuse.org/viewcvs/yast?rev=66195&view=rev Log: Reformatted to pass cmakelint (almost. how to split long lines?) http://code.google.com/p/cmake-lint/wiki/CMakeStyleGuide Modified: trunk/ruby-bindings/CMakeLists.txt trunk/ruby-bindings/src/CMakeLists.txt trunk/ruby-bindings/src/ruby/CMakeLists.txt Modified: trunk/ruby-bindings/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/CMakeLists.txt?rev… ============================================================================== --- trunk/ruby-bindings/CMakeLists.txt (original) +++ trunk/ruby-bindings/CMakeLists.txt Mon Oct 3 17:23:12 2011 @@ -4,73 +4,71 @@ cmake_minimum_required(VERSION 2.4) if(COMMAND cmake_policy) - # escape preprocessor, see -DVERSION below - cmake_policy(SET CMP0005 OLD) -endif(COMMAND cmake_policy) - -PROJECT(yast2-ruby-bindings) -SET(PACKAGE "yast2-ruby-bindings") -SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O3 -Wall -Woverloaded-virtual" ) -SET( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O3 -Wall" ) + # let cmake escape preprocessor definitions + cmake_policy(SET CMP0005 NEW) +endif() + +project(yast2-ruby-bindings) +set(PACKAGE "yast2-ruby-bindings") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O3 -Wall -Woverloaded-virtual") +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O3 -Wall") # # Where is SWIG ? # -FIND_PACKAGE(SWIG) -IF ( NOT SWIG_FOUND ) - -FIND_PROGRAM(SWIG_EXECUTABLE - NAMES swig-1.3 swig - PATHS ${SWIG_DIR} ${SWIG_DIR}/.. ${SWIG_DIR}/../../bin /usr/bin /usr/local/bin ${CMAKE_INSTALL_PREFIX}/bin -) -ENDIF ( NOT SWIG_FOUND ) - -IF ( NOT SWIG_EXECUTABLE ) - MESSAGE( FATAL_ERROR "SWIG not found." ) -ELSE ( NOT SWIG_EXECUTABLE ) - MESSAGE( STATUS "SWIG found at ${SWIG_EXECUTABLE}" ) -ENDIF ( NOT SWIG_EXECUTABLE ) +find_package(SWIG) +if(NOT SWIG_FOUND) + find_program(SWIG_EXECUTABLE + NAMES swig-1.3 swig + PATHS ${SWIG_DIR} ${SWIG_DIR}/.. ${SWIG_DIR}/../../bin /usr/bin /usr/local/bin ${CMAKE_INSTALL_PREFIX}/bin) +endif() + +if(NOT SWIG_EXECUTABLE) + message(FATAL_ERROR "SWIG not found.") +else() + message(STATUS "SWIG found at ${SWIG_EXECUTABLE}") +endif() # # Where is YaST ? # -FIND_PACKAGE(Yast REQUIRED) -IF ( NOT YAST_LIBRARY ) - MESSAGE( FATAL_ERROR "Please install yast2-core-devel." ) -ENDIF ( NOT YAST_LIBRARY ) - -IF ( NOT YAST_PLUGIN_UI_LIBRARY ) - MESSAGE( FATAL_ERROR "YAST_PLUGIN_UI_LIBRARY not set, please install yast2-ycp-ui-bindings-devel." ) -ENDIF ( NOT YAST_PLUGIN_UI_LIBRARY ) +find_package(Yast REQUIRED) +if(NOT YAST_LIBRARY) + message(FATAL_ERROR "Please install yast2-core-devel.") +endif() + +if(NOT YAST_PLUGIN_UI_LIBRARY) + message(FATAL_ERROR "YAST_PLUGIN_UI_LIBRARY not set, please install yast2-ycp-ui-bindings-devel.") +endif() # # Where is Ruby ? # -FIND_PACKAGE(Ruby REQUIRED) -IF ( NOT RUBY_EXECUTABLE ) - MESSAGE( FATAL_ERROR "Ruby not found." ) -ENDIF ( NOT RUBY_EXECUTABLE ) +find_package(Ruby REQUIRED) +if(NOT RUBY_EXECUTABLE) + message(FATAL_ERROR "Ruby not found.") +endif() # # -> src/ # -ADD_SUBDIRECTORY(src) +add_subdirectory(src) # # -> tests/ # -INCLUDE(CTest) -ENABLE_TESTING() +include(CTest) +enable_testing() -ADD_SUBDIRECTORY(tests) +add_subdirectory(tests) # # packaging # -SET( RPMNAME "yast2-ruby-bindings" ) +set(RPMNAME "yast2-ruby-bindings") -GENERATE_PACKAGING(${RPMNAME} ${VERSION}) +generate_packaging(${RPMNAME} ${VERSION}) Modified: trunk/ruby-bindings/src/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/src/CMakeLists.txt… ============================================================================== --- trunk/ruby-bindings/src/CMakeLists.txt (original) +++ trunk/ruby-bindings/src/CMakeLists.txt Mon Oct 3 17:23:12 2011 @@ -1,2 +1 @@ - -ADD_SUBDIRECTORY(ruby) \ No newline at end of file +add_subdirectory(ruby) Modified: trunk/ruby-bindings/src/ruby/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/src/ruby/CMakeList… ============================================================================== --- trunk/ruby-bindings/src/ruby/CMakeLists.txt (original) +++ trunk/ruby-bindings/src/ruby/CMakeLists.txt Mon Oct 3 17:23:12 2011 @@ -1,7 +1,6 @@ +add_definitions(-DY2LOG=\"Ruby\") -ADD_DEFINITIONS(-DY2LOG=\\\"Ruby\\\") - -SET(yast_ruby_module_SRCS +set(yast_ruby_module_SRCS YCP.cc Y2RubyTypePath.cc # YCP.cc -> ryast_path_init() Y2RubyTypeTerm.cc # YCP.cc -> ryast_term_init() @@ -11,7 +10,7 @@ RubyLogger.h ) -SET(ruby_yast_plugin_SRCS +set(ruby_yast_plugin_SRCS RubyLogger.cc Y2CCRuby.cc Y2RubyComponent.cc @@ -23,7 +22,7 @@ Y2RubyUtils.cc ) -SET(ruby_yast_plugin_HEADERS +set(ruby_yast_plugin_HEADERS RubyLogger.h Y2CCRuby.h Y2RubyComponent.h @@ -34,12 +33,12 @@ Y2RubyTypeTerm.h ) -INCLUDE_DIRECTORIES( ${RUBY_INCLUDE_PATH} ) -INCLUDE_DIRECTORIES( ${YAST_INCLUDE_DIR} ) +include_directories( ${RUBY_INCLUDE_PATH} ) +include_directories( ${YAST_INCLUDE_DIR} ) -LINK_DIRECTORIES(${YAST_PLUGIN_DIR}) +link_directories(${YAST_PLUGIN_DIR}) -ADD_DEFINITIONS( ${CC_FLAGS} -Wno-deprecated) +add_definitions(${CC_FLAGS} -Wno-deprecated) # # Ruby -> YCP/YaST @@ -47,8 +46,9 @@ # -ADD_LIBRARY( ycpx SHARED ${yast_ruby_module_SRCS}) -SET_TARGET_PROPERTIES( ycpx PROPERTIES PREFIX "" ) +add_library(ycpx SHARED ${yast_ruby_module_SRCS}) +# libycpx.so -> ycpx.so +set_target_properties(ycpx PROPERTIES PREFIX "") # # Use rpath to find YaST plugin libs (wfm has static constructors :-( ) @@ -57,35 +57,35 @@ # tight control) CMake should be able to handle this. However, it somehow does # not work. # -#SET_TARGET_PROPERTIES( ycpx PROPERTIES SKIP_BUILD_RPATH FALSE) -#SET_TARGET_PROPERTIES( ycpx PROPERTIES BUILD_WITH_INSTALL_RPATH FALSE) -#SET_TARGET_PROPERTIES( ycpx PROPERTIES INSTALL_RPATH_USE_LINK_PATH FALSE) -#SET_TARGET_PROPERTIES( ycpx PROPERTIES INSTALL_RPATH "${YAST_PLUGIN_DIR}") +#set_target_properties( ycpx PROPERTIES SKIP_BUILD_RPATH FALSE) +#set_target_properties( ycpx PROPERTIES BUILD_WITH_INSTALL_RPATH FALSE) +#set_target_properties( ycpx PROPERTIES INSTALL_RPATH_USE_LINK_PATH FALSE) +#set_target_properties( ycpx PROPERTIES INSTALL_RPATH "${YAST_PLUGIN_DIR}") # # So using an explicit linker option instead: # (http://www.cmake.org/pipermail/cmake/2008-January/019321.html) # SET ( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-rpath,'${YAST_PLUGIN_DIR}'" ) -TARGET_LINK_LIBRARIES( ycpx ${YAST_LIBRARY} ) -TARGET_LINK_LIBRARIES( ycpx ${YAST_YCP_LIBRARY} ) +target_link_libraries( ycpx ${YAST_LIBRARY} ) +target_link_libraries( ycpx ${YAST_YCP_LIBRARY} ) # # The WFM and SCR component can only be initialized statically # (e.g. through Y2CCWFM), thus we must link against the plugin libs # and set the executables 'rpath' accordingly # -TARGET_LINK_LIBRARIES( ycpx ${YAST_PLUGIN_WFM_LIBRARY} ) -TARGET_LINK_LIBRARIES( ycpx ${YAST_PLUGIN_SCR_LIBRARY} ) -TARGET_LINK_LIBRARIES( ycpx ${YAST_PLUGIN_UI_LIBRARY} ) -TARGET_LINK_LIBRARIES( ycpx ${RUBY_LIBRARY} ) +target_link_libraries( ycpx ${YAST_PLUGIN_WFM_LIBRARY} ) +target_link_libraries( ycpx ${YAST_PLUGIN_SCR_LIBRARY} ) +target_link_libraries( ycpx ${YAST_PLUGIN_UI_LIBRARY} ) +target_link_libraries( ycpx ${RUBY_LIBRARY} ) -INSTALL(TARGETS ycpx LIBRARY DESTINATION ${RUBY_VENDORARCH_DIR} ) +install(TARGETS ycpx LIBRARY DESTINATION ${RUBY_VENDORARCH_DIR} ) -INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/ycp.rb DESTINATION ${RUBY_VENDORLIB_DIR} ) +install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/ycp.rb DESTINATION ${RUBY_VENDORLIB_DIR} ) # rdoc -SET(rdoc_dir "${CMAKE_CURRENT_BINARY_DIR}/html") +set(rdoc_dir "${CMAKE_CURRENT_BINARY_DIR}/html") ADD_CUSTOM_COMMAND ( OUTPUT ${rdoc_dir} COMMAND ${CMAKE_COMMAND} -E echo_append "Creating rdoc documentation ..." @@ -95,19 +95,17 @@ WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/ruby DEPENDS ${CMAKE_SOURCE_DIR}/src/ruby/YCP.cc ${CMAKE_SOURCE_DIR}/src/ruby/*.rb ) -ADD_CUSTOM_TARGET(ruby_rdoc ALL DEPENDS "${rdoc_dir}") -ADD_DEPENDENCIES(ruby_rdoc ycpx) +add_custom_target(ruby_rdoc ALL DEPENDS "${rdoc_dir}") +add_dependencies(ruby_rdoc ycpx) # # YCP -> Ruby # libpy2lang_ruby (YCP plugin library) # -ADD_LIBRARY( py2lang_ruby SHARED ${ruby_yast_plugin_SRCS}) -TARGET_LINK_LIBRARIES( py2lang_ruby ${YAST_LIBRARY} ) -TARGET_LINK_LIBRARIES( py2lang_ruby ${YAST_YCP_LIBRARY} ) -TARGET_LINK_LIBRARIES( py2lang_ruby ${YAST_PLUGIN_WFM_LIBRARY} ) -TARGET_LINK_LIBRARIES( py2lang_ruby ${RUBY_LIBRARY} ) -INSTALL(TARGETS py2lang_ruby LIBRARY DESTINATION ${YAST_PLUGIN_DIR} ) - -#SET_TARGET_PROPERTIES( y2lang_ruby PROPERTIES PREFIX "" ) +add_library( py2lang_ruby SHARED ${ruby_yast_plugin_SRCS}) +target_link_libraries( py2lang_ruby ${YAST_LIBRARY} ) +target_link_libraries( py2lang_ruby ${YAST_YCP_LIBRARY} ) +target_link_libraries( py2lang_ruby ${YAST_PLUGIN_WFM_LIBRARY} ) +target_link_libraries( py2lang_ruby ${RUBY_LIBRARY} ) +install(TARGETS py2lang_ruby LIBRARY DESTINATION ${YAST_PLUGIN_DIR} ) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66194 - in /trunk/ruby-bindings: ./ src/ruby/ tests/ tests/ycp/
by mvidner＠svn2.opensuse.org 03 Oct '11

03 Oct '11

Author: mvidner Date: Mon Oct 3 17:23:06 2011 New Revision: 66194 URL: http://svn.opensuse.org/viewcvs/yast?rev=66194&view=rev Log: Test calling Ruby from YCP, at RPM build time. Reference WFM so that the linker knows we do need it (stupid plugin thing) Set Y2DIR to find the plugin in the buildroot Added: trunk/ruby-bindings/tests/ycp/ trunk/ruby-bindings/tests/ycp/CMakeLists.txt trunk/ruby-bindings/tests/ycp/InRuby.rb trunk/ruby-bindings/tests/ycp/ruby_from_ycp.ycp (with props) trunk/ruby-bindings/tests/ycp/run_ycp_test.sh (with props) Modified: trunk/ruby-bindings/src/ruby/YCP.cc trunk/ruby-bindings/tests/CMakeLists.txt trunk/ruby-bindings/yast2-ruby-bindings.spec.in Modified: trunk/ruby-bindings/src/ruby/YCP.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/src/ruby/YCP.cc?re… ============================================================================== --- trunk/ruby-bindings/src/ruby/YCP.cc (original) +++ trunk/ruby-bindings/src/ruby/YCP.cc Mon Oct 3 17:23:06 2011 @@ -23,6 +23,7 @@ #include <ycp-ui/YUIComponent.h> #include <wfm/Y2WFMComponent.h> +#include <wfm/WFM.h> #include <y2/Y2ComponentBroker.h> #include <y2/Y2Namespace.h> @@ -646,6 +647,11 @@ void Init_ycpx() { + if (!WFM::registered) + { + y2milestone("WFM not registered (so what?!)"); + } + YCPPathSearch::initialize(); /* Modified: trunk/ruby-bindings/tests/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/tests/CMakeLists.t… ============================================================================== --- trunk/ruby-bindings/tests/CMakeLists.txt (original) +++ trunk/ruby-bindings/tests/CMakeLists.txt Mon Oct 3 17:23:06 2011 @@ -2,10 +2,10 @@ # CMakeLists.txt for yast2/ruby-bindings/tests # -ENABLE_TESTING() +enable_testing() # Ruby -> YaST tests -ADD_SUBDIRECTORY(ruby) +add_subdirectory(ruby) # YCP -> Ruby tests -#ADD_SUBDIRECTORY(ycp) +add_subdirectory(ycp) Added: trunk/ruby-bindings/tests/ycp/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/tests/ycp/CMakeLis… ============================================================================== --- trunk/ruby-bindings/tests/ycp/CMakeLists.txt (added) +++ trunk/ruby-bindings/tests/ycp/CMakeLists.txt Mon Oct 3 17:23:06 2011 @@ -0,0 +1,7 @@ +# +# CMakeLists.txt for yast2/ruby-bindings/tests/ycp +# + +enable_testing() + +add_test(from_ycp ${CMAKE_CURRENT_SOURCE_DIR}/run_ycp_test.sh ${CMAKE_CURRENT_SOURCE_DIR}/ruby_from_ycp.ycp) Added: trunk/ruby-bindings/tests/ycp/InRuby.rb URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/tests/ycp/InRuby.r… ============================================================================== --- trunk/ruby-bindings/tests/ycp/InRuby.rb (added) +++ trunk/ruby-bindings/tests/ycp/InRuby.rb Mon Oct 3 17:23:06 2011 @@ -0,0 +1,5 @@ +module InRuby + def self.multiply_by_eight(n) + n * 8 + end +end Added: trunk/ruby-bindings/tests/ycp/ruby_from_ycp.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/tests/ycp/ruby_fro… ============================================================================== --- trunk/ruby-bindings/tests/ycp/ruby_from_ycp.ycp (added) +++ trunk/ruby-bindings/tests/ycp/ruby_from_ycp.ycp Mon Oct 3 17:23:06 2011 @@ -0,0 +1,6 @@ +// +{ + import "InRuby"; + string result = tostring(InRuby::multiply_by_eight(10)); + y2milestone("result: %1", result); +} Added: trunk/ruby-bindings/tests/ycp/run_ycp_test.sh URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/tests/ycp/run_ycp_… ============================================================================== --- trunk/ruby-bindings/tests/ycp/run_ycp_test.sh (added) +++ trunk/ruby-bindings/tests/ycp/run_ycp_test.sh Mon Oct 3 17:23:06 2011 @@ -0,0 +1,6 @@ +#!/bin/sh +# $1 is the test case +DIR=${1%/*} +# RPM_BUILD_ROOT will hold the YCP Ruby plugin at rpm build time +export Y2DIR=$RPM_BUILD_ROOT/usr/lib/YaST2 +/usr/lib/YaST2/bin/y2base -l - -M $DIR $1 UI Modified: trunk/ruby-bindings/yast2-ruby-bindings.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/yast2-ruby-binding… ============================================================================== --- trunk/ruby-bindings/yast2-ruby-bindings.spec.in (original) +++ trunk/ruby-bindings/yast2-ruby-bindings.spec.in Mon Oct 3 17:23:06 2011 @@ -41,13 +41,18 @@ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH=1 \ .. -make %{?jobs:-j %jobs} +make %{?jobs:-j %jobs} VERBOSE=1 %install cd build make install DESTDIR=$RPM_BUILD_ROOT cd .. +%check +cd build +make test ARGS=-V +cd .. + @CLEAN@ %files -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66193 - /tags/stable-2_21_4/devtools/
by visnov＠svn2.opensuse.org 02 Oct '11

02 Oct '11

Author: visnov Date: Sun Oct 2 12:52:16 2011 New Revision: 66193 URL: http://svn.opensuse.org/viewcvs/yast?rev=66193&view=rev Log: Created tag stable-2_21_4 for devtools Added: tags/stable-2_21_4/devtools/ - copied from r66192, trunk/devtools/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66192 - in /trunk/devtools: VERSION package/yast2-devtools.changes
by visnov＠svn2.opensuse.org 02 Oct '11

02 Oct '11

Author: visnov Date: Sun Oct 2 12:52:05 2011 New Revision: 66192 URL: http://svn.opensuse.org/viewcvs/yast?rev=66192&view=rev Log: bump version Modified: trunk/devtools/VERSION trunk/devtools/package/yast2-devtools.changes Modified: trunk/devtools/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/VERSION?rev=66192&r1=66… ============================================================================== --- trunk/devtools/VERSION (original) +++ trunk/devtools/VERSION Sun Oct 2 12:52:05 2011 @@ -1 +1 @@ -2.21.3 +2.21.4 Modified: trunk/devtools/package/yast2-devtools.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/package/yast2-devtools.… ============================================================================== --- trunk/devtools/package/yast2-devtools.changes (original) +++ trunk/devtools/package/yast2-devtools.changes Sun Oct 2 12:52:05 2011 @@ -2,6 +2,7 @@ Fri Sep 30 12:26:20 CEST 2011 - visnov(a)suse.cz - added 'y2tool obssync' +- 2.21.4 ------------------------------------------------------------------- Tue Sep 27 11:23:22 CEST 2011 - visnov(a)suse.cz -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0