bzr push into mysql-5.5-cluster-7.2 branch (bernd.ocklin:4024 to 4026) Bug#12379755

[Bernd Ocklin]

 4026 Bernd Ocklin	2012-10-12
      Bug#12379755 STOP COMPILING ANYTHING RELATED TO JAVA

    modified:
      storage/ndb/CMakeLists.txt
 4025 Bernd Ocklin	2012-10-12
      fix ndbjtie cmake issue on some win

    modified:
      storage/ndb/src/ndbjtie/CMakeLists.txt
 4024 Maitrayi Sabaratnam	2012-10-12 [merge]
      Merge 7.1->7.2

    modified:
      storage/ndb/src/mgmclient/CommandInterpreter.cpp
      storage/ndb/src/mgmsrv/ConfigInfo.cpp
=== modified file 'storage/ndb/CMakeLists.txt'
--- a/storage/ndb/CMakeLists.txt	2012-04-11 12:07:25 +0000
+++ b/storage/ndb/CMakeLists.txt	2012-10-12 12:42:18 +0000
@@ -126,6 +126,12 @@ IF (NOT WITH_NDBCLUSTER)
   RETURN()
 ENDIF()
 
+OPTION(WITH_NDB_JAVA
+  "Include NDB Cluster Java components" ON)
+IF(WITH_NDB_JAVA)
+  MESSAGE(STATUS "Include NDB Java components")
+ENDIF()
+
 IF(CMAKE_SIZEOF_VOID_P EQUAL 4)
   MESSAGE(STATUS "Building NDB 32-bit")
 ELSE()
@@ -194,29 +200,33 @@ MESSAGE(STATUS "Using extra FLAGS for nd
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${NDB_CCFLAGS}")
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${NDB_CCFLAGS}")
 
-# Check for Java and JDK needed by ndbjtie and clusterj
-INCLUDE(FindJava)
-INCLUDE(FindJNI)
-INCLUDE("${NDB_SOURCE_DIR}/config/type_JAVA.cmake")
-
-IF(JAVA_COMPILE AND JAVA_ARCHIVE)
-  MESSAGE(STATUS "Found Java")
-  SET(HAVE_JAVA TRUE)
-ELSE()
-  MESSAGE(STATUS "Could not find Java")
-  SET(HAVE_JAVA FALSE)
-ENDIF()
+SET(HAVE_JAVA FALSE)
+SET(HAVE_JDK FALSE)
+IF(WITH_NDB_JAVA)
+  # Check for Java and JDK needed by ndbjtie and clusterj
+  INCLUDE(FindJava)
+  INCLUDE(FindJNI)
+  INCLUDE("${NDB_SOURCE_DIR}/config/type_JAVA.cmake")
+
+  IF(JAVA_COMPILE AND JAVA_ARCHIVE)
+    MESSAGE(STATUS "Found Java")
+    SET(HAVE_JAVA TRUE)
+  ELSE()
+    MESSAGE(ERROR "Could not find Java")
+  ENDIF()
 
-IF(JAVA_INCLUDE_PATH AND JAVA_INCLUDE_PATH2)
-  MESSAGE(STATUS "Found JDK")
-  SET(HAVE_JDK TRUE)
-ELSE()
-  MESSAGE(STATUS "Could not find JDK")
-  SET(HAVE_JDK FALSE)
-ENDIF()
+  IF(JAVA_INCLUDE_PATH AND JAVA_INCLUDE_PATH2)
+    MESSAGE(STATUS "Found JDK")
+    SET(HAVE_JDK TRUE)
+  ELSE()
+    MESSAGE(ERROR "Could not find JDK")
+  ENDIF()
 
-SET(WITH_CLASSPATH ${WITH_CLASSPATH} CACHE STRING
-  "Enable the classpath for MySQL Cluster Java Connector")
+  SET(WITH_CLASSPATH ${WITH_CLASSPATH} CACHE STRING
+    "Enable the classpath for MySQL Cluster Java Connector")
+ELSE(WITH_NDB_JAVA)
+  MESSAGE(STATUS "Excluding Cluster Java components") 
+ENDIF(WITH_NDB_JAVA)
 
 ADD_SUBDIRECTORY(include)
 ADD_SUBDIRECTORY(src)

=== modified file 'storage/ndb/src/ndbjtie/CMakeLists.txt'
--- a/storage/ndb/src/ndbjtie/CMakeLists.txt	2012-05-09 09:59:23 +0000
+++ b/storage/ndb/src/ndbjtie/CMakeLists.txt	2012-10-12 12:35:55 +0000
@@ -22,8 +22,11 @@ IF(HAVE_JAVA)
   FILE(TO_NATIVE_PATH "${Java_JAVA_EXECUTABLE}" Java_JAVA_EXECUTABLE_PATH)
 
   # the JVM arch option when loading native libraries
-  MATH(EXPR Java_JAVA_ARCH "${CMAKE_SIZEOF_VOID_P} * 8")
-  SET(Java_JAVA_ARCH_OPT "-d${Java_JAVA_ARCH}")
+  IF(CMAKE_SIZEOF_VOID_P EQUAL 4)
+    SET(Java_JAVA_ARCH_OPT "-d32")
+  ELSE()
+    SET(Java_JAVA_ARCH_OPT "-d64")
+  ENDIF()
 
 ENDIF(HAVE_JAVA)
 

No bundle (reason: useless for push emails).