Zorba

Merge lp:~zorba-coders/zorba/bug1040564 into lp:zorba

  1. bug1040564
  2. Merge into trunk
Proposed by Rodolfo Ochoa
Status: Merged
Approved by: Rodolfo Ochoa
Approved revision: 11339
Merged at revision: 11382
Proposed branch: lp:~zorba-coders/zorba/bug1040564
Merge into: lp:zorba
Diff against target: 41 lines (+8/-1)
3 files modified
doc/csharp/CMakeLists.txt (+3/-0)
doc/xqj/CMakeLists.txt (+3/-0)
swig/ruby/CMakeLists.txt (+2/-1)
To merge this branch: bzr merge lp:~zorba-coders/zorba/bug1040564
Reviewer Review Type Date Requested Status
Rodolfo Ochoa Approve
Cezar Andrei Approve
Review via email: mp+157500@code.launchpad.net

Commit message

Fix for Mac Ports in order to enable language bindings.

Description of the change

Fix for Mac Ports in order to enable language bindings

To post a comment you must log in.
Revision history for this message
Rodolfo Ochoa (rodolfo-ochoa) wrote :

This will work until bug #1132937 is ready

Revision history for this message
Rodolfo Ochoa (rodolfo-ochoa) wrote :

I tested this on a Mac, and seems that it worked fine, this changes can be ready for 2.9.0.
zorba.diff from macports just need to enable SWIG.

Revision history for this message
Rodolfo Ochoa (rodolfo-ochoa) wrote :

for this changes the best is that bug 1132937 be merged.

Revision history for this message
Cezar Andrei (cezar-andrei) :
review: Approve
Revision history for this message
Rodolfo Ochoa (rodolfo-ochoa) :
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/bug1040564-2013-04-17T18-46-52.494Z/log.html

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

Validation queue job bug1040564-2013-04-17T18-46-52.494Z 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 'doc/csharp/CMakeLists.txt'
2--- doc/csharp/CMakeLists.txt 2012-07-20 21:21:21 +0000
3+++ doc/csharp/CMakeLists.txt 2013-04-17 18:30:35 +0000
4@@ -14,6 +14,9 @@
5
6 ZORBA_DOXYGEN ("${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_BINARY_DIR}" "csharpdocs")
7
8+#Required for some installers
9+FILE(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/html")
10+
11 IF (DOXYGEN_FOUND)
12 ADD_DEPENDENCIES (doc "csharpdocs")
13
14
15=== modified file 'doc/xqj/CMakeLists.txt'
16--- doc/xqj/CMakeLists.txt 2012-03-26 23:06:10 +0000
17+++ doc/xqj/CMakeLists.txt 2013-04-17 18:30:35 +0000
18@@ -14,6 +14,9 @@
19
20 ZORBA_DOXYGEN ("${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_BINARY_DIR}" "xqjdocs")
21
22+#Required for some installers
23+FILE(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/html")
24+
25 IF (DOXYGEN_FOUND)
26 ADD_DEPENDENCIES (doc "xqjdocs")
27
28
29=== modified file 'swig/ruby/CMakeLists.txt'
30--- swig/ruby/CMakeLists.txt 2013-02-07 17:24:36 +0000
31+++ swig/ruby/CMakeLists.txt 2013-04-17 18:30:35 +0000
32@@ -35,7 +35,8 @@
33 GET_FILENAME_COMPONENT(_rpath "${_rpath}" PATH)
34 SET_TARGET_PROPERTIES(zorba_api PROPERTIES
35 INSTALL_RPATH "${CMAKE_INSTALL_RPATH}:${_rpath}"
36- BUILD_WITH_INSTALL_RPATH ON)
37+ BUILD_WITH_INSTALL_RPATH ON
38+ OUTPUT_NAME "${ZORBA_SWIG_LIB_PREFIX}zorba_api")
39 ENDIF (WIN32)
40
41 IF ( APPLE )

Subscribers

People subscribed via source and target branches