Zorba3.0.0の言語バインディングのモジュール名をzorba_apiに統一するパッチ

gistfile1.txt

diff --git a/swig/php/CMakeLists.txt b/swig/php/CMakeLists.txt
index e371819..f0ea81b 100644
--- a/swig/php/CMakeLists.txt
+++ b/swig/php/CMakeLists.txt
@@ -24,18 +24,18 @@ IF (PHP5_FOUND)
     ADD_DEFINITIONS(-DZEND_WIN32 -DPHP_WIN32 -DZEND_INCLUDE_FULL_WINDOWS_HEADERS -DZEND_DEBUG=0 -DZTS=1)
   ENDIF (WIN32)
 
-  SWIG_ADD_MODULE (zorba_api_php php5 zorba_api.i)
+  SWIG_ADD_MODULE (zorba_api php5 zorba_api.i)
 
   IF (APPLE)
-    SWIG_LINK_LIBRARIES (zorba_api_php zorba_simplestore ${CMAKE_SHARED_MODULE_CREATE_C_FLAGS})
+    SWIG_LINK_LIBRARIES (zorba_api zorba_simplestore ${CMAKE_SHARED_MODULE_CREATE_C_FLAGS})
   ELSE (APPLE)
-    SWIG_LINK_LIBRARIES (zorba_api_php zorba_simplestore)
+    SWIG_LINK_LIBRARIES (zorba_api zorba_simplestore)
   ENDIF (APPLE)
 
   #fix for library path, using windows backslash causes error
   IF (WIN32)
     STRING(REGEX REPLACE "\\\\" "/" PHP5_LIBRARY "${PHP5_LIBRARY}")
-    SWIG_LINK_LIBRARIES (zorba_api_php ${PHP5_LIBRARY})
+    SWIG_LINK_LIBRARIES (zorba_api ${PHP5_LIBRARY})
   ENDIF (WIN32)
 
   #Copy test to the build folder
@@ -45,7 +45,7 @@ IF (PHP5_FOUND)
   CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/XQueryProcessor.php" "${CMAKE_CURRENT_BINARY_DIR}/Zorba/XQueryProcessor.php" COPYONLY)
   #fix for swig error with wrapper name
   ADD_CUSTOM_COMMAND(
-    TARGET zorba_api_php
+    TARGET zorba_api
     POST_BUILD
     COMMAND cmake -E echo "Fixing PHP wrapper..."
     COMMAND cmake -P "${CMAKE_CURRENT_SOURCE_DIR}/postfix.cmake"
@@ -57,12 +57,12 @@ IF (PHP5_FOUND)
   ENDFOREACH(ZORBA_API_HEADER ${ZORBA_API_HEADERS})
 
   #set project folder location for IDEs
-  SET_TARGET_PROPERTIES(zorba_api_php PROPERTIES PROJECT_LABEL "PHP" FOLDER "APIs")
+  SET_TARGET_PROPERTIES(zorba_api PROPERTIES PROJECT_LABEL "PHP" FOLDER "APIs")
 
   IF ( APPLE )
-    SET_TARGET_PROPERTIES(zorba_api_php PROPERTIES OUTPUT_NAME "zorba_api_php")
+    SET_TARGET_PROPERTIES(zorba_api PROPERTIES OUTPUT_NAME "zorba_api")
   ELSE ( APPLE )
-    SET_TARGET_PROPERTIES(zorba_api_php PROPERTIES OUTPUT_NAME "zorba_api")
+    SET_TARGET_PROPERTIES(zorba_api PROPERTIES OUTPUT_NAME "zorba_api")
   ENDIF ( APPLE )
   
   IF (NOT WIN32 OR CYGWIN)
@@ -73,7 +73,7 @@ IF (PHP5_FOUND)
       FILES
         ${CMAKE_CURRENT_BINARY_DIR}/Zorba/XQueryProcessor.php
         ${CMAKE_CURRENT_BINARY_DIR}/Zorba/zorba_api_wrapper.php
-        ${CMAKE_CURRENT_BINARY_DIR}/libzorba_api_php.so
+        ${CMAKE_CURRENT_BINARY_DIR}/libzorba_api.so
       DESTINATION ${PHP5_INSTALL_PATH}
     )
   ELSE (NOT WIN32 OR CYGWIN)
@@ -81,14 +81,14 @@ IF (PHP5_FOUND)
       INSTALL ( FILES 
         ${CMAKE_CURRENT_BINARY_DIR}/Zorba/XQueryProcessor.php
         ${CMAKE_CURRENT_BINARY_DIR}/Zorba/zorba_api_wrapper.php
-        ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE}/zorba_api_php.dll
+        ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE}/zorba_api.dll
         COMPONENT "php_swig"
         DESTINATION share/php )
     ELSE (MSVC_IDE)
       INSTALL ( FILES 
         ${CMAKE_CURRENT_BINARY_DIR}/Zorba/XQueryProcessor.php
         ${CMAKE_CURRENT_BINARY_DIR}/Zorba/zorba_api_wrapper.php
-        ${CMAKE_CURRENT_BINARY_DIR}/zorba_api_php.dll
+        ${CMAKE_CURRENT_BINARY_DIR}/zorba_api.dll
         COMPONENT "php_swig"
         DESTINATION share/php )
     ENDIF (MSVC_IDE)
diff --git a/swig/python/CMakeLists.txt b/swig/python/CMakeLists.txt
index 3b4ec00..20903a1 100644
--- a/swig/python/CMakeLists.txt
+++ b/swig/python/CMakeLists.txt
@@ -17,20 +17,20 @@ IF (PYTHON_LIBRARIES AND PYTHON_INCLUDE_PATH)
 
   SET_SOURCE_FILES_PROPERTIES (zorba_api.i PROPERTIES CPLUSPLUS ON)
   INCLUDE_DIRECTORIES (${PYTHON_INCLUDE_PATH})
-  SWIG_ADD_MODULE (zorba_api_python python zorba_api.i)
-  SWIG_LINK_LIBRARIES (zorba_api_python zorba_simplestore ${PYTHON_LIBRARIES})
+  SWIG_ADD_MODULE (zorba_api python zorba_api.i)
+  SWIG_LINK_LIBRARIES (zorba_api zorba_simplestore ${PYTHON_LIBRARIES})
 
   IF ( APPLE )
-    SET_TARGET_PROPERTIES (_zorba_api_python PROPERTIES OUTPUT_NAME "_zorba_api_python")
+    SET_TARGET_PROPERTIES (_zorba_api PROPERTIES OUTPUT_NAME "_zorba_api")
   ELSE ( APPLE)
-    SET_TARGET_PROPERTIES (_zorba_api_python PROPERTIES OUTPUT_NAME "_zorba_api")
+    SET_TARGET_PROPERTIES (_zorba_api PROPERTIES OUTPUT_NAME "_zorba_api")
   ENDIF (APPLE )
   
   IF (MSVC_IDE)
-    SET_PROPERTY( TARGET _zorba_api_python PROPERTY PROJECT_LABEL "Python")
-    SET_PROPERTY( TARGET _zorba_api_python PROPERTY FOLDER "APIs")
-    SET_PROPERTY( TARGET _zorba_api_python PROPERTY LIBRARY_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/swig/python )
-    SET_PROPERTY( TARGET _zorba_api_python PROPERTY LIBRARY_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/swig/python )
+    SET_PROPERTY( TARGET _zorba_api PROPERTY PROJECT_LABEL "Python")
+    SET_PROPERTY( TARGET _zorba_api PROPERTY FOLDER "APIs")
+    SET_PROPERTY( TARGET _zorba_api PROPERTY LIBRARY_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/swig/python )
+    SET_PROPERTY( TARGET _zorba_api PROPERTY LIBRARY_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/swig/python )
   ENDIF (MSVC_IDE)
 
   # FIX FOR PYTHON_D.LIB ERROR ON WINDOWS
@@ -57,12 +57,12 @@ IF (PYTHON_LIBRARIES AND PYTHON_INCLUDE_PATH)
     INSTALL (
       FILES
         ${CMAKE_CURRENT_BINARY_DIR}/zorba_api.py
-        ${CMAKE_CURRENT_BINARY_DIR}/_zorba_api_python.so
+        ${CMAKE_CURRENT_BINARY_DIR}/_zorba_api.so
       DESTINATION ${PYTHON_INSTALL_PATH}
     )
   ELSE(NOT WIN32)
       INSTALL ( FILES 
-      ${CMAKE_CURRENT_BINARY_DIR}/_zorba_api_python.pyd
+      ${CMAKE_CURRENT_BINARY_DIR}/_zorba_api.pyd
       ${CMAKE_CURRENT_BINARY_DIR}/zorba_api.py
       DESTINATION share/python
       COMPONENT "python_swig" )
diff --git a/swig/ruby/CMakeLists.txt b/swig/ruby/CMakeLists.txt
index fe424fc..c30be98 100644
--- a/swig/ruby/CMakeLists.txt
+++ b/swig/ruby/CMakeLists.txt
@@ -37,7 +37,7 @@ IF (RUBY_LIBRARY AND RUBY_INCLUDE_PATH)
       SET_TARGET_PROPERTIES(zorba_api PROPERTIES
         INSTALL_RPATH "${CMAKE_INSTALL_RPATH}:${_rpath}"
         BUILD_WITH_INSTALL_RPATH ON
-        OUTPUT_NAME "zorba_api_ruby")
+        OUTPUT_NAME "zorba_api")
     ELSE (APPLE)
       SET_TARGET_PROPERTIES(zorba_api PROPERTIES
         INSTALL_RPATH "${CMAKE_INSTALL_RPATH}:${_rpath}"
@@ -67,7 +67,7 @@ IF (RUBY_LIBRARY AND RUBY_INCLUDE_PATH)
   SET (RUBY_SITEARCH_DIR "${CMAKE_INSTALL_PREFIX}/share/ruby")
   
   IF ( APPLE )
-    INSTALL ( FILES ${CMAKE_CURRENT_BINARY_DIR}/zorba_api_ruby.bundle
+    INSTALL ( FILES ${CMAKE_CURRENT_BINARY_DIR}/zorba_api.bundle
     DESTINATION ${RUBY_SITEARCH_DIR} )
   ELSE ( APPLE )
     IF ( LINUX )
diff --git a/swig/ruby/tests/test11.rb b/swig/ruby/tests/test11.rb
index b702d1b..135a0b5 100644
--- a/swig/ruby/tests/test11.rb
+++ b/swig/ruby/tests/test11.rb
@@ -26,7 +26,7 @@ name = itemFactory.createQName("http://www.zorba-xquery.com/", "aaa")
 collectionManager.createCollection(name)
 isAdded = collectionManager.isAvailableCollection(name)
 
-if isAdded :
+if isAdded
   collection = collectionManager.getCollection(name)
   data = xmlManager.parseXMLtoItem("<books><book>Book 1</book><book>Book 2</book></books>")
   itemSequence = Zorba_api::ItemSequence.new(data)