zorba-coders team mailing list archive

[Juan Zacarias <juan457@xxxxxxxxx>]

Juan Zacarias has proposed merging lp:~zorba-coders/zorba/lang-bindings-install-fix into lp:~zorba-coders/zorba/zorba-2.9.

Commit message:
Fixes for php in Ubuntu Packages.

Requested reviews:
  Juan Zacarias (juan457)
  Chris Hillery (ceejatec)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/lang-bindings-install-fix/+merge/166151

Fixes for php in Ubuntu Packages.
-- 
https://code.launchpad.net/~zorba-coders/zorba/lang-bindings-install-fix/+merge/166151
Your team Zorba Coders is subscribed to branch lp:~zorba-coders/zorba/zorba-2.9.

=== modified file 'cmake_modules/ZorbaModule.cmake'
--- cmake_modules/ZorbaModule.cmake	2013-03-28 01:00:17 +0000
+++ cmake_modules/ZorbaModule.cmake	2013-05-28 23:06:29 +0000
@@ -519,7 +519,7 @@
       # Copy jar to jars/ directory and add relative path to classpath file
       GET_FILENAME_COMPONENT (_output_filename "${_jar_file}" NAME)
       ADD_COPY_RULE ("LIB" "${_jar_file}" "jars/${_output_filename}" "" 
-	"${JAR_TARGET}" 1 "${JAR_TEST_ONLY}")
+        "${JAR_TARGET}" 1 "${JAR_TEST_ONLY}")
       FILE (APPEND "${_CP_FILE}" "${_output_filename}\n")
     ENDIF (JAR_EXTERNAL AND NOT ZORBA_PACKAGE_EXTERNAL_JARS)
 

=== modified file 'swig/php/CMakeLists.txt'
--- swig/php/CMakeLists.txt	2013-04-17 18:27:03 +0000
+++ swig/php/CMakeLists.txt	2013-05-28 23:06:29 +0000
@@ -56,12 +56,6 @@
     CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/../${ZORBA_API_HEADER}"  "${CMAKE_CURRENT_BINARY_DIR}/${ZORBA_API_HEADER}")
   ENDFOREACH(ZORBA_API_HEADER ${ZORBA_API_HEADERS})
 
-  # The following fix was added because of the changes in CMake 2.8, which have the
-  # result of naming the java binding library "liblibzorba_api.so" instead of "libzorba_api.so"
-  IF (LINUX OR CYGWIN OR APPLE)
-    SET_TARGET_PROPERTIES (${SWIG_MODULE_zorba_api_REAL_NAME} PROPERTIES PREFIX "")
-  ENDIF (LINUX OR CYGWIN OR APPLE)
-  
   #set project folder location for IDEs
   SET_TARGET_PROPERTIES(zorba_api_php PROPERTIES PROJECT_LABEL "PHP" FOLDER "APIs")
 
@@ -75,7 +69,7 @@
       FILES
         ${CMAKE_CURRENT_BINARY_DIR}/Zorba/XQueryProcessor.php
         ${CMAKE_CURRENT_BINARY_DIR}/Zorba/zorba_api_wrapper.php
-        ${CMAKE_CURRENT_BINARY_DIR}/${ZORBA_SWIG_LIB_PREFIX}zorba_api.so
+        ${CMAKE_CURRENT_BINARY_DIR}/libzorba_api.so
       DESTINATION ${PHP5_INSTALL_PATH}
     )
   ELSE (NOT WIN32 OR CYGWIN)