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

[Chris Hillery]

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

[Chris Hillery (ceejatec)]

review: Approve

[Juan Zacarias (juan457)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

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

[Zorba Build Bot (zorba-buildbot)]

Validation queue job install-symlink-jars-2013-05-22T01-10-43.295Z is finished. The final status was:

All tests succeeded!

=== 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:53:26 +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}")