List:Commits« Previous MessageNext Message »
From:Martin Zaun Date:November 22 2012 5:56am
Subject:bzr push into mysql-5.1-telco-7.1 branch (martin.zaun:4670 to 4671)
View as plain text  
 4671 Martin Zaun	2012-11-21
      removed javac '-target' option support from 71 automake causing issues with JDK 7

    modified:
      storage/ndb/clusterj/clusterj-api/Makefile.am
      storage/ndb/clusterj/clusterj-core/Makefile.am
      storage/ndb/clusterj/clusterj-jdbc/Makefile.am
      storage/ndb/clusterj/clusterj-jpatest/Makefile.am
      storage/ndb/clusterj/clusterj-openjpa/Makefile.am
      storage/ndb/clusterj/clusterj-test/Makefile.am
      storage/ndb/clusterj/clusterj-tie/Makefile.am
      storage/ndb/ndb_configure.m4
      storage/ndb/src/ndbjtie/Makefile.am
      storage/ndb/src/ndbjtie/jtie/Makefile.am
      storage/ndb/src/ndbjtie/jtie/test/myjapi/Makefile.am
      storage/ndb/src/ndbjtie/test/Makefile.am
 4670 magnus.blaudd@stripped	2012-11-21
      clusterj
       - look for java before starting to care about what's in classpath
       - theoretically we could use java to check if classpath is correct by doing
        configure style tests written in java. Would avoid need to duplicate classpath
        parsing(which won't have the same rules as in java anyway)

    modified:
      mysql-test/suite/ndb/t/clusterj.test
      mysql-test/suite/ndb/t/clusterj_jpa.test
=== modified file 'storage/ndb/clusterj/clusterj-api/Makefile.am'
--- a/storage/ndb/clusterj/clusterj-api/Makefile.am	2011-12-14 19:26:46 +0000
+++ b/storage/ndb/clusterj/clusterj-api/Makefile.am	2012-11-22 05:54:26 +0000
@@ -94,8 +94,8 @@ $(MANIFEST): 
 classclusterj_api.stamp: $(clusterj_api_java)
 	mkdir -p $(JAVAROOT)
 	if test -n "$?"; then \
-	  echo '$(CLASSPATH_ENV) $(JAVAC) -target $(JAVAC_TARGET) -d $(JAVAROOT) $(AM_JAVACFLAGS) $(JAVACFLAGS) $?' ; \
-	  $(CLASSPATH_ENV) $(JAVAC) -target $(JAVAC_TARGET) -d $(JAVAROOT) \
+	  echo '$(CLASSPATH_ENV) $(JAVAC) -d $(JAVAROOT) $(AM_JAVACFLAGS) $(JAVACFLAGS) $?' ; \
+	  $(CLASSPATH_ENV) $(JAVAC) -d $(JAVAROOT) \
 	    $(AM_JAVACFLAGS) $(JAVACFLAGS) $?; \
 	fi
 	echo timestamp > classclusterj_api.stamp

=== modified file 'storage/ndb/clusterj/clusterj-core/Makefile.am'
--- a/storage/ndb/clusterj/clusterj-core/Makefile.am	2012-03-05 22:28:15 +0000
+++ b/storage/ndb/clusterj/clusterj-core/Makefile.am	2012-11-22 05:54:26 +0000
@@ -109,8 +109,8 @@ EXTRA_DIST = \
 classclusterj_core.stamp: $(clusterj_core_java)
 	mkdir -p $(JAVAROOT)
 	if test -n "$?"; then \
-	  echo '$(CLASSPATH_ENV) $(JAVAC) -target $(JAVAC_TARGET) -d $(JAVAROOT) $(AM_JAVACFLAGS) $(JAVACFLAGS) $?' ; \
-	  $(CLASSPATH_ENV) $(JAVAC) -target $(JAVAC_TARGET) -d $(JAVAROOT) \
+	  echo '$(CLASSPATH_ENV) $(JAVAC) -d $(JAVAROOT) $(AM_JAVACFLAGS) $(JAVACFLAGS) $?' ; \
+	  $(CLASSPATH_ENV) $(JAVAC) -d $(JAVAROOT) \
 	    $(AM_JAVACFLAGS) $(JAVACFLAGS) $?; \
 	fi
 	echo timestamp > classclusterj_core.stamp

=== modified file 'storage/ndb/clusterj/clusterj-jdbc/Makefile.am'
--- a/storage/ndb/clusterj/clusterj-jdbc/Makefile.am	2011-11-22 22:53:33 +0000
+++ b/storage/ndb/clusterj/clusterj-jdbc/Makefile.am	2012-11-22 05:54:26 +0000
@@ -108,8 +108,8 @@ classclusterj_jdbc.stamp: $(clusterj_jdb
 	fi
 	mkdir -p $(JAVAROOT)
 	if test -n "$?"; then \
-	  echo '$(CLASSPATH_ENV) $(JAVAC) -target $(JAVAC_TARGET) -d $(JAVAROOT) $(AM_JAVACFLAGS) $(JAVACFLAGS) $(clusterj_jdbc_java) $(clusterj_jdbc_antlr_src)' ; \
-	  $(CLASSPATH_ENV) $(JAVAC) -target $(JAVAC_TARGET) -d $(JAVAROOT) \
+	  echo '$(CLASSPATH_ENV) $(JAVAC) -d $(JAVAROOT) $(AM_JAVACFLAGS) $(JAVACFLAGS) $(clusterj_jdbc_java) $(clusterj_jdbc_antlr_src)' ; \
+	  $(CLASSPATH_ENV) $(JAVAC) -d $(JAVAROOT) \
 	    $(AM_JAVACFLAGS) $(JAVACFLAGS) $(clusterj_jdbc_java) $(clusterj_jdbc_antlr_src); \
 	fi
 	echo timestamp > classclusterj_jdbc.stamp

=== modified file 'storage/ndb/clusterj/clusterj-jpatest/Makefile.am'
--- a/storage/ndb/clusterj/clusterj-jpatest/Makefile.am	2011-06-30 16:04:23 +0000
+++ b/storage/ndb/clusterj/clusterj-jpatest/Makefile.am	2012-11-22 05:54:26 +0000
@@ -106,8 +106,8 @@ classPCEnhancer.stamp: classclusterj_jpa
 classclusterj_jpatest.stamp: $(clusterj_jpatest_java)
 	mkdir -p  $(JAVAROOT)
 	if test -n "$?"; then \
-	  echo '$(CLASSPATH_ENV) $(JAVAC) -target $(JAVAC_TARGET) -d $(JAVAROOT) $(AM_JAVACFLAGS) $(JAVACFLAGS) $?' ; \
-	  $(CLASSPATH_ENV) $(JAVAC) -target $(JAVAC_TARGET) -d $(JAVAROOT) \
+	  echo '$(CLASSPATH_ENV) $(JAVAC) -d $(JAVAROOT) $(AM_JAVACFLAGS) $(JAVACFLAGS) $?' ; \
+	  $(CLASSPATH_ENV) $(JAVAC) -d $(JAVAROOT) \
 	    $(AM_JAVACFLAGS) $(JAVACFLAGS) $?; \
 	fi
 	echo timestamp > classclusterj_jpatest.stamp

=== modified file 'storage/ndb/clusterj/clusterj-openjpa/Makefile.am'
--- a/storage/ndb/clusterj/clusterj-openjpa/Makefile.am	2011-02-02 09:52:33 +0000
+++ b/storage/ndb/clusterj/clusterj-openjpa/Makefile.am	2012-11-22 05:54:26 +0000
@@ -94,8 +94,8 @@ $(CLUSTERJPA_MANIFEST):
 classclusterj_openjpa.stamp: $(clusterj_openjpa_java)
 	mkdir -p  $(JAVAROOT)
 	if test -n "$?"; then \
-	  echo '$(CLASSPATH_ENV) $(JAVAC) -target $(JAVAC_TARGET) -d $(JAVAROOT) $(AM_JAVACFLAGS) $(JAVACFLAGS) $?' ; \
-	  $(CLASSPATH_ENV) $(JAVAC) -target $(JAVAC_TARGET) -d $(JAVAROOT) \
+	  echo '$(CLASSPATH_ENV) $(JAVAC) -d $(JAVAROOT) $(AM_JAVACFLAGS) $(JAVACFLAGS) $?' ; \
+	  $(CLASSPATH_ENV) $(JAVAC) -d $(JAVAROOT) \
 	    $(AM_JAVACFLAGS) $(JAVACFLAGS) $?; \
 	fi
 	echo timestamp > classclusterj_openjpa.stamp

=== modified file 'storage/ndb/clusterj/clusterj-test/Makefile.am'
--- a/storage/ndb/clusterj/clusterj-test/Makefile.am	2012-06-28 22:30:59 +0000
+++ b/storage/ndb/clusterj/clusterj-test/Makefile.am	2012-11-22 05:54:26 +0000
@@ -192,8 +192,8 @@ $(MANIFEST):
 classclusterj_test.stamp: $(clusterj_test_java)
 	mkdir -p  $(JAVAROOT)
 	if test -n "$?"; then \
-	  echo '$(CLASSPATH_ENV) $(JAVAC) -target $(JAVAC_TARGET) -d $(JAVAROOT) $(AM_JAVACFLAGS) $(JAVACFLAGS) $?' ; \
-	  $(CLASSPATH_ENV) $(JAVAC) -target $(JAVAC_TARGET) -d $(JAVAROOT) \
+	  echo '$(CLASSPATH_ENV) $(JAVAC) -d $(JAVAROOT) $(AM_JAVACFLAGS) $(JAVACFLAGS) $?' ; \
+	  $(CLASSPATH_ENV) $(JAVAC) -d $(JAVAROOT) \
 	    $(AM_JAVACFLAGS) $(JAVACFLAGS) $?; \
 	fi
 	echo timestamp > classclusterj_test.stamp

=== modified file 'storage/ndb/clusterj/clusterj-tie/Makefile.am'
--- a/storage/ndb/clusterj/clusterj-tie/Makefile.am	2012-04-02 20:43:14 +0000
+++ b/storage/ndb/clusterj/clusterj-tie/Makefile.am	2012-11-22 05:54:26 +0000
@@ -77,8 +77,8 @@ EXTRA_DIST = \
 classclusterj_tie.stamp: $(clusterj_tie_java)
 	mkdir -p  $(JAVAROOT)
 	if test -n "$?"; then \
-	  echo '$(CLASSPATH_ENV) $(JAVAC) -target $(JAVAC_TARGET) -d $(JAVAROOT) $(AM_JAVACFLAGS) $(JAVACFLAGS) $?' ; \
-	  $(CLASSPATH_ENV) $(JAVAC) -target $(JAVAC_TARGET) -d $(JAVAROOT) \
+	  echo '$(CLASSPATH_ENV) $(JAVAC) -d $(JAVAROOT) $(AM_JAVACFLAGS) $(JAVACFLAGS) $?' ; \
+	  $(CLASSPATH_ENV) $(JAVAC) -d $(JAVAROOT) \
 	    $(AM_JAVACFLAGS) $(JAVACFLAGS) $?; \
 	fi
 	echo timestamp > classclusterj_tie.stamp

=== modified file 'storage/ndb/ndb_configure.m4'
--- a/storage/ndb/ndb_configure.m4	2012-11-02 08:59:31 +0000
+++ b/storage/ndb/ndb_configure.m4	2012-11-22 05:54:26 +0000
@@ -386,11 +386,6 @@ AC_DEFUN([MYSQL_CHECK_NDB_OPTIONS], [
                                Cluster/J JPA, and Cluster/J JDBC])],
               [classpath="$withval"],
               [classpath="no"])
-  AC_ARG_WITH([javac-target],
-              [AC_HELP_STRING([--with-javac-target],
-                              [Java compiler target version to be used])],
-              [javac_target="$withval"],
-              [javac_target="1.5"])
 
   AC_MSG_CHECKING([for NDB Cluster options])
   AC_MSG_RESULT([])
@@ -822,8 +817,6 @@ AC_DEFUN([MYSQL_SETUP_NDBCLUSTER], [
     CLUSTERJ_CLASSPATH=$have_classpath
     AC_SUBST(CLUSTERJ_CLASSPATH)
   fi
-  JAVAC_TARGET=$javac_target
-  AC_SUBST(JAVAC_TARGET)
   
 
   # building dynamic breaks on AIX. (If you want to try it and get unresolved

=== modified file 'storage/ndb/src/ndbjtie/Makefile.am'
--- a/storage/ndb/src/ndbjtie/Makefile.am	2012-04-19 10:46:43 +0000
+++ b/storage/ndb/src/ndbjtie/Makefile.am	2012-11-22 05:54:26 +0000
@@ -100,8 +100,8 @@ NDBAPI_java = \
 classndbjtie.stamp: $(NDBAPI_java) $(MGMAPI_java) $(MYSQL_java)
 	mkdir -p $(JAVAROOT)
 	if test -n "$?"; then \
-	  echo '$(CLASSPATH_ENV) $(JAVAC) -target $(JAVAC_TARGET) -d $(JAVAROOT) $(AM_JAVACFLAGS) $(JAVACFLAGS) $?' ; \
-	  $(CLASSPATH_ENV) $(JAVAC) -target $(JAVAC_TARGET) -d $(JAVAROOT) \
+	  echo '$(CLASSPATH_ENV) $(JAVAC) -d $(JAVAROOT) $(AM_JAVACFLAGS) $(JAVACFLAGS) $?' ; \
+	  $(CLASSPATH_ENV) $(JAVAC) -d $(JAVAROOT) \
 	  $(AM_JAVACFLAGS) $(JAVACFLAGS) $?; \
 	fi
 	echo timestamp > classndbjtie.stamp

=== modified file 'storage/ndb/src/ndbjtie/jtie/Makefile.am'
--- a/storage/ndb/src/ndbjtie/jtie/Makefile.am	2011-02-02 09:52:33 +0000
+++ b/storage/ndb/src/ndbjtie/jtie/Makefile.am	2012-11-22 05:54:26 +0000
@@ -52,8 +52,8 @@ JTIE_java = $(JTIE_DIR)/Wrapper.java \
 classjtie.stamp: $(JTIE_java)
 	mkdir -p $(JAVAROOT)
 	if test -n "$?"; then \
-          echo '$(CLASSPATH_ENV) $(JAVAC) -target $(JAVAC_TARGET) -d $(JAVAROOT) $(AM_JAVACFLAGS) $(JAVACFLAGS) $?' ; \
-          $(CLASSPATH_ENV) $(JAVAC) -target $(JAVAC_TARGET) -d $(JAVAROOT) \
+          echo '$(CLASSPATH_ENV) $(JAVAC) -d $(JAVAROOT) $(AM_JAVACFLAGS) $(JAVACFLAGS) $?' ; \
+          $(CLASSPATH_ENV) $(JAVAC) -d $(JAVAROOT) \
             $(AM_JAVACFLAGS) $(JAVACFLAGS) $?; \
         fi
 	echo timestamp > classjtie.stamp

=== modified file 'storage/ndb/src/ndbjtie/jtie/test/myjapi/Makefile.am'
--- a/storage/ndb/src/ndbjtie/jtie/test/myjapi/Makefile.am	2012-03-05 04:19:09 +0000
+++ b/storage/ndb/src/ndbjtie/jtie/test/myjapi/Makefile.am	2012-11-22 05:54:26 +0000
@@ -62,8 +62,8 @@ TEST_java = \
 classmyjapi.stamp: $(MYJAPI_java) $(TEST_java)
 	mkdir -p $(JAVAROOT)
 	if test -n "$?"; then \
-          echo '$(CLASSPATH_ENV) $(JAVAC) -target $(JAVAC_TARGET) -d $(JAVAROOT) $(AM_JAVACFLAGS) $(JAVACFLAGS) $?' ; \
-          $(CLASSPATH_ENV) $(JAVAC) -target $(JAVAC_TARGET) -d $(JAVAROOT) \
+          echo '$(CLASSPATH_ENV) $(JAVAC) -d $(JAVAROOT) $(AM_JAVACFLAGS) $(JAVACFLAGS) $?' ; \
+          $(CLASSPATH_ENV) $(JAVAC) -d $(JAVAROOT) \
           $(AM_JAVACFLAGS) $(JAVACFLAGS) $?; \
         fi
 	echo timestamp > classmyjapi.stamp

=== modified file 'storage/ndb/src/ndbjtie/test/Makefile.am'
--- a/storage/ndb/src/ndbjtie/test/Makefile.am	2012-04-19 10:46:43 +0000
+++ b/storage/ndb/src/ndbjtie/test/Makefile.am	2012-11-22 05:54:26 +0000
@@ -126,8 +126,8 @@ TEST_Java = \
 classndbjtietest.stamp: $(TEST_Java)
 	mkdir -p $(JAVAROOT)
 	if test -n "$?"; then \
-	  echo '$(CLASSPATH_ENV) $(JAVAC) -target $(JAVAC_TARGET) -d $(JAVAROOT) $(AM_JAVACFLAGS) $(JAVACFLAGS) $?' ; \
-	  $(CLASSPATH_ENV) $(JAVAC) -target $(JAVAC_TARGET) -d $(JAVAROOT) \
+	  echo '$(CLASSPATH_ENV) $(JAVAC) -d $(JAVAROOT) $(AM_JAVACFLAGS) $(JAVACFLAGS) $?' ; \
+	  $(CLASSPATH_ENV) $(JAVAC) -d $(JAVAROOT) \
 	  $(AM_JAVACFLAGS) $(JAVACFLAGS) $?; \
 	fi
 	echo timestamp > classndbjtietest.stamp

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.1-telco-7.1 branch (martin.zaun:4670 to 4671) Martin Zaun22 Nov