Zorba

Merge lp:~zorba-coders/zorba/lang-bindings-install-fix into lp:~zorba-coders/zorba/zorba-2.9

  1. lang-bindings-install-fix
  2. Merge into zorba-2.9
Proposed by Juan Zacarias
Status: Merged
Approved by: Chris Hillery
Approved revision: 11457
Merged at revision: 11458
Proposed branch: lp:~zorba-coders/zorba/lang-bindings-install-fix
Merge into: lp:~zorba-coders/zorba/zorba-2.9
Diff against target: 38 lines (+2/-8)
2 files modified
cmake_modules/ZorbaModule.cmake (+1/-1)
swig/php/CMakeLists.txt (+1/-7)
To merge this branch: bzr merge lp:~zorba-coders/zorba/lang-bindings-install-fix
Reviewer Review Type Date Requested Status
Chris Hillery Approve
Juan Zacarias Approve
Review via email: mp+166151@code.launchpad.net

Commit message

Fixes for php in Ubuntu Packages.

Description of the change

Fixes for php in Ubuntu Packages.

To post a comment you must log in.
Revision history for this message
Juan Zacarias (juan457) :
review: Approve
Revision history for this message
Chris Hillery (ceejatec) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/lang-bindings-install-fix-2013-05-28T23-11-48.161Z/log.html

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job lang-bindings-install-fix-2013-05-28T23-11-48.161Z is finished. The final status was:

All tests succeeded!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'cmake_modules/ZorbaModule.cmake'
2--- cmake_modules/ZorbaModule.cmake 2013-03-28 01:00:17 +0000
3+++ cmake_modules/ZorbaModule.cmake 2013-05-28 23:08:25 +0000
4@@ -519,7 +519,7 @@
5 # Copy jar to jars/ directory and add relative path to classpath file
6 GET_FILENAME_COMPONENT (_output_filename "${_jar_file}" NAME)
7 ADD_COPY_RULE ("LIB" "${_jar_file}" "jars/${_output_filename}" ""
8- "${JAR_TARGET}" 1 "${JAR_TEST_ONLY}")
9+ "${JAR_TARGET}" 1 "${JAR_TEST_ONLY}")
10 FILE (APPEND "${_CP_FILE}" "${_output_filename}\n")
11 ENDIF (JAR_EXTERNAL AND NOT ZORBA_PACKAGE_EXTERNAL_JARS)
12
13
14=== modified file 'swig/php/CMakeLists.txt'
15--- swig/php/CMakeLists.txt 2013-04-17 18:27:03 +0000
16+++ swig/php/CMakeLists.txt 2013-05-28 23:08:25 +0000
17@@ -56,12 +56,6 @@
18 CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/../${ZORBA_API_HEADER}" "${CMAKE_CURRENT_BINARY_DIR}/${ZORBA_API_HEADER}")
19 ENDFOREACH(ZORBA_API_HEADER ${ZORBA_API_HEADERS})
20
21- # The following fix was added because of the changes in CMake 2.8, which have the
22- # result of naming the java binding library "liblibzorba_api.so" instead of "libzorba_api.so"
23- IF (LINUX OR CYGWIN OR APPLE)
24- SET_TARGET_PROPERTIES (${SWIG_MODULE_zorba_api_REAL_NAME} PROPERTIES PREFIX "")
25- ENDIF (LINUX OR CYGWIN OR APPLE)
26-
27 #set project folder location for IDEs
28 SET_TARGET_PROPERTIES(zorba_api_php PROPERTIES PROJECT_LABEL "PHP" FOLDER "APIs")
29
30@@ -75,7 +69,7 @@
31 FILES
32 ${CMAKE_CURRENT_BINARY_DIR}/Zorba/XQueryProcessor.php
33 ${CMAKE_CURRENT_BINARY_DIR}/Zorba/zorba_api_wrapper.php
34- ${CMAKE_CURRENT_BINARY_DIR}/${ZORBA_SWIG_LIB_PREFIX}zorba_api.so
35+ ${CMAKE_CURRENT_BINARY_DIR}/libzorba_api.so
36 DESTINATION ${PHP5_INSTALL_PATH}
37 )
38 ELSE (NOT WIN32 OR CYGWIN)

Subscribers

People subscribed via source and target branches

to all changes: