List:NDB Connectors« Previous MessageNext Message »
From:Monty Taylor Date:November 16 2007 5:02am
Subject:Rev 256: Aded mgmj classes to Makefile.am 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: 256
revision-id: mtaylor@stripped
parent: mtaylor@stripped
committer: Monty Taylor <mtaylor@stripped>
branch nick: devel
timestamp: Thu 2007-11-15 21:01:53 -0800
message:
  Aded mgmj classes to Makefile.am
added:
  java/.classpath                classpath-20071116042946-npnq9g3hwm24x1ga-1
modified:
  java/Makefile.am               makefile.am-20070415032352-9dpe6aurqcnuwcrd-1
=== added file 'java/.classpath'
--- a/java/.classpath	1970-01-01 00:00:00 +0000
+++ b/java/.classpath	2007-11-16 05:01:53 +0000
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry excluding="junit/|lib/" kind="src" path="">
+		<attributes>
+			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY"
value="ndbj-devel/.libs"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="lib/mysql-connector-java-5.0.4-bin.jar"/>
+	<classpathentry kind="lib" path="/usr/share/java/junit.jar"/>
+	<classpathentry kind="lib" path="/usr/lib/jvm/java-1.5.0-sun/jre/lib/rt.jar"/>
+	<classpathentry kind="output" path=""/>
+</classpath>

=== modified file 'java/Makefile.am'
--- a/java/Makefile.am	2007-11-16 04:28:11 +0000
+++ b/java/Makefile.am	2007-11-16 05:01:53 +0000
@@ -26,14 +26,14 @@
 	${package_builddir}/ndbj/NdbTransactionImpl.java
 NDBAPI_BUILT_SRC = ${builddir}/ndbj.cxx $(NDBAPI_BUILT_J)
 
-MGMAPI_BUILT_J = ${package_builddir}/mgmj/mgmj.java
+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/NdbMgmLogeventManager.java \
+      	${package_builddir}/mgmj/NdbLogEventManager.java \
       	${package_builddir}/mgmj/ClusterState.java \
       	${package_builddir}/mgmj/NdbMgm.java \
       	${package_builddir}/mgmj/NdbMgmFactory.java \
@@ -64,8 +64,8 @@
 MGMAPI_SWIG_SRC = ${srcdir}/mgmj.i $(SWIG_MGM_SOURCES)
 CLEANFILES = $(BUILT_SOURCES) ${builddir}/*class ${builddir}/*log ${builddir}/ndbj.jar
${builddir}/ndbj.h ${builddir}/mgmj.h ${package_builddir}/ndbj/*class
${package_builddir}/mgmj/*class testsuite/*class testsuite/ndbj/*class 
${package_builddir}/ndbj/*Ref.java ${package_builddir}/examples
 
-MGM_JAVA_SRC = ${package_srcdir}/mgmj/MgmApiException.java 
-NDB_JAVA_SRC = $(package_srcdir)/ndbj/BaseCallback.java \
+MGMAPI_JAVA_SRC = ${package_srcdir}/mgmj/MgmApiException.java 
+NDBAPI_JAVA_SRC = $(package_srcdir)/ndbj/BaseCallback.java \
 	${package_srcdir}/ndbj/BlobUndefinedException.java \
 	${package_srcdir}/ndbj/INdbEventCallable.java \
 	${package_srcdir}/ndbj/MgmApiException.java \
@@ -146,7 +146,7 @@
 	${srcdir}/testsuite/ndbj/SelectCountTest.java \
 	${srcdir}/testsuite/ndbj/Utf8InsertReadTest.java \
 	${srcdir}/testsuite/ndbj/OutOfConnectionProblemTest.java
-NDB_JAVA_CLASSES = $(package_builddir)/ndbj/BaseCallback.class \
+NDBAPI_JAVA_CLASSES = $(package_builddir)/ndbj/BaseCallback.class \
 	${package_builddir}/ndbj/BlobUndefinedException.class \
 	${package_builddir}/ndbj/INdbEventCallable.class \
 	${package_builddir}/ndbj/MgmApiException.class \
@@ -226,8 +226,64 @@
 	${builddir}/testsuite/ndbj/QuickBFTest.class \
 	${builddir}/testsuite/ndbj/SelectCountTest.class \
 	${builddir}/testsuite/ndbj/Utf8InsertReadTest.class \
-	${builddir}/testsuite/ndbj/OutOfConnectionProblemTest.class
-EXTRA_DIST = lib build.xml ndbj.props.in ndbj.i mgmj.i swig $(NDB_JAVA_SRC)
$(MGM_JAVA_SRC) 
+	${builddir}/testsuite/ndbj/OutOfConnectionProblemTest.class \
+	${package_builddir}/ndbj/ndbj.class \
+	${package_builddir}/ndbj/ndbjConstants.class \
+	${package_builddir}/ndbj/ndbjJNI.class \
+	${package_builddir}/ndbj/NdbRecAttrImpl.class \
+	${package_builddir}/ndbj/NdbColumn.class \
+	${package_builddir}/ndbj/AbortOption.class \
+	${package_builddir}/ndbj/ExecType.class  \
+	${package_builddir}/ndbj/NdbDictionary.class \
+	${package_builddir}/ndbj/NdbEvent.class \
+	${package_builddir}/ndbj/NdbIndex.class \
+	${package_builddir}/ndbj/NdbObject.class \
+	${package_builddir}/ndbj/NdbTable.class \
+	${package_builddir}/ndbj/NdbError.class \
+	${package_builddir}/ndbj/NdbBlobImpl.class \
+	${package_builddir}/ndbj/NdbClusterConnectionImpl.class \
+	${package_builddir}/ndbj/NdbEventOperationImpl.class \
+	${package_builddir}/ndbj/NdbImpl.class \
+	${package_builddir}/ndbj/NdbIndexOperationImpl.class \
+	${package_builddir}/ndbj/NdbIndexScanOperationImpl.class \
+	${package_builddir}/ndbj/NdbOperationImpl.class \
+	${package_builddir}/ndbj/NdbScanOperationImpl.class \
+	${package_builddir}/ndbj/NdbTransactionImpl.class
+
+MGMAPI_JAVA_CLASSES = ${package_builddir}/mgmj/mgmj.class \
+      	${package_builddir}/mgmj/mgmjJNI.class \
+      	${package_builddir}/mgmj/mgmjConstants.class \
+      	${package_builddir}/mgmj/NdbLogEvent.class \
+      	${package_builddir}/mgmj/NdbLogEventType.class \
+      	${package_builddir}/mgmj/NdbMgmEventCategory.class \
+      	${package_builddir}/mgmj/NdbMgmEventSeverity.class \
+      	${package_builddir}/mgmj/NdbLogEventManager.class \
+      	${package_builddir}/mgmj/ClusterState.class \
+      	${package_builddir}/mgmj/NdbMgm.class \
+      	${package_builddir}/mgmj/NdbMgmFactory.class \
+      	${package_builddir}/mgmj/NdbMgmError.class \
+      	${package_builddir}/mgmj/NdbMgmReply.class \
+      	${package_builddir}/mgmj/NodeState.class \
+      	${package_builddir}/mgmj/NodeStatus.class \
+      	${package_builddir}/mgmj/NodeType.class \
+      	${package_builddir}/mgmj/NdbMgmLoglevel.class \
+      	${package_builddir}/mgmj/NdbMgmSeverity.class \
+      	${package_builddir}/mgmj/BackupAborted.class \
+      	${package_builddir}/mgmj/BaseEvent.class \
+      	${package_builddir}/mgmj/CommunicationClosed.class \
+      	${package_builddir}/mgmj/CommunicationOpened.class \
+      	${package_builddir}/mgmj/Connected.class \
+      	${package_builddir}/mgmj/ConnectedApiVersion.class \
+      	${package_builddir}/mgmj/Disconnected.class \
+      	${package_builddir}/mgmj/NdbFilterItem.class \
+      	${package_builddir}/mgmj/NdbFilterList.class \
+      	${package_builddir}/mgmj/NdbLogEventCategoryListener.class \
+      	${package_builddir}/mgmj/NdbLogEventListener.class \
+      	${package_builddir}/mgmj/NdbLogEventManager.class \
+      	${package_builddir}/mgmj/NdbLogEventTypeListener.class  \
+	${package_builddir}/mgmj/MgmApiException.class
+
+EXTRA_DIST = lib build.xml ndbj.props.in ndbj.i mgmj.i swig $(NDBAPI_JAVA_SRC)
$(MGMAPI_JAVA_SRC) 
 
 lib_LTLIBRARIES = libndbj.la libmgmj.la
 nodist_libndbj_la_SOURCES = ndbj.cxx
@@ -264,6 +320,8 @@
 	@mkdir -p ${package_builddir}/$*
 	$(SWIG) -java -outdir ${builddir}/${package_namespace}/$* -package `echo
${package_namespace}/$* | sed 's,/,.,g'` -I$(SWIG_DIR) -I${srcdir}/swig $(MYSQL_INCLUDES)
$(DEFAULT_INCLUDES) -o $@ $<
 
-ndbj.jar: libndbj.la libmgmj.la $(NDB_JAVA_CLASSES)
-	$(JAR) cvf $@ $(NDB_JAVA_CLASSES) $(package_builddir)/ndbj/*class 
+# $(NDBAPI_JAVA_CLASSES) $(MGMAPI_JAVA_CLASSES)
+ndbj.jar: libndbj.la libmgmj.la $(NDBAPI_JAVA_SRC) $(MGMAPI_JAVA_SRC) $(NDBAPI_BUILT_J)
$(MGMAPI_BUILT_J)
+	$(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) $(MGMAPI_JAVA_SRC)
$(NDBAPI_BUILT_J) $(MGMAPI_BUILT_J)
+	$(JAR) cvf $@ $(NDBAPI_JAVA_CLASSES) $(MGMAPI_JAVA_CLASSES)
#$(package_builddir)/ndbj/*class 
 

Thread
Rev 256: Aded mgmj classes to Makefile.am in http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/develMonty Taylor16 Nov