From: magnus.blaudd
Date: June 22 2011 9:24am
Subject: bzr commit into mysql-5.1-telco-7.1 branch (magnus.blaudd:4257)
List-Archive: http://lists.mysql.com/commits/139666
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1069322913233161388=="

--===============1069322913233161388==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///data0/magnus/mysql/7.1/ based on revid:magnus.blaudd@stripped

 4257 magnus.blaudd@stripped	2011-06-22
      ndb
       - concatenate the ARG_CLASSPATH variable (which holds a list of strings)
         using platform specific separator before passing it to javac

    modified:
      storage/ndb/config/type_JAVA.cmake
=== modified file 'storage/ndb/config/type_JAVA.cmake'
--- a/storage/ndb/config/type_JAVA.cmake	2011-06-22 09:01:40 +0000
+++ b/storage/ndb/config/type_JAVA.cmake	2011-06-22 09:23:35 +0000
@@ -125,19 +125,34 @@ MACRO(CREATE_JAR)
     COMMAND echo \"${JAVA_ARCHIVE} cfv ${JAR_DIR}/${TARGET}-${JAVA_NDB_VERSION}.jar -C ${CLASS_DIR} .\"
     COMMAND ${JAVA_ARCHIVE} cfv ${JAR_DIR}/${TARGET}-${JAVA_NDB_VERSION}.jar -C ${CLASS_DIR} .)
 
+  # Concatenate the ARG_CLASSSPATH(a list of strings) into a string
+  # with platform specific separator
+  SET(separator) # Empty separator to start with
+  SET(classpath_str)
+  FOREACH(item ${ARG_CLASSPATH})
+    SET(classpath_str ${classpath_str}${separator}${item})
+    IF (WIN32)
+      SET(separator ";")
+    ELSE()
+      SET(separator ":")
+    ENDIF()
+  ENDFOREACH()
+  # MESSAGE(STATUS "classpath_str: ${classpath_str}")
+
+
   IF(EXISTS ${ARG_ENHANCE})
     MESSAGE(STATUS "enhancing ${TARGET}.jar")
     SET(ENHANCER org.apache.openjpa.enhance.PCEnhancer)
     ADD_CUSTOM_COMMAND( TARGET ${TARGET}.jar PRE_BUILD
-      COMMAND echo \"${JAVA_COMPILE} -d ${TARGET_DIR} -classpath ${ARG_CLASSPATH} ${JAVA_FILES}\"
-      COMMAND ${JAVA_COMPILE} -d ${TARGET_DIR} -classpath "${ARG_CLASSPATH}" ${JAVA_FILES}
-      COMMAND echo \"${JAVA_RUNTIME} -classpath ${ARG_CLASSPATH}:${WITH_CLASSPATH} ${ENHANCER} -p ${ARG_ENHANCE} -d ${TARGET_DIR}\"
-      COMMAND ${JAVA_RUNTIME} -classpath "${ARG_CLASSPATH};${WITH_CLASSPATH}" ${ENHANCER} -p ${ARG_ENHANCE} -d ${TARGET_DIR}
+      COMMAND echo \"${JAVA_COMPILE} -d ${TARGET_DIR} -classpath ${classpath_str} ${JAVA_FILES}\"
+      COMMAND ${JAVA_COMPILE} -d ${TARGET_DIR} -classpath ${classpath_str} ${JAVA_FILES}
+      COMMAND echo \"${JAVA_RUNTIME} -classpath ${classpath_str}${separator}${WITH_CLASSPATH} ${ENHANCER} -p ${ARG_ENHANCE} -d ${TARGET_DIR}\"
+      COMMAND ${JAVA_RUNTIME} -classpath "${classpath_str}${separator}${WITH_CLASSPATH}" ${ENHANCER} -p ${ARG_ENHANCE} -d ${TARGET_DIR}
     )
   ELSE()
     ADD_CUSTOM_COMMAND( TARGET ${TARGET}.jar PRE_BUILD
-      COMMAND echo \"${JAVA_COMPILE} -d ${TARGET_DIR} -classpath ${ARG_CLASSPATH} ${JAVA_FILES}\"
-      COMMAND ${JAVA_COMPILE} -d ${TARGET_DIR} -classpath "${ARG_CLASSPATH}" ${JAVA_FILES}
+      COMMAND echo \"${JAVA_COMPILE} -d ${TARGET_DIR} -classpath ${classpath_str} ${JAVA_FILES}\"
+      COMMAND ${JAVA_COMPILE} -d ${TARGET_DIR} -classpath "${classpath_str}" ${JAVA_FILES}
     )
   ENDIF()
 


--===============1069322913233161388==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/magnus.blaudd@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: magnus.blaudd@stripped\
#   ld6dzg6ax7dnsovt
# target_branch: file:///data0/magnus/mysql/7.1/
# testament_sha1: 04ef243906d147a4a0213ed9803371b8569a1c67
# timestamp: 2011-06-22 11:24:34 +0200
# source_branch: file:///data0/magnus/mysql/7.0/
# base_revision_id: magnus.blaudd@stripped\
#   1seyodt8piwv7og7
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWTK6iNgAAhvfgFAQXGP//3/3
34S//9/6UAUMp5VDQ1hBtaiEkpqGNBU3kPSj1M1R6jTyTQxGRo9BNNmlBp6hzTIyGTBDRhMEaaNG
IGmTIwABBJE1AEDIUPU8QxRk9Rk9QaaaGmgaABzTIyGTBDRhMEaaNGIGmTIwABBJIJpkAmU2gVNm
qZpD2lAaGT1A9QaaPU9Q4HMAykpt3jeW7I0McgUKXFLgUG7mO+/XxFuGWpB2vrlqnjI0RmBA4Ia0
tPXKxj69xlv3jun+Iq1uazny9uKoSrzaGZg7voaoqY0sZ5pSeHfVIlabM7MzHEtzV6bFHf52cWb2
P2nDAoimljccJNcPfeYiUmmr7HZNqzmbbVu0U6aVYVcNvpIKGcTJGMZDMKcZOwzOHVj8TxL5ju6e
dTnDBsczeppUZBXmgRuIBa+W/lFyTHHts+Kq5I+/mYJE7aPtvil10c9PBzjQ7+g4FgQ+cMhk94j4
yMmETUFFm7igQZnlnHQec6xHwL++Ij2yiQ9g+DPlitiYITxSX1Rc1rc1i6dcxZhVforx05g8zebc
Nd++7dMFsSIsS53iNhJtxVIVho+JJOJRAa4z5Ituf5TiwSyCrgzHQeF8nDRKbNhvrdpWgVDajcmN
fLF5jiU3J7oTqScTbEazr9AcYX2vM6bJSLrrBDVELnFU4oYn6hOA46mV7HZcdbZULaJ4x5itURto
ZU6imRtpVbQi147Z2A6Yb1qOFwVuthQz7OD+FtMdzi6bVMht7iuL00miQCqTT+0ywn6uoe1XhEkf
rnOzoDYLpFbvZjajcjBekPEUlbDE/MHSeSPETBdABwsff/ZT95NkSP6M8woigq4EYg3wJB/FWFyR
pJmwByL5fmG0IHlATFmQiaLgNMRYPP8ENiIiLyJCLzREwrJJFhNExpyzyt2jQRKbmD9XoMBQgUGW
g0RdRo9IrrPFUWvIYnCgTjh4GOHJtgDq7ZDJFeBuk7IDopKzs3nP4T/T2JFeDkeIlVllD3nhMSpH
2P9qAoTPwHkEBB6ByR5rGLX1a6Ttox4PApCEkPv3E2LP+Uh3g32OdlmJDRWrSc7zg/1m98bQRTF5
C0nj8QMKRkEsmX6yCfVykNV2Ch93BlK1ZoFonVxhjXpSIi1IohVyFwp5dSM4ne4b26jYnApNlURP
Z7+bTc00VUzEyHlOn1rCcsLdkjOy4X3xbjk4gG070y0PSglF78OMyQdJKoIcjnv0c4todrGXnt1f
nePOVGtqU8xXh2ICBNKpmGSMgYr6QVlyIl2hecnWZfKmlmWFYPLOYW0wGIdOrKqoOAcyUumhw5BX
LMr7thuUAx3BWFk3hJAUOtI1FwdyikMXl2frssvKCOoP5Ogzi1RVKoWmj4QdN9lE4YpDlEBRlgkK
7UKgkyZlypDrXxriUxeFVJqDFjBSg3jyRRjxb0hkTizxCqyirMpY7HcgzuyaSAgvTlPjCYs000zq
1rGdrE7gGuEDmRV6KD5cK1StDn2VVRDpUhyZceJNIzwjlO70jDbVk3hncupt0hKxYruYWylAYTFM
IKh5WBbYnpgH+slWV8oFjYFwSh8xWPHVVjzC07XkGEzJDxtbbiyJEViHpycJzARcpb9na2FaRun3
zSLOv5AknwWoYi04RIYhbWLad0VdntYeDlf0IV0kNcKn/JAdfwOupS52TJMSkBseYj/i7kinChIG
V1EbAA==


--===============1069322913233161388==--