List:NDB Connectors« Previous MessageNext Message »
From:Monty Taylor Date:December 4 2007 1:18am
Subject:Rev 261: Merged jarfile build changes. in http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/telco-6.3
View as plain text  
At http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/telco-6.3

------------------------------------------------------------
revno: 261
revision-id: mtaylor@stripped
parent: mtaylor@stripped
parent: mtaylor@stripped
committer: Monty Taylor <mtaylor@stripped>
branch nick: telco-6.3
timestamp: Mon 2007-12-03 17:18:29 -0800
message:
  Merged jarfile build changes.
modified:
  java/Makefile.am               makefile.am-20070415032352-9dpe6aurqcnuwcrd-1
    ------------------------------------------------------------
    revno: 192.1.25.1.103
    revision-id: mtaylor@stripped
    parent: mtaylor@stripped
    committer: Monty Taylor <mtaylor@stripped>
    branch nick: devel
    timestamp: Mon 2007-12-03 16:28:54 -0800
    message:
      Fixed the jar problem for real this time. 
    modified:
      java/Makefile.am               makefile.am-20070415032352-9dpe6aurqcnuwcrd-1
    ------------------------------------------------------------
    revno: 192.1.25.1.102
    revision-id: mtaylor@stripped
    parent: mtaylor@stripped
    committer: Monty Taylor <mtaylor@stripped>
    branch nick: devel
    timestamp: Mon 2007-12-03 16:01:28 -0800
    message:
      Fixed problem with not putting all the classes in the jar file. 
    modified:
      java/Makefile.am               makefile.am-20070415032352-9dpe6aurqcnuwcrd-1
=== modified file 'java/Makefile.am'
--- a/java/Makefile.am	2007-11-28 21:58:53 +0000
+++ b/java/Makefile.am	2007-12-04 00:28:54 +0000
@@ -28,29 +28,29 @@
 NDBAPI_BUILT_SRC = ${builddir}/ndbj.cxx $(NDBAPI_BUILT_J)
 
 MGMAPI_BUILT_J = ${package_builddir}/mgmj/mgmj.java \
-      	${package_builddir}/mgmj/mgmjJNI.java \
-      	${package_builddir}/mgmj/mgmjConstants.java \
-      	${package_builddir}/mgmj/NdbLogEvent.java \
-      	${package_builddir}/mgmj/NdbLogEventType.java \
-      	${package_builddir}/mgmj/NdbMgmEventCategory.java \
-      	${package_builddir}/mgmj/NdbMgmEventSeverity.java \
-      	${package_builddir}/mgmj/NdbLogEventManager.java \
-      	${package_builddir}/mgmj/ClusterState.java \
-      	${package_builddir}/mgmj/NdbMgm.java \
-      	${package_builddir}/mgmj/NdbMgmFactory.java \
-      	${package_builddir}/mgmj/NdbMgmError.java \
-      	${package_builddir}/mgmj/NdbMgmReply.java \
-      	${package_builddir}/mgmj/NodeState.java \
-      	${package_builddir}/mgmj/NodeStatus.java \
-      	${package_builddir}/mgmj/NodeType.java \
-      	${package_builddir}/mgmj/NdbMgmLoglevel.java \
-      	${package_builddir}/mgmj/NdbMgmSeverity.java \
-      	${package_builddir}/mgmj/NdbFilterItem.java \
-      	${package_builddir}/mgmj/NdbFilterList.java \
-      	${package_builddir}/mgmj/NdbLogEventCategoryListener.java \
-      	${package_builddir}/mgmj/NdbLogEventListener.java \
-      	${package_builddir}/mgmj/NdbLogEventManager.java \
-      	${package_builddir}/mgmj/NdbLogEventTypeListener.java \
+	${package_builddir}/mgmj/mgmjJNI.java \
+	${package_builddir}/mgmj/mgmjConstants.java \
+	${package_builddir}/mgmj/NdbLogEvent.java \
+	${package_builddir}/mgmj/NdbLogEventType.java \
+	${package_builddir}/mgmj/NdbMgmEventCategory.java \
+	${package_builddir}/mgmj/NdbMgmEventSeverity.java \
+	${package_builddir}/mgmj/NdbLogEventManager.java \
+	${package_builddir}/mgmj/ClusterState.java \
+	${package_builddir}/mgmj/NdbMgm.java \
+	${package_builddir}/mgmj/NdbMgmFactory.java \
+	${package_builddir}/mgmj/NdbMgmError.java \
+	${package_builddir}/mgmj/NdbMgmReply.java \
+	${package_builddir}/mgmj/NodeState.java \
+	${package_builddir}/mgmj/NodeStatus.java \
+	${package_builddir}/mgmj/NodeType.java \
+	${package_builddir}/mgmj/NdbMgmLoglevel.java \
+	${package_builddir}/mgmj/NdbMgmSeverity.java \
+	${package_builddir}/mgmj/NdbFilterItem.java \
+	${package_builddir}/mgmj/NdbFilterList.java \
+	${package_builddir}/mgmj/NdbLogEventCategoryListener.java \
+	${package_builddir}/mgmj/NdbLogEventListener.java \
+	${package_builddir}/mgmj/NdbLogEventManager.java \
+	${package_builddir}/mgmj/NdbLogEventTypeListener.java \
 	${package_builddir}/mgmj/*Event.java 
 
 MGMAPI_BUILT_SRC = ${builddir}/mgmj.cxx $(MGMAPI_BUILT_J)
@@ -323,13 +323,13 @@
 	@echo "Building MGM/J java files"
 	@$(JAVAC) -classpath
$(srcdir):$(srcdir)/lib/mysql-connector-java-5.0.4-bin.jar:$(srcdir)/lib/junit.jar
-sourcepath $(srcdir):$(builddir) -d $(builddir)  $(MGMAPI_JAVA_SRC) $(MGMAPI_BUILT_J)
 	@echo "Building mgmj.jar"
-	@$(JAR) cf $@ $(MGMAPI_JAVA_CLASSES) 
+	@$(JAR) cf $@ $(MGMAPI_JAVA_CLASSES) ${package_builddir}/ndbj/*\$$*class
 
 ndbj.jar: libndbj.la $(NDBAPI_JAVA_SRC) $(NDBAPI_BUILT_J)
 	@echo "Building NDB/J java files"
 	@$(JAVAC) -classpath
$(srcdir):$(srcdir)/lib/mysql-connector-java-5.0.4-bin.jar:$(srcdir)/lib/junit.jar
-sourcepath $(srcdir):$(builddir) -d $(builddir)  $(NDBAPI_JAVA_SRC) $(NDBAPI_BUILT_J) 
 	@echo "Building ndbj.jar"
-	@$(JAR) cf $@ $(NDBAPI_JAVA_CLASSES)
+	@$(JAR) cf $@ ${NDBAPI_JAVA_CLASSES} ${package_builddir}/ndbj/*\$$*class
 
 check-local: all-am
 	$(JAVA) -Djava.library.path=$(builddir)/.libs 
-Dcom.mysql.jdbc.testsuite.url=jdbc:mysql://localhost/test -classpath
$(builddir):$(builddir)/lib/mysql-connector-java-5.0.4-bin.jar:$(builddir)/lib/junit.jar 
junit.textui.TestRunner testsuite.ndbj.AllTests

Thread
Rev 261: Merged jarfile build changes. in http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/telco-6.3Monty Taylor4 Dec