List:Commits« Previous MessageNext Message »
From:jonas oreland Date:October 4 2011 6:33am
Subject:bzr push into mysql-5.5-cluster branch (jonas.oreland:3565 to 3567)
View as plain text  
 3567 jonas oreland	2011-10-04
      ndb replace \ with / in WITH_CLASSPATH taken from env (from bteam release clone)

    modified:
      storage/ndb/ndb_configure.cmake
 3566 jonas oreland	2011-10-04
      ndb - fix 2 out-of-source java build problems

    modified:
      storage/ndb/clusterj/clusterj-test/CMakeLists.txt
      storage/ndb/config/type_JAVA.cmake
 3565 magnus.blaudd@stripped	2011-10-03 [merge]
      Merge

    modified:
      storage/ndb/include/CMakeLists.txt
      storage/ndb/ndb_configure.cmake
=== modified file 'storage/ndb/clusterj/clusterj-test/CMakeLists.txt'
--- a/storage/ndb/clusterj/clusterj-test/CMakeLists.txt	2011-09-16 12:58:08 +0000
+++ b/storage/ndb/clusterj/clusterj-test/CMakeLists.txt	2011-10-04 05:22:45 +0000
@@ -32,15 +32,15 @@ ENDFOREACH()
 SET ( CLASSPATH 
   target/classes
   ${WITH_CLASSPATH}
-  ${CMAKE_SOURCE_DIR}/storage/ndb/clusterj/clusterj-api/target/classes
-  ${CMAKE_SOURCE_DIR}/storage/ndb/clusterj/clusterj-core/target/classes)
+  ${CMAKE_BINARY_DIR}/storage/ndb/clusterj/clusterj-api/target/classes
+  ${CMAKE_BINARY_DIR}/storage/ndb/clusterj/clusterj-core/target/classes)
 
 SET(CLUSTERJ_TEST_EXPORTS regression,testsuite.clusterj,testsuite.clusterj.model,testsuite.clusterj.domaintypehandler)
 CREATE_MANIFEST(manifest.mf ${CLUSTERJ_TEST_EXPORTS} clusterj-test)
 
 CREATE_JAR(clusterj-test ${JAVA_SOURCES}
   CLASSPATH ${CLASSPATH}
-  MANIFEST manifest.mf
+  MANIFEST ${CMAKE_CURRENT_SOURCE_DIR}/manifest.mf
   DEPENDENCIES clusterj.jar
   EXTRA_FILES src/main/resources/META-INF
               src/main/resources/schema.sql

=== modified file 'storage/ndb/config/type_JAVA.cmake'
--- a/storage/ndb/config/type_JAVA.cmake	2011-09-16 07:51:29 +0000
+++ b/storage/ndb/config/type_JAVA.cmake	2011-10-04 05:22:45 +0000
@@ -131,7 +131,7 @@ MACRO(CREATE_JAR)
     IF(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${F})
       ADD_CUSTOM_COMMAND(
         OUTPUT ${MARKER}
-        COMMAND ${CMAKE_COMMAND} -E copy_directory ${F} ${CLASS_DIR}/${N}
+        COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/${F} ${CLASS_DIR}/${N}
         COMMAND ${CMAKE_COMMAND} -E touch ${MARKER}
         DEPENDS ${F} ${OLD_MARKER}
         COMMENT "Adding directory ${N} to ${TARGET}.jar"
@@ -139,7 +139,7 @@ MACRO(CREATE_JAR)
     ELSE()
       ADD_CUSTOM_COMMAND(
         OUTPUT ${MARKER}
-        COMMAND ${CMAKE_COMMAND} -E copy_if_different ${F} ${CLASS_DIR}/${N}
+        COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/${F} ${CLASS_DIR}/${N}
         COMMAND ${CMAKE_COMMAND} -E touch ${MARKER}
         DEPENDS ${F} ${OLD_MARKER}
         COMMENT "Adding file ${N} to ${TARGET}.jar"

=== modified file 'storage/ndb/ndb_configure.cmake'
--- a/storage/ndb/ndb_configure.cmake	2011-10-03 11:34:40 +0000
+++ b/storage/ndb/ndb_configure.cmake	2011-10-04 06:33:10 +0000
@@ -207,6 +207,9 @@ IF(WITH_CLASSPATH)
   MESSAGE(STATUS "Using supplied classpath: ${WITH_CLASSPATH}")
 ELSE()
   SET(WITH_CLASSPATH "$ENV{CLASSPATH}")
+  IF(WIN32)
+    STRING(REPLACE "\\" "/" WITH_CLASSPATH ${WITH_CLASSPATH})
+  ENDIF()
   IF(WITH_CLASSPATH)
     MESSAGE(STATUS "Using CLASSPATH from environment: ${WITH_CLASSPATH}")    
   ENDIF()

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.5-cluster branch (jonas.oreland:3565 to 3567) jonas oreland5 Oct