Zorba

Merge lp:~zorba-coders/zorba/install-symlink-jars into lp:zorba

  1. install-symlink-jars
  2. Merge into trunk
Proposed by Chris Hillery
Status: Merged
Approved by: Chris Hillery
Approved revision: 11466
Merged at revision: 11466
Proposed branch: lp:~zorba-coders/zorba/install-symlink-jars
Merge into: lp:zorba
Diff against target: 16 lines (+5/-1)
1 file modified
cmake_modules/ZorbaModule.cmake (+5/-1)
To merge this branch: bzr merge lp:~zorba-coders/zorba/install-symlink-jars
Reviewer Review Type Date Requested Status
Juan Zacarias Approve
Chris Hillery Approve
Review via email: mp+164993@code.launchpad.net

Commit message

If specified EXTERNAL jar is a symlink, install the target of the symlink.

To post a comment you must log in.
Revision history for this message
Chris Hillery (ceejatec) :
review: Approve
Revision history for this message
Juan Zacarias (juan457) :
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/install-symlink-jars-2013-05-22T01-10-43.295Z/log.html

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

Validation queue job install-symlink-jars-2013-05-22T01-10-43.295Z 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-21 23:53:26 +0000
4@@ -516,7 +516,11 @@
5 # Put absolute path into classpath file
6 FILE (APPEND "${_CP_FILE}" "${_jar_file}\n")
7 ELSE (JAR_EXTERNAL AND NOT ZORBA_PACKAGE_EXTERNAL_JARS)
8- # Copy jar to jars/ directory and add relative path to classpath file
9+ # Copy real jar (after following any symlinks) to jars/ directory
10+ # and add relative path to classpath file
11+ IF (IS_SYMLINK "${_jar_file}")
12+ GET_FILENAME_COMPONENT (_jar_file "${_jar_file}" REALPATH)
13+ ENDIF (IS_SYMLINK "${_jar_file}")
14 GET_FILENAME_COMPONENT (_output_filename "${_jar_file}" NAME)
15 ADD_COPY_RULE ("LIB" "${_jar_file}" "jars/${_output_filename}" ""
16 "${JAR_TARGET}" 1 "${JAR_TEST_ONLY}")

Subscribers

People subscribed via source and target branches