List:Commits« Previous MessageNext Message »
From:Bjorn Munch Date:November 30 2012 8:49am
Subject:bzr push into mysql-5.5-cluster-7.2 branch (bjorn.munch:3979 to 3982)
View as plain text  
 3982 Bjorn Munch	2012-11-30
      New attempt at fixing jar file name

    modified:
      storage/ndb/clusterj/CMakeLists.txt
 3981 Bjorn Munch	2012-11-29
      One more jar file name to fix

    modified:
      storage/ndb/clusterj/clusterj-api/CMakeLists.txt
 3980 Bjorn Munch	2012-11-29
      New attempt at fixing jar file name

    modified:
      storage/ndb/clusterj/clusterj-jpatest/CMakeLists.txt
      storage/ndb/clusterj/clusterj-openjpa/CMakeLists.txt
      storage/ndb/clusterj/clusterj-test/CMakeLists.txt
 3979 Bjorn Munch	2012-11-29
      Hardcode version number in jar file names

    modified:
      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	2011-11-22 10:13:39 +0000
+++ b/storage/ndb/clusterj/CMakeLists.txt	2012-11-30 08:48:42 +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-${MYSQL_CLUSTER_VERSION}.jar
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/clusterj-${NDB_JAVA_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	2011-11-24 12:25:32 +0000
+++ b/storage/ndb/clusterj/clusterj-api/CMakeLists.txt	2012-11-29 14:31:59 +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-${MYSQL_CLUSTER_VERSION}.jar
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/clusterj-api-${NDB_JAVA_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-29 12:39:44 +0000
+++ b/storage/ndb/clusterj/clusterj-jpatest/CMakeLists.txt	2012-11-29 13:49:58 +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-${NDB_JAVA_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-29 12:39:44 +0000
+++ b/storage/ndb/clusterj/clusterj-openjpa/CMakeLists.txt	2012-11-29 13:49:58 +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-${NDB_JAVA_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-29 12:39:44 +0000
+++ b/storage/ndb/clusterj/clusterj-test/CMakeLists.txt	2012-11-29 13:49:58 +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-${NDB_JAVA_VERSION}.jar
         DESTINATION ${INSTALL_MYSQLSHAREDIR}/java COMPONENT ClusterJ)

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.5-cluster-7.2 branch (bjorn.munch:3979 to 3982) Bjorn Munch30 Nov