Hello community, here is the log from the commit of package libyui-bindings for openSUSE:Factory checked in at 2015-01-21 21:52:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libyui-bindings (Old) and /work/SRC/openSUSE:Factory/.libyui-bindings.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libyui-bindings" Changes: -------- --- /work/SRC/openSUSE:Factory/libyui-bindings/libyui-bindings.changes 2014-09-10 17:03:12.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libyui-bindings.new/libyui-bindings.changes 2015-01-21 21:52:08.000000000 +0100 @@ -1,0 +2,17 @@ +Sun Jan 18 14:06:00 UTC 2015 - [email protected] + +- Replace deprecated Config: with RbConfig: for Ruby 2.2 +- Add bindings for Mono / CSharp thanks to Matteo Pasotti + <[email protected]> +- Add CMake-switches to enable / disable languages thanks to + Matteo Pasotti <[email protected]> +- Shapen-up Mono-bindings to work as expected +- 1.1.0 + +------------------------------------------------------------------- +Thu Jan 15 13:09:48 UTC 2015 - [email protected] + +- Fixed building with cmake 3.1 (-fPIC, PREFIX, boo#911875). +- 1.0.6 + +------------------------------------------------------------------- Old: ---- libyui-bindings-1.0.5.tar.bz2 New: ---- libyui-bindings-1.1.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libyui-bindings.spec ++++++ --- /var/tmp/diff_new_pack.QYPL17/_old 2015-01-21 21:52:09.000000000 +0100 +++ /var/tmp/diff_new_pack.QYPL17/_new 2015-01-21 21:52:09.000000000 +0100 @@ -18,7 +18,7 @@ Name: libyui-bindings -Version: 1.0.5 +Version: 1.1.0 Release: 0 Summary: Bindings for libyui License: LGPL-2.1 or LGPL-3.0 @@ -52,7 +52,7 @@ %build mkdir build cd build -cmake -DPREFIX=%{prefix} \ +cmake -DYPREFIX=%{prefix} \ -DCMAKE_INSTALL_PREFIX=%{prefix} \ -DLIB=%{_lib} \ -DPYTHON_SITEDIR=%{py_sitedir} \ ++++++ libyui-bindings-1.0.5.tar.bz2 -> libyui-bindings-1.1.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-bindings-1.0.5/CMakeLists.txt new/libyui-bindings-1.1.0/CMakeLists.txt --- old/libyui-bindings-1.0.5/CMakeLists.txt 2014-09-10 09:53:10.000000000 +0200 +++ new/libyui-bindings-1.1.0/CMakeLists.txt 2015-01-20 15:38:09.000000000 +0100 @@ -6,12 +6,15 @@ if(COMMAND cmake_policy) cmake_policy(SET CMP0017 NEW) + if(POLICY CMP0046) + cmake_policy(SET CMP0046 OLD) + endif() endif(COMMAND cmake_policy) OPTION( BUILD_RUBY_GEM "Build Ruby GEM" YES ) # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked -SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH}) +SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/Modules ${CMAKE_MODULE_PATH}) SET(CMAKE_MODULE_PATH ${CMAKE_INSTALL_PREFIX}/share/cmake/Modules ${CMAKE_MODULE_PATH}) INCLUDE(${CMAKE_SOURCE_DIR}/VERSION.cmake) @@ -19,12 +22,12 @@ SET( PACKAGE "libyui-bindings" ) SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" ) -IF( NOT PREFIX ) - SET( PREFIX "/usr" ) +IF( NOT YPREFIX ) + SET( YPREFIX "/usr" ) ENDIF() -SET( CMAKE_INSTALL_PREFIX "${PREFIX}" ) +SET( CMAKE_INSTALL_PREFIX "${YPREFIX}" ) -SET( LIBYUI_INCLUDE_DIR "${PREFIX}/include" ) +SET( LIBYUI_INCLUDE_DIR "${YPREFIX}/include" ) SET( LIBYUI_LIBRARY "yui" ) SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Language Bindings for libyui") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-bindings-1.0.5/VERSION.cmake new/libyui-bindings-1.1.0/VERSION.cmake --- old/libyui-bindings-1.0.5/VERSION.cmake 2014-09-10 09:53:10.000000000 +0200 +++ new/libyui-bindings-1.1.0/VERSION.cmake 2015-01-19 16:03:11.000000000 +0100 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "1") -SET(VERSION_MINOR "0") -SET(VERSION_PATCH "5") +SET(VERSION_MINOR "1") +SET(VERSION_PATCH "0") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-bindings-1.0.5/cmake/Modules/FindMono.cmake new/libyui-bindings-1.1.0/cmake/Modules/FindMono.cmake --- old/libyui-bindings-1.0.5/cmake/Modules/FindMono.cmake 1970-01-01 01:00:00.000000000 +0100 +++ new/libyui-bindings-1.1.0/cmake/Modules/FindMono.cmake 2015-01-19 16:03:11.000000000 +0100 @@ -0,0 +1,162 @@ +# +# A CMake Module for finding Mono. +# +# The following variables are set: +# CSHARP_MONO_FOUND +# CSHARP_MONO_COMPILER_${version} eg. "CSHARP_MONO_COMPILER_2.10.2" +# CSHARP_MONO_INTERPRETOR_${version} eg. "CSHARP_MONO_INTERPRETOR_2.10.2" +# CSHARP_MONO_VERSION eg. "2.10.2" +# CSHARP_MONO_VERSIONS eg. "2.10.2, 2.6.7" +# +# Additional references can be found here: +# http://www.mono-project.com/Main_Page +# http://www.mono-project.com/CSharp_Compiler +# http://mono-project.com/FAQ:_Technical (How can I tell where the Mono runtime is installed) +# +# This file is based on the work of GDCM: +# http://gdcm.svn.sf.net/viewvc/gdcm/trunk/CMake/FindMono.cmake +# Copyright (c) 2006-2010 Mathieu Malaterre <[email protected]> +# + +set( csharp_mono_valid 1 ) +if( DEFINED CSHARP_MONO_FOUND ) + # The Mono compiler has already been found + # It may have been reset by the user, verify it is correct + if( NOT DEFINED CSHARP_MONO_COMPILER_${CSHARP_MONO_VERSION} ) + set( csharp_mono_version_user ${CSHARP_MONO_VERSION} ) + set( csharp_mono_valid 0 ) + set( CSHARP_MONO_FOUND 0 ) + set( CSHARP_MONO_VERSION "CSHARP_MONO_VERSION-NOTVALID" CACHE STRING "C# Mono compiler version, choices: ${CSHARP_MONO_VERSIONS}" FORCE ) + message( FATAL_ERROR "The C# Mono version '${csharp_mono_version_user}' is not valid. Please enter one of the following: ${CSHARP_MONO_VERSIONS}" ) + endif( NOT DEFINED CSHARP_MONO_COMPILER_${CSHARP_MONO_VERSION} ) +endif( DEFINED CSHARP_MONO_FOUND ) + +unset( CSHARP_MONO_VERSIONS CACHE ) # Clear versions +if( WIN32 ) + # Search for Mono on Win32 systems + # See http://mono-project.com/OldReleases and http://www.go-mono.com/mono-downloads/download.html + set( csharp_mono_bin_dirs ) + set( csharp_mono_search_hints + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Novell\\Mono\\2.11.2;SdkInstallRoot]/bin" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Novell\\Mono\\2.10.9;SdkInstallRoot]/bin" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Novell\\Mono\\2.10.8;SdkInstallRoot]/bin" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Novell\\Mono\\2.10.7;SdkInstallRoot]/bin" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Novell\\Mono\\2.10.6;SdkInstallRoot]/bin" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Novell\\Mono\\2.10.5;SdkInstallRoot]/bin" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Novell\\Mono\\2.10.4;SdkInstallRoot]/bin" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Novell\\Mono\\2.10.3;SdkInstallRoot]/bin" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Novell\\Mono\\2.10.2;SdkInstallRoot]/bin" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Novell\\Mono\\2.10.1;SdkInstallRoot]/bin" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Novell\\Mono\\2.10;SdkInstallRoot]/bin" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Novell\\Mono\\2.8;SdkInstallRoot]/bin" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Novell\\Mono\\2.6.7;SdkInstallRoot]/bin" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Novell\\Mono\\2.6.4;SdkInstallRoot]/bin" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Novell\\Mono\\2.6.3;SdkInstallRoot]/bin" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Novell\\Mono\\2.6.1;SdkInstallRoot]/bin" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Novell\\Mono\\2.6;SdkInstallRoot]/bin" + ) + foreach( csharp_mono_search_hint ${csharp_mono_search_hints} ) + get_filename_component( csharp_mono_bin_dir "${csharp_mono_search_hint}" ABSOLUTE ) + if ( EXISTS "${csharp_mono_bin_dir}" ) + set( csharp_mono_bin_dirs ${csharp_mono_bin_dirs} ${csharp_mono_bin_dir} ) + endif ( EXISTS "${csharp_mono_bin_dir}" ) + endforeach( csharp_mono_search_hint ) + # TODO: Use HKLM_LOCAL_MACHINE\Software\Novell\Mono\DefaultCLR to specify default version + # get_filename_component( test "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Novell\\Mono;DefaultCLR]" NAME ) + + foreach ( csharp_mono_bin_dir ${csharp_mono_bin_dirs} ) + string( REPLACE "\\" "/" csharp_mono_bin_dir ${csharp_mono_bin_dir} ) + if (EXISTS "${csharp_mono_bin_dir}/dmcs.bat") + set( csharp_mono_executable "${csharp_mono_bin_dir}/dmcs.bat") + elseif (EXISTS "${csharp_mono_bin_dir}/gmcs.bat") + set( csharp_mono_executable "${csharp_mono_bin_dir}/gmcs.bat") + elseif (EXISTS "${csharp_mono_bin_dir}/mcs.bat") + set( csharp_mono_executable "${csharp_mono_bin_dir}/mcs.bat") + endif (EXISTS "${csharp_mono_bin_dir}/dmcs.bat") + + if( csharp_mono_valid ) + # Extract version number (eg. 2.10.2) + string(REGEX MATCH "([0-9]*)([.])([0-9]*)([.]*)([0-9]*)" csharp_mono_version_temp ${csharp_mono_bin_dir}) + set( CSHARP_MONO_VERSION ${csharp_mono_version_temp} CACHE STRING "C# Mono compiler version" ) + mark_as_advanced( CSHARP_MONO_VERSION ) + + # Add variable holding executable + set( CSHARP_MONO_COMPILER_${csharp_mono_version_temp} ${csharp_mono_executable} CACHE STRING "C# Mono compiler ${csharp_mono_version_temp}" FORCE ) + mark_as_advanced( CSHARP_MONO_COMPILER_${csharp_mono_version_temp} ) + + # Set interpreter + if (EXISTS "${csharp_mono_bin_dir}/mono.exe") + set( CSHARP_MONO_INTERPRETER_${csharp_mono_version_temp} "${csharp_mono_bin_dir}/mono.exe" CACHE STRING "C# Mono interpreter ${csharp_mono_version_temp}" FORCE ) + mark_as_advanced( CSHARP_MONO_INTERPRETER_${csharp_mono_version_temp} ) + endif (EXISTS "${csharp_mono_bin_dir}/mono.exe") + endif( csharp_mono_valid ) + + # Create a list of supported compiler versions + if( NOT DEFINED CSHARP_MONO_VERSIONS ) + set( CSHARP_MONO_VERSIONS "${csharp_mono_version_temp}" CACHE STRING "Available C# Mono compiler versions" FORCE ) + else( NOT DEFINED CSHARP_MONO_VERSIONS ) + set( CSHARP_MONO_VERSIONS "${CSHARP_MONO_VERSIONS}, ${csharp_mono_version_temp}" CACHE STRING "Available C# Mono versions" FORCE ) + endif( NOT DEFINED CSHARP_MONO_VERSIONS ) + mark_as_advanced( CSHARP_MONO_VERSIONS ) + + # We found at least one Mono compiler version + set( CSHARP_MONO_FOUND 1 CACHE INTERNAL "Boolean indicating if C# Mono was found" ) + endforeach( csharp_mono_bin_dir ) + +else( UNIX ) + # Search for Mono on non-Win32 systems + set( chsarp_mono_names "mcs" "mcs.exe" "dmcs" "dmcs.exe" "smcs" "smcs.exe" "gmcs" "gmcs.exe" ) + set( + csharp_mono_paths + "/usr/bin/" + "/usr/local/bin/" + "/usr/lib/mono/2.0" + "/opt/novell/mono/bin" + ) + find_program( + csharp_mono_compiler # variable is added to the cache, we removed it below + NAMES ${chsarp_mono_names} + PATHS ${csharp_mono_paths} + ) + + if( EXISTS ${csharp_mono_compiler} ) + # Determine version + find_program( + csharp_mono_interpreter # variable is added to the cache, we removed it below + NAMES mono + PATHS ${csharp_mono_paths} + ) + if ( EXISTS ${csharp_mono_interpreter} ) + execute_process( + COMMAND ${csharp_mono_interpreter} -V + OUTPUT_VARIABLE csharp_mono_version_string + ) + string( REGEX MATCH "([0-9]*)([.])([0-9]*)([.]*)([0-9]*)" csharp_mono_version_temp ${csharp_mono_version_string} ) + set( CSHARP_MONO_INTERPRETER_${CSHARP_MONO_VERSION} ${csharp_mono_interpreter} CACHE STRING "C# Mono interpreter ${csharp_mono_version_temp}" FORCE ) + mark_as_advanced( CSHARP_MONO_INTERPRETER_${CSHARP_MONO_VERSION} ) + endif ( EXISTS ${csharp_mono_interpreter} ) + unset( csharp_mono_interpreter CACHE ) + + # We found Mono compiler + set( CSHARP_MONO_VERSION ${csharp_mono_version_temp} CACHE STRING "C# Mono compiler version" ) + mark_as_advanced( CSHARP_MONO_VERSION ) + set( CSHARP_MONO_COMPILER_${CSHARP_MONO_VERSION} ${csharp_mono_compiler} CACHE STRING "C# Mono compiler ${CSHARP_MONO_VERSION}" FORCE ) + mark_as_advanced( CSHARP_MONO_COMPILER_${CSHARP_MONO_VERSION} ) + set( CSHARP_MONO_VERSIONS ${CSHARP_MONO_VERSION} CACHE STRING "Available C# Mono compiler versions" FORCE ) + mark_as_advanced( CSHARP_MONO_VERSIONS ) + set( CSHARP_MONO_FOUND 1 CACHE INTERNAL "Boolean indicating if C# Mono was found" ) + endif( EXISTS ${csharp_mono_compiler} ) + + # Remove temp variable from cache + unset( csharp_mono_compiler CACHE ) + +endif( WIN32 ) + +if( CSHARP_MONO_FOUND ) + # Report the found versions + message( STATUS "Found the following C# Mono versions: ${CSHARP_MONO_VERSIONS}" ) +endif( CSHARP_MONO_FOUND ) + +# Set USE_FILE +get_filename_component( current_list_path ${CMAKE_CURRENT_LIST_FILE} PATH ) +set( Mono_USE_FILE ${current_list_path}/UseMono.cmake ) \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-bindings-1.0.5/libyui-bindings.spec.cmake new/libyui-bindings-1.1.0/libyui-bindings.spec.cmake --- old/libyui-bindings-1.0.5/libyui-bindings.spec.cmake 2014-09-10 10:48:12.000000000 +0200 +++ new/libyui-bindings-1.1.0/libyui-bindings.spec.cmake 2015-01-15 16:38:09.000000000 +0100 @@ -52,7 +52,7 @@ %build mkdir build cd build -cmake -DPREFIX=%{prefix} \ +cmake -DYPREFIX=%{prefix} \ -DCMAKE_INSTALL_PREFIX=%{prefix} \ -DLIB=%{_lib} \ -DPYTHON_SITEDIR=%{py_sitedir} \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-bindings-1.0.5/swig/CMakeLists.txt new/libyui-bindings-1.1.0/swig/CMakeLists.txt --- old/libyui-bindings-1.0.5/swig/CMakeLists.txt 2014-09-10 09:53:10.000000000 +0200 +++ new/libyui-bindings-1.1.0/swig/CMakeLists.txt 2015-01-19 16:03:11.000000000 +0100 @@ -7,25 +7,41 @@ # SET( SWIG_INPUT "${CMAKE_CURRENT_SOURCE_DIR}/yui.i" ) - -FIND_PACKAGE(Ruby) -FIND_PACKAGE(PythonLibs) - -# doesn't work yet :-( -# CMake problem, FindPerlLibs.cmake is in a _really_ bad, bad state :-(( -# see e.g. http://www.vtk.org/Bug/print_bug_page.php?bug_id=3665 -#FIND_PACKAGE(PerlLibs) -FIND_PACKAGE(Perl) - -IF (RUBY_LIBRARY AND RUBY_INCLUDE_PATH) - ADD_SUBDIRECTORY(ruby) -ENDIF(RUBY_LIBRARY AND RUBY_INCLUDE_PATH) - -IF (PYTHON_LIBRARY) - ADD_SUBDIRECTORY(python) -ENDIF(PYTHON_LIBRARY) - -IF (PERL_EXECUTABLE) - MESSAGE(STATUS "Perl executable: ${PERL_EXECUTABLE}") - ADD_SUBDIRECTORY(perl) -ENDIF (PERL_EXECUTABLE) +OPTION (WITH_MONO "Build CSharp/Mono bindings" ON) +OPTION (WITH_PYTHON "Build Python bindings" ON) +OPTION (WITH_PERL "Build Perl bindings" ON) +OPTION (WITH_RUBY "Build Ruby bindings" ON) + + +IF (WITH_RUBY) + FIND_PACKAGE(Ruby) + IF (RUBY_LIBRARY AND RUBY_INCLUDE_PATH) + ADD_SUBDIRECTORY(ruby) + ENDIF(RUBY_LIBRARY AND RUBY_INCLUDE_PATH) +ENDIF (WITH_RUBY) + +IF (WITH_PYTHON) + FIND_PACKAGE(PythonLibs) + IF (PYTHON_LIBRARY) + ADD_SUBDIRECTORY(python) + ENDIF(PYTHON_LIBRARY) +ENDIF (WITH_PYTHON) + +IF (WITH_PERL) + # doesn't work yet :-( + # CMake problem, FindPerlLibs.cmake is in a _really_ bad, bad state :-(( + # see e.g. http://www.vtk.org/Bug/print_bug_page.php?bug_id=3665 + #FIND_PACKAGE(PerlLibs) + FIND_PACKAGE(Perl) + IF (PERL_EXECUTABLE) + MESSAGE(STATUS "Perl executable: ${PERL_EXECUTABLE}") + ADD_SUBDIRECTORY(perl) + ENDIF (PERL_EXECUTABLE) +ENDIF (WITH_PERL) + +IF (WITH_MONO) + FIND_PACKAGE(Mono) + IF (CSHARP_MONO_FOUND) + ADD_SUBDIRECTORY(mono) + ENDIF (CSHARP_MONO_FOUND) +ENDIF (WITH_MONO) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-bindings-1.0.5/swig/mono/CMakeLists.txt new/libyui-bindings-1.1.0/swig/mono/CMakeLists.txt --- old/libyui-bindings-1.0.5/swig/mono/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/libyui-bindings-1.1.0/swig/mono/CMakeLists.txt 2015-01-19 16:03:11.000000000 +0100 @@ -0,0 +1,49 @@ +# +# cmake description for libyui CSharp bindings +# +# !!Attn!!: This creates two files +# 1. yui.so +# 2. yui.dll +# and the .dll file gets imported. See bindings/csharp/tests. +# + +IF (NOT MONO_LIBRARIES) + SET (MONO_LIBRARIES "/usr/lib/mono") +ENDIF (NOT MONO_LIBRARIES) + +# SWIG_OUPUT is per-target +SET( SWIG_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/yui_csharp.cxx" ) + + +ADD_CUSTOM_COMMAND ( + OUTPUT ${SWIG_OUTPUT} + COMMAND ${CMAKE_COMMAND} -E echo_append "Creating wrapper code for CSharp ..." + COMMAND ${SWIG_EXECUTABLE} -c++ -csharp -features autodoc -o ${SWIG_OUTPUT} -I${LIBYUI_INCLUDE_DIR} ${SWIG_INPUT} + COMMAND ${CMAKE_COMMAND} -E echo "Done." + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../*.i +) + +SET(yui_csharp_SRCS ${SWIG_OUTPUT} ) + +ADD_LIBRARY( yui_csharp SHARED ${yui_csharp_SRCS} ) +# name it 'yui' ==> i.e. yui.so +# and don't prefix with 'lib' +SET_TARGET_PROPERTIES( yui_csharp PROPERTIES PREFIX "" OUTPUT_NAME "yui") + +TARGET_LINK_LIBRARIES( yui_csharp ${LIBYUI_LIBRARY} ) + +ADD_CUSTOM_COMMAND( + TARGET yui_csharp POST_BUILD + COMMAND "${CSHARP_MONO_COMPILER_${CSHARP_MONO_VERSION}}" /t:library *.cs /out:yui.dll + COMMENT "Creating yui.dll" + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} +) + +INSTALL(TARGETS yui_csharp LIBRARY DESTINATION "${MONO_LIBRARIES}/yui") + +INSTALL( + FILES ${CMAKE_CURRENT_BINARY_DIR}/yui.dll + DESTINATION "${MONO_LIBRARIES}/yui" + COMPONENT csharp +) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-bindings-1.0.5/swig/ruby/CMakeLists.txt new/libyui-bindings-1.1.0/swig/ruby/CMakeLists.txt --- old/libyui-bindings-1.0.5/swig/ruby/CMakeLists.txt 2014-09-10 09:53:10.000000000 +0200 +++ new/libyui-bindings-1.1.0/swig/ruby/CMakeLists.txt 2015-01-19 16:03:11.000000000 +0100 @@ -4,7 +4,7 @@ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-strict-aliasing") -EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['vendorarchdir']" OUTPUT_VARIABLE RUBY_VENDOR_ARCH_DIR) +EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['vendorarchdir']" OUTPUT_VARIABLE RUBY_VENDOR_ARCH_DIR) STRING(REGEX REPLACE "^/usr/" "${CMAKE_INSTALL_PREFIX}/" RUBY_VENDOR_ARCH_DIR "${RUBY_VENDOR_ARCH_DIR}") MESSAGE(STATUS "Ruby executable: ${RUBY_EXECUTABLE}") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-bindings-1.0.5/swig/ruby/extconf.rb new/libyui-bindings-1.1.0/swig/ruby/extconf.rb --- old/libyui-bindings-1.0.5/swig/ruby/extconf.rb 2014-09-10 09:53:10.000000000 +0200 +++ new/libyui-bindings-1.1.0/swig/ruby/extconf.rb 2015-01-19 16:03:11.000000000 +0100 @@ -5,8 +5,8 @@ require 'mkmf' # $CFLAGS = "#{$CFLAGS} -Werror" -Config::CONFIG['CC'] = "g++" -Config::CONFIG['CPP'] = "g++ -E" +RbConfig::CONFIG['CC'] = "g++" +RbConfig::CONFIG['CPP'] = "g++ -E" have_library('stdc++') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-bindings-1.0.5/swig/yui.i new/libyui-bindings-1.1.0/swig/yui.i --- old/libyui-bindings-1.0.5/swig/yui.i 2014-09-10 09:53:10.000000000 +0200 +++ new/libyui-bindings-1.1.0/swig/yui.i 2015-01-19 16:03:11.000000000 +0100 @@ -116,6 +116,7 @@ %define DEFINE_PTR_TYPE(name) %enddef +#if !defined(SWIGCSHARP) %rename("+") "operator+"; %rename("<<") "operator<<"; %rename("!=") "operator!="; @@ -127,7 +128,9 @@ %include "std_list.i" %include "std_vector.i" -#if defined(SWIGPERL5) +#endif + +#if defined(SWIGPERL5) || defined(SWIGCSHARP) /* %include "std/std_set.i" # doesn't compile ?! */ #else %include "std_set.i" @@ -252,7 +255,6 @@ %include yui/YExternalWidgetFactory.h %include yui/YExternalWidgets.h - #if defined(SWIGRUBY) %extend YEvent { VALUE mywidget() { return INT2FIX( $self->widget() ); } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
