bzr push into mysql-5.1-telco-7.1 branch (magnus.blaudd:4002 to 4003) Bug#58563

[Magnus Blåudd]

 4003 Magnus Blåudd	2010-11-29
      Bug#58563 Build of clusterj.jar fails during parallel build, missing dependency
       - Make clusterj.jar depend on all the .jar it consist of so that the classes it will
         add have been built.

    modified:
      storage/ndb/clusterj/CMakeLists.txt
 4002 Magnus Blåudd	2010-11-29 [merge]
      Merge 7.0 -> 7.1

    modified:
      libmysql/Makefile.am
      libmysql/Makefile.shared
      libmysql/conf_to_src.c
      libmysql/dll.c
      libmysql/errmsg.c
      libmysql/get_password.c
      libmysql/libmysql.c
      libmysql/manager.c
      libmysql_r/Makefile.am
      scripts/make_binary_distribution.sh
      support-files/mysql.spec.sh
=== modified file 'storage/ndb/clusterj/CMakeLists.txt'
--- a/storage/ndb/clusterj/CMakeLists.txt	2010-11-26 17:21:25 +0000
+++ b/storage/ndb/clusterj/CMakeLists.txt	2010-11-29 15:33:34 +0000
@@ -15,11 +15,7 @@
 
 SET(BASE_NAMES api core tie)
 
-ADD_SUBDIRECTORY(clusterj-api)
-ADD_SUBDIRECTORY(clusterj-core)
-ADD_SUBDIRECTORY(clusterj-tie)
 IF(HAVE_OPENJPA)
-  ADD_SUBDIRECTORY(clusterj-openjpa)
   LIST(APPEND BASE_NAMES openjpa)
 ENDIF(HAVE_OPENJPA)
 IF(HAVE_JUNIT)
@@ -31,6 +27,8 @@ ENDIF(HAVE_JUNIT)
 
 FOREACH(BASE_NAME ${BASE_NAMES})
 
+  ADD_SUBDIRECTORY(clusterj-${BASE_NAME})
+
   SET(BASE_DIR ${CMAKE_SOURCE_DIR}/storage/ndb/clusterj/clusterj-${BASE_NAME})
   SET(BUNDLE ${BASE_DIR}/src/main/resources/com/mysql/clusterj/${BASE_NAME}/Bundle.properties)
 
@@ -42,7 +40,17 @@ FOREACH(BASE_NAME ${BASE_NAMES})
   IF(EXISTS ${BUNDLE})
     LIST(APPEND JAVA_CLASS_DIRS "${BASE_DIR}/src/main/resources" "com/mysql/clusterj/${BASE_NAME}/Bundle.properties")
   ENDIF() 
- 
+
+  # Generate clusterj.jar dependencies from the BASE_NAME
+  IF(BASE_NAME STREQUAL openjpa)
+    # Exception to confirm rule:
+    # "jar built in clusterj-openjpa is called clusterjpa"
+    SET(CLUSTERJ_JAR_DEPENDS ${CLUSTERJ_JAR_DEPENDS} clusterjpa.jar)
+  ELSE()
+    SET(CLUSTERJ_JAR_DEPENDS ${CLUSTERJ_JAR_DEPENDS} clusterj-${BASE_NAME}.jar)
+  ENDIF()
+
+
 ENDFOREACH(BASE_NAME ${BASE_NAMES})
 
 LIST(APPEND JAVA_CLASS_DIRS "${CMAKE_SOURCE_DIR}/storage/ndb/src/ndbjtie/target/classes" "com/mysql/ndbjtie")
@@ -52,6 +60,6 @@ SET(CLUSTERJ_EXPORTS com.mysql.clusterj,
 CREATE_MANIFEST(clusterj_manifest.mf ${CLUSTERJ_EXPORTS} clusterj)
 CREATE_JAR_FROM_CLASSES(clusterj ${JAVA_CLASS_DIRS}
   MANIFEST clusterj_manifest.mf
-  DEPENDENCIES clusterj-api.jar ndbjtie.jar jtie.jar)
+  DEPENDENCIES ndbjtie.jar jtie.jar ${CLUSTERJ_JAR_DEPENDS})
 
 

No bundle (reason: useless for push emails).