Chris Hillery has proposed merging lp:~zorba-coders/zorba/install-symlink-jars
into lp:zorba.
Commit message:
If specified EXTERNAL jar is a symlink, install the target of the symlink.
Requested reviews:
Zorba Coders (zorba-coders)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/install-symlink-jars/+merge/164993
--
https://code.launchpad.net/~zorba-coders/zorba/install-symlink-jars/+merge/164993
Your team Zorba Coders is requested to review the proposed merge of
lp:~zorba-coders/zorba/install-symlink-jars into lp:zorba.
=== modified file 'cmake_modules/ZorbaModule.cmake'
--- cmake_modules/ZorbaModule.cmake 2013-03-28 01:00:17 +0000
+++ cmake_modules/ZorbaModule.cmake 2013-05-21 23:50:35 +0000
@@ -516,7 +516,11 @@
# Put absolute path into classpath file
FILE (APPEND "${_CP_FILE}" "${_jar_file}\n")
ELSE (JAR_EXTERNAL AND NOT ZORBA_PACKAGE_EXTERNAL_JARS)
- # Copy jar to jars/ directory and add relative path to classpath file
+ # Copy real jar (after following any symlinks) to jars/ directory
+ # and add relative path to classpath file
+ IF (IS_SYMLINK "${_jar_file}")
+ GET_FILENAME_COMPONENT (_jar_file "${_jar_file}" REALPATH)
+ ENDIF (IS_SYMLINK "${_jar_file}")
GET_FILENAME_COMPONENT (_output_filename "${_jar_file}" NAME)
ADD_COPY_RULE ("LIB" "${_jar_file}" "jars/${_output_filename}" ""
"${JAR_TARGET}" 1 "${JAR_TEST_ONLY}")
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
