List:NDB Connectors« Previous MessageNext Message »
From:Monty Taylor Date:December 4 2007 12:29am
Subject:Rev 320: Fixed the jar problem for real this time. in http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/devel
View as plain text  
At http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/devel

------------------------------------------------------------
revno: 320
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
=== modified file 'java/Makefile.am'
--- a/java/Makefile.am	2007-12-04 00:01:28 +0000
+++ b/java/Makefile.am	2007-12-04 00:28:54 +0000
@@ -203,59 +203,6 @@
 	${package_builddir}/ndbj/examples/TestEvent.class \
 	${package_builddir}/ndbj/examples/UpdateUsingPrimaryKey.class \
 	${package_builddir}/ndbj/util/NdbConfigurator.class \
-	${package_builddir}/ndbj/examples/ExamplesConfigurator\$SimpleAuthenticator.class \
-	${package_builddir}/ndbj/util/NdbConfigurator\$SimpleAuthenticator.class \
-	${package_builddir}/ndbj/NdbError\$Status.class \
-	${package_builddir}/ndbj/NdbError\$Classification\$SwigNext.class \
-	${package_builddir}/ndbj/NdbOperation\$LockMode.class \
-	${package_builddir}/ndbj/NdbObject\$Status\$SwigNext.class \
-	${package_builddir}/ndbj/NdbObject\$State\$SwigNext.class \
-	${package_builddir}/ndbj/NdbObject\$FragmentType.class \
-	${package_builddir}/ndbj/NdbScanOperation\$ScanFlag.class \
-	${package_builddir}/ndbj/NdbColumn\$Type\$SwigNext.class \
-	${package_builddir}/ndbj/NdbObject\$Status.class \
-	${package_builddir}/ndbj/NdbObject\$State.class \
-	${package_builddir}/ndbj/NdbObject\$FragmentType\$SwigNext.class \
-	${package_builddir}/ndbj/NdbObject\$Type.class \
-	${package_builddir}/ndbj/NdbObject\$Store\$SwigNext.class \
-	${package_builddir}/ndbj/NdbIndexScanOperation\$BoundType.class \
-	${package_builddir}/ndbj/NdbBlob\$State\$SwigNext.class \
-	${package_builddir}/ndbj/NdbColumn\$Type.class \
-	${package_builddir}/ndbj/NdbTransaction\$ExecutionState.class \
-	${package_builddir}/ndbj/NdbError\$Status\$SwigNext.class \
-	${package_builddir}/ndbj/NdbError\$Classification.class \
-	${package_builddir}/ndbj/NdbObject\$Type\$SwigNext.class \
-	${package_builddir}/ndbj/NdbObject\$Store.class \
-	${package_builddir}/ndbj/NdbBlob\$State.class \
-	${package_builddir}/ndbj/NdbScanFilter\$Group.class \
-	${package_builddir}/ndbj/NdbScanFilter\$BinaryCondition.class \
-	${package_builddir}/ndbj/NdbBlobImpl\$State\$SwigNext.class \
-	${package_builddir}/ndbj/NdbBlobImpl\$State.class \
-	${package_builddir}/ndbj/NdbScanFilterRef\$Group\$SwigNext.class \
-	${package_builddir}/ndbj/NdbScanFilterRef\$Group.class \
-	${package_builddir}/ndbj/NdbScanFilterRef\$BinaryCondition\$SwigNext.class \
-	${package_builddir}/ndbj/NdbScanFilterRef\$BinaryCondition.class \
-	${package_builddir}/ndbj/NdbEvent\$TableEvent\$SwigNext.class \
-	${package_builddir}/ndbj/NdbEvent\$TableEvent.class \
-	${package_builddir}/ndbj/NdbEvent\$EventDurability\$SwigNext.class \
-	${package_builddir}/ndbj/NdbEvent\$EventDurability.class \
-	${package_builddir}/ndbj/NdbEvent\$EventReport\$SwigNext.class \
-	${package_builddir}/ndbj/NdbEvent\$EventReport.class \
-	${package_builddir}/ndbj/NdbEventOperation\$State\$SwigNext.class \
-	${package_builddir}/ndbj/NdbEventOperation\$State.class \
-	${package_builddir}/ndbj/NdbOperationImpl\$LockMode.class \
-	${package_builddir}/ndbj/NdbIndexScanOperationImpl\$BoundType.class \
-	${package_builddir}/ndbj/NdbIndex\$Type\$SwigNext.class \
-	${package_builddir}/ndbj/NdbOperationImpl\$Type.class \
-	${package_builddir}/ndbj/NdbIndexScanOperationImpl\$BoundType\$SwigNext.class \
-	${package_builddir}/ndbj/NdbScanOperationImpl\$ScanFlag.class \
-	${package_builddir}/ndbj/NotImplementedException\$AsSQLException.class \
-	${package_builddir}/ndbj/NdbIndex\$Type.class \
-	${package_builddir}/ndbj/NdbOperationImpl\$LockMode\$SwigNext.class \
-	${package_builddir}/ndbj/NdbEventOperationImpl\$State.class \
-	${package_builddir}/ndbj/NdbOperationImpl\$Type\$SwigNext.class \
-	${package_builddir}/ndbj/NdbScanOperationImpl\$ScanFlag\$SwigNext.class \
-	${package_builddir}/ndbj/NdbEventOperationImpl\$State\$SwigNext.class \
 	${builddir}/testsuite/BaseNdbjTestCase.class \
 	${builddir}/testsuite/BaseTestCase.class \
 	${builddir}/testsuite/TestCallback.class \
@@ -376,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 320: Fixed the jar problem for real this time. in http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/develMonty Taylor4 Dec