Zorba

Merge lp:~zorba-coders/zorba/mac-install-fix into lp:zorba

  1. mac-install-fix
  2. Merge into trunk
Proposed by Cezar Andrei
Status: Merged
Merged at revision: 11671
Proposed branch: lp:~zorba-coders/zorba/mac-install-fix
Merge into: lp:zorba
Diff against target: 64 lines (+15/-6)
4 files modified
swig/java/CMakeLists.txt (+2/-2)
swig/php/CMakeLists.txt (+6/-2)
swig/python/CMakeLists.txt (+6/-1)
swig/ruby/CMakeLists.txt (+1/-1)
To merge this branch: bzr merge lp:~zorba-coders/zorba/mac-install-fix
Reviewer Review Type Date Requested Status
Chris Hillery Approve
Paul J. Lucas Approve
Cezar Andrei Approve
Review via email: mp+193864@code.launchpad.net

Commit message

Fix install files for java, php, python and ruby libs.

Description of the change

Fix install files for java, php, python and ruby libs.

To post a comment you must log in.
Revision history for this message
Cezar Andrei (cezar-andrei) :
review: Approve
Revision history for this message
Paul J. Lucas (paul-lucas) :
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 the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/mac-install-fix/+merge/193864

Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue

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

Voting criteria failed for the following merge proposals:

https://code.launchpad.net/~zorba-coders/zorba/mac-install-fix/+merge/193864 :
Votes: {'Approve': 3, 'Needs commit message': 1}

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

Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/mac-install-fix/+merge/193864

Stage "CommitZorba" failed.

Check console output at http://jenkins.lambda.nu/job/CommitZorba/249/console to view the results.

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

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/mac-install-fix/+merge/193864

Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue

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

Validation queue succeeded - proposal merged!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'swig/java/CMakeLists.txt'
2--- swig/java/CMakeLists.txt 2013-09-21 00:39:52 +0000
3+++ swig/java/CMakeLists.txt 2013-11-05 00:12:40 +0000
4@@ -78,8 +78,8 @@
5 SET(ZORBA_JAVA_JAR ${CMAKE_CURRENT_BINARY_DIR}/zorba_api.jar PARENT_SCOPE )
6
7 IF ( APPLE )
8- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${ZORBA_SWIG_LIB_PREFIX}zorba_api.jnilib DESTINATION ${JAVA_SITEARCH_DIR})
9- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/zorba_api.jar DESTINATION ${JAVA_SITEARCH_DIR})
10+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${ZORBA_SWIG_LIB_PREFIX}zorba_api_java.jnilib DESTINATION ${JAVA_SITEARCH_DIR})
11+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/zorba_api.jar DESTINATION ${JAVA_SITEARCH_DIR})
12 ELSE ( APPLE )
13 IF(NOT WIN32)
14 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libzorba_api_java.so DESTINATION ${JAVA_SITEARCH_DIR})
15
16=== modified file 'swig/php/CMakeLists.txt'
17--- swig/php/CMakeLists.txt 2013-09-24 21:47:07 +0000
18+++ swig/php/CMakeLists.txt 2013-11-05 00:12:40 +0000
19@@ -59,8 +59,12 @@
20 #set project folder location for IDEs
21 SET_TARGET_PROPERTIES(zorba_api_php PROPERTIES PROJECT_LABEL "PHP" FOLDER "APIs")
22
23- SET_TARGET_PROPERTIES(zorba_api_php PROPERTIES OUTPUT_NAME "zorba_api")
24-
25+ IF ( APPLE )
26+ SET_TARGET_PROPERTIES(zorba_api_php PROPERTIES OUTPUT_NAME "zorba_api_php")
27+ ELSE ( APPLE )
28+ SET_TARGET_PROPERTIES(zorba_api_php PROPERTIES OUTPUT_NAME "zorba_api")
29+ ENDIF ( APPLE )
30+
31 IF (NOT WIN32 OR CYGWIN)
32 STRING (REPLACE ${CMAKE_INSTALL_PREFIX} "" PHP5_INSTALL_PATH ${PHP5_EXTENSION_DIR})
33 SET (PHP5_INSTALL_PATH "${CMAKE_INSTALL_PREFIX}/share/php5")
34
35=== modified file 'swig/python/CMakeLists.txt'
36--- swig/python/CMakeLists.txt 2013-09-24 21:47:07 +0000
37+++ swig/python/CMakeLists.txt 2013-11-05 00:12:40 +0000
38@@ -19,7 +19,12 @@
39 INCLUDE_DIRECTORIES (${PYTHON_INCLUDE_PATH})
40 SWIG_ADD_MODULE (zorba_api_python python zorba_api.i)
41 SWIG_LINK_LIBRARIES (zorba_api_python zorba_simplestore ${PYTHON_LIBRARIES})
42- SET_TARGET_PROPERTIES (_zorba_api_python PROPERTIES OUTPUT_NAME "_zorba_api")
43+
44+ IF ( APPLE )
45+ SET_TARGET_PROPERTIES (_zorba_api_python PROPERTIES OUTPUT_NAME "_zorba_api_python")
46+ ELSE ( APPLE)
47+ SET_TARGET_PROPERTIES (_zorba_api_python PROPERTIES OUTPUT_NAME "_zorba_api")
48+ ENDIF (APPLE )
49
50 IF (MSVC_IDE)
51 SET_PROPERTY( TARGET _zorba_api_python PROPERTY PROJECT_LABEL "Python")
52
53=== modified file 'swig/ruby/CMakeLists.txt'
54--- swig/ruby/CMakeLists.txt 2013-09-25 19:35:12 +0000
55+++ swig/ruby/CMakeLists.txt 2013-11-05 00:12:40 +0000
56@@ -37,7 +37,7 @@
57 SET_TARGET_PROPERTIES(zorba_api PROPERTIES
58 INSTALL_RPATH "${CMAKE_INSTALL_RPATH}:${_rpath}"
59 BUILD_WITH_INSTALL_RPATH ON
60- OUTPUT_NAME "zorba_api")
61+ OUTPUT_NAME "zorba_api_ruby")
62 ELSE (APPLE)
63 SET_TARGET_PROPERTIES(zorba_api PROPERTIES
64 INSTALL_RPATH "${CMAKE_INSTALL_RPATH}:${_rpath}"

Subscribers

People subscribed via source and target branches