From: Bjorn Munch
Date: November 30 2012 9:48am
Subject: bzr push into mysql-5.5-cluster-7.2 branch (bjorn.munch:3983 to 3984)
List-Archive: http://lists.mysql.com/commits/145417
Message-Id: <20121130094804.25279.70409.3984@khepri15.no.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3984 Bjorn Munch	2012-11-30
      Correct JAVA_NDB_VERSION

    modified:
      storage/ndb/clusterj/CMakeLists.txt
      storage/ndb/clusterj/clusterj-api/CMakeLists.txt
      storage/ndb/clusterj/clusterj-jpatest/CMakeLists.txt
      storage/ndb/clusterj/clusterj-openjpa/CMakeLists.txt
      storage/ndb/clusterj/clusterj-test/CMakeLists.txt
 3983 Bjorn Munch	2012-11-30
      I though NDB_JAVA_VERSION was defined, replacing with 7.2.8

    modified:
      storage/ndb/clusterj/CMakeLists.txt
      storage/ndb/clusterj/clusterj-api/CMakeLists.txt
      storage/ndb/clusterj/clusterj-jpatest/CMakeLists.txt
      storage/ndb/clusterj/clusterj-openjpa/CMakeLists.txt
      storage/ndb/clusterj/clusterj-test/CMakeLists.txt
=== modified file 'storage/ndb/clusterj/CMakeLists.txt'
--- a/storage/ndb/clusterj/CMakeLists.txt	2012-11-30 09:26:57 +0000
+++ b/storage/ndb/clusterj/CMakeLists.txt	2012-11-30 09:47:35 +0000
@@ -62,5 +62,5 @@ CREATE_JAR(clusterj
   MANIFEST ${CMAKE_CURRENT_SOURCE_DIR}/clusterj_manifest.mf
   DEPENDENCIES ${DEP} )
 
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/clusterj-7.2.8.jar
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/clusterj-${JAVA_NDB_VERSION}.jar
         DESTINATION ${INSTALL_MYSQLSHAREDIR}/java COMPONENT ClusterJ)

=== modified file 'storage/ndb/clusterj/clusterj-api/CMakeLists.txt'
--- a/storage/ndb/clusterj/clusterj-api/CMakeLists.txt	2012-11-30 09:26:57 +0000
+++ b/storage/ndb/clusterj/clusterj-api/CMakeLists.txt	2012-11-30 09:47:35 +0000
@@ -31,5 +31,5 @@ CREATE_JAR(clusterj-api ${JAVA_SOURCES}
   CLASSPATH target/classes
   MANIFEST ${CMAKE_CURRENT_SOURCE_DIR}/manifest.mf)
 
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/clusterj-api-7.2.8.jar
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/clusterj-api-${JAVA_NDB_VERSION}.jar
         DESTINATION ${INSTALL_MYSQLSHAREDIR}/java COMPONENT ClusterJ)

=== modified file 'storage/ndb/clusterj/clusterj-jpatest/CMakeLists.txt'
--- a/storage/ndb/clusterj/clusterj-jpatest/CMakeLists.txt	2012-11-30 09:26:57 +0000
+++ b/storage/ndb/clusterj/clusterj-jpatest/CMakeLists.txt	2012-11-30 09:47:35 +0000
@@ -43,5 +43,5 @@ CREATE_JAR(clusterj-jpatest ${JAVA_SOURC
   EXTRA_FILES src/main/resources/META-INF
   BROKEN_JAVAC ${BROKEN_JAVAC})
 
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/clusterj-jpatest-7.2.8.jar
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/clusterj-jpatest-${JAVA_NDB_VERSION}.jar
         DESTINATION ${INSTALL_MYSQLSHAREDIR}/java COMPONENT ClusterJ)

=== modified file 'storage/ndb/clusterj/clusterj-openjpa/CMakeLists.txt'
--- a/storage/ndb/clusterj/clusterj-openjpa/CMakeLists.txt	2012-11-30 09:26:57 +0000
+++ b/storage/ndb/clusterj/clusterj-openjpa/CMakeLists.txt	2012-11-30 09:47:35 +0000
@@ -45,5 +45,5 @@ CREATE_JAR(clusterjpa ${JAVA_SOURCES}
               src/main/resources/com
   MERGE_JARS ${JARS})
 
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/clusterjpa-7.2.8.jar
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/clusterjpa-${JAVA_NDB_VERSION}.jar
         DESTINATION ${INSTALL_MYSQLSHAREDIR}/java COMPONENT ClusterJ)

=== modified file 'storage/ndb/clusterj/clusterj-test/CMakeLists.txt'
--- a/storage/ndb/clusterj/clusterj-test/CMakeLists.txt	2012-11-30 09:26:57 +0000
+++ b/storage/ndb/clusterj/clusterj-test/CMakeLists.txt	2012-11-30 09:47:35 +0000
@@ -46,5 +46,5 @@ CREATE_JAR(clusterj-test ${JAVA_SOURCES}
               src/main/resources/schema.sql
   BROKEN_JAVAC ${BROKEN_JAVAC})
 
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/clusterj-test-7.2.8.jar
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/clusterj-test-${JAVA_NDB_VERSION}.jar
         DESTINATION ${INSTALL_MYSQLSHAREDIR}/java COMPONENT ClusterJ)

No bundle (reason: useless for push emails).