At http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/telco-6.3
------------------------------------------------------------
revno: 228
revision-id: mtaylor@stripped
parent: mtaylor@stripped
parent: mtaylor@stripped
committer: Monty Taylor <mtaylor@stripped>
branch nick: telco-6.3
timestamp: Thu 2007-11-15 21:46:57 -0800
message:
Merge build changes from devel. Bumped version number to 5.6.3.5
removed:
java/.classpath classpath-20070521182648-uuhans84tln3f4b6-2
added:
java/.classpath classpath-20071116042946-npnq9g3hwm24x1ga-1
modified:
Makefile.am makefile.am-20070228020914-u2pk759xg7thauwf-4
acinclude.m4 acinclude.m4-20070228020914-u2pk759xg7thauwf-8
configure.in configure.in-20070228020914-u2pk759xg7thauwf-13
java/Makefile.am makefile.am-20070415032352-9dpe6aurqcnuwcrd-1
java/build.xml build.xml-20070521233115-yg3ylf2k3vuzr27o-1
perl/Makefile.am makefile.am-20070228070325-lv4v4ey3018yr147-1
php/Makefile.am makefile.am-20070414230657-agiyu1zcqcr6ugkn-2
php/ndbapi.i ndbapi.i-20070414230657-agiyu1zcqcr6ugkn-1
swig/Makefile.am makefile.am-20071104211339-fod7yzi8t7xd3g0w-3
swig/SWIG/Source/Makefile.am makefile.am-20071104211339-fod7yzi8t7xd3g0w-108
------------------------------------------------------------
revno: 192.1.25.1.40
revision-id: mtaylor@stripped
parent: mtaylor@stripped
committer: Monty Taylor <mtaylor@stripped>
branch nick: devel
timestamp: Thu 2007-11-15 21:43:29 -0800
message:
make dist works, and make distcheck works for Java at least.
modified:
configure.in configure.in-20070228020914-u2pk759xg7thauwf-13
swig/Makefile.am makefile.am-20071104211339-fod7yzi8t7xd3g0w-3
swig/SWIG/Source/Makefile.am makefile.am-20071104211339-fod7yzi8t7xd3g0w-108
------------------------------------------------------------
revno: 192.1.25.1.39
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
------------------------------------------------------------
revno: 192.1.25.1.38
revision-id: mtaylor@stripped
parent: mtaylor@stripped
committer: Monty Taylor <mtaylor@stripped>
branch nick: devel
timestamp: Thu 2007-11-15 20:28:11 -0800
message:
Fixed java dir to build with automake and work with VPATH builds.
removed:
java/.classpath classpath-20070521182648-uuhans84tln3f4b6-2
modified:
acinclude.m4 acinclude.m4-20070228020914-u2pk759xg7thauwf-8
configure.in configure.in-20070228020914-u2pk759xg7thauwf-13
java/Makefile.am makefile.am-20070415032352-9dpe6aurqcnuwcrd-1
java/build.xml build.xml-20070521233115-yg3ylf2k3vuzr27o-1
------------------------------------------------------------
revno: 192.1.25.1.37
revision-id: mtaylor@stripped
parent: mtaylor@stripped
committer: Monty Taylor <mtaylor@stripped>
branch nick: devel
timestamp: Thu 2007-11-15 15:22:16 -0800
message:
Various fixes to make make dist and make distcheck. Still not there, but I'm about
to start a large sub-portion and wanted to get this committed.
modified:
Makefile.am makefile.am-20070228020914-u2pk759xg7thauwf-4
configure.in configure.in-20070228020914-u2pk759xg7thauwf-13
java/Makefile.am makefile.am-20070415032352-9dpe6aurqcnuwcrd-1
perl/Makefile.am makefile.am-20070228070325-lv4v4ey3018yr147-1
php/Makefile.am makefile.am-20070414230657-agiyu1zcqcr6ugkn-2
php/ndbapi.i ndbapi.i-20070414230657-agiyu1zcqcr6ugkn-1
swig/Makefile.am makefile.am-20071104211339-fod7yzi8t7xd3g0w-3
swig/SWIG/Source/Makefile.am makefile.am-20071104211339-fod7yzi8t7xd3g0w-108
=== removed file 'java/.classpath'
--- a/java/.classpath 2007-11-09 08:41:43 +0000
+++ b/java/.classpath 1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-<?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-telco-6.3/.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>
=== added file 'java/.classpath'
--- a/java/.classpath 1970-01-01 00:00:00 +0000
+++ b/java/.classpath 2007-11-16 05:46:57 +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-telco-6.3/.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 'Makefile.am'
--- a/Makefile.am 2007-11-05 18:12:57 +0000
+++ b/Makefile.am 2007-11-15 23:22:16 +0000
@@ -21,7 +21,8 @@
if BUILD_PHP_SUBDIR
d_php = php
endif
-SUBDIRS = swig $(d_java) $(d_python) $(d_perl) $(d_csharp) $(d_ruby) $(d_php) $(d_lua)
+SUBDIRS = swig $(d_java) $(d_python) $(d_perl) $(d_csharp) $(d_ruby) $(d_php) $(d_lua)
+EXTRA_DIST = testndbapi interface
distclean-local:
rm -fr autom4te.cache
=== modified file 'acinclude.m4'
--- a/acinclude.m4 2007-11-14 18:07:16 +0000
+++ b/acinclude.m4 2007-11-16 04:28:11 +0000
@@ -98,7 +98,7 @@
[AS_HELP_STRING([--with-perl],
[BULD NDB/Perl @<:@default=yes@:>@])],
[with_perl=$withval],
- [with_perl=perl])
+ [with_perl=no])
AS_IF([test "x$with_perl" != "xno"],[
=== modified file 'configure.in'
--- a/configure.in 2007-11-09 10:42:28 +0000
+++ b/configure.in 2007-11-16 05:46:57 +0000
@@ -1,4 +1,4 @@
-AC_INIT([ndb], [0.5.0])
+AC_INIT([ndb-connectors], [5.6.3.5])
AC_CONFIG_AUX_DIR([.])
AM_INIT_AUTOMAKE
AM_CONFIG_HEADER(config.h)
@@ -35,7 +35,7 @@
fi
-SWIG_LIB="\${top_builddir}/swig/SWIG/Lib"
+SWIG_LIB="\${top_srcdir}/swig/SWIG/Lib"
SWIG="SWIG_LIB=${SWIG_LIB} \${top_builddir}/swig/SWIG/swig -c++"
AC_SUBST(SWIG)
AC_SUBST(SWIG_LIB)
=== modified file 'java/Makefile.am'
--- a/java/Makefile.am 2007-11-06 22:59:00 +0000
+++ b/java/Makefile.am 2007-11-16 05:01:53 +0000
@@ -1,39 +1,327 @@
-package_namespace = com/mysql/cluster
-ndbapi_examples_dir = $(package_namespace)/ndbapi/examples
-NDBAPI_BUILT_SRC = ndbj.cxx
-MGMAPI_BUILT_SRC = mgmj.cxx
+package_namespace=com/mysql/cluster
+package_builddir=$(builddir)/$(package_namespace)
+package_srcdir=$(srcdir)/$(package_namespace)
+ndbapi_examples_dir=$(package_namespace)/ndbapi/examples
+NDBAPI_BUILT_J = ${package_builddir}/ndbj/ndbj.java \
+ ${package_builddir}/ndbj/ndbjConstants.java \
+ ${package_builddir}/ndbj/ndbjJNI.java \
+ ${package_builddir}/ndbj/NdbRecAttrImpl.java \
+ ${package_builddir}/ndbj/NdbColumn.java \
+ ${package_builddir}/ndbj/AbortOption.java \
+ ${package_builddir}/ndbj/ExecType.java \
+ ${package_builddir}/ndbj/NdbDictionary.java \
+ ${package_builddir}/ndbj/NdbEvent.java \
+ ${package_builddir}/ndbj/NdbIndex.java \
+ ${package_builddir}/ndbj/NdbObject.java \
+ ${package_builddir}/ndbj/NdbTable.java \
+ ${package_builddir}/ndbj/NdbError.java \
+ ${package_builddir}/ndbj/NdbBlobImpl.java \
+ ${package_builddir}/ndbj/NdbClusterConnectionImpl.java \
+ ${package_builddir}/ndbj/NdbEventOperationImpl.java \
+ ${package_builddir}/ndbj/NdbImpl.java \
+ ${package_builddir}/ndbj/NdbIndexOperationImpl.java \
+ ${package_builddir}/ndbj/NdbIndexScanOperationImpl.java \
+ ${package_builddir}/ndbj/NdbOperationImpl.java \
+ ${package_builddir}/ndbj/NdbScanOperationImpl.java \
+ ${package_builddir}/ndbj/NdbTransactionImpl.java
+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/BackupAborted.java \
+ ${package_builddir}/mgmj/BaseEvent.java \
+ ${package_builddir}/mgmj/CommunicationClosed.java \
+ ${package_builddir}/mgmj/CommunicationOpened.java \
+ ${package_builddir}/mgmj/Connected.java \
+ ${package_builddir}/mgmj/ConnectedApiVersion.java \
+ ${package_builddir}/mgmj/Disconnected.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
+
+MGMAPI_BUILT_SRC = ${builddir}/mgmj.cxx $(MGMAPI_BUILT_J)
BUILT_SOURCES = $(NDBAPI_BUILT_SRC) $(MGMAPI_BUILT_SRC)
-NDBAPI_SWIG_SRC = ndbj.i $(SWIG_NDB_SOURCES)
-MGMAPI_SWIG_SRC = mgmj.i $(SWIG_MGM_SOURCES)
-CLEANFILES = $(BUILT_SOURCES) *class *log ndbj.jar ndbj.h mgmj.h
+NDBAPI_SWIG_SRC = ${srcdir}/ndbj.i $(SWIG_NDB_SOURCES)
+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
+
+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 \
+ ${package_srcdir}/ndbj/Ndb.java \
+ ${package_srcdir}/ndbj/NdbApiException.java \
+ ${package_srcdir}/ndbj/NdbApiPermanentException.java \
+ ${package_srcdir}/ndbj/NdbApiRuntimeException.java \
+ ${package_srcdir}/ndbj/NdbApiTemporaryException.java \
+ ${package_srcdir}/ndbj/NdbApiTimeStampOutOfBoundsException.java \
+ ${package_srcdir}/ndbj/NdbApiUserErrorPermanentException.java \
+ ${package_srcdir}/ndbj/NdbBaseOperation.java \
+ ${package_srcdir}/ndbj/NdbBaseOperationEquals.java \
+ ${package_srcdir}/ndbj/NdbBlob.java \
+ ${package_srcdir}/ndbj/NdbClusterConnection.java \
+ ${package_srcdir}/ndbj/NdbClusterConnectionPermanentException.java \
+ ${package_srcdir}/ndbj/NdbClusterConnectionTemporaryException.java \
+ ${package_srcdir}/ndbj/NdbErrorNotAvailable.java \
+ ${package_srcdir}/ndbj/NdbEventOperation.java \
+ ${package_srcdir}/ndbj/NdbEventOperationResults.java \
+ ${package_srcdir}/ndbj/NdbEventOperationResultsImpl.java \
+ ${package_srcdir}/ndbj/NdbFactory.java \
+ ${package_srcdir}/ndbj/NdbIndexOperation.java \
+ ${package_srcdir}/ndbj/NdbIndexScanOperation.java \
+ ${package_srcdir}/ndbj/NdbInterpretedOperation.java \
+ ${package_srcdir}/ndbj/NdbOperation.java \
+ ${package_srcdir}/ndbj/NdbOperationResults.java \
+ ${package_srcdir}/ndbj/NdbOperationResultsImpl.java \
+ ${package_srcdir}/ndbj/NdbRecAttr.java \
+ ${package_srcdir}/ndbj/NdbResultSet.java \
+ ${package_srcdir}/ndbj/NdbResultSetImpl.java \
+ ${package_srcdir}/ndbj/NdbScanFilter.java \
+ ${package_srcdir}/ndbj/NdbScanFilterImpl.java \
+ ${package_srcdir}/ndbj/NdbScanOperation.java \
+ ${package_srcdir}/ndbj/NdbTransaction.java \
+ ${package_srcdir}/ndbj/NoSuchColumnException.java \
+ ${package_srcdir}/ndbj/NoSuchIndexException.java \
+ ${package_srcdir}/ndbj/NoSuchTableException.java \
+ ${package_srcdir}/ndbj/examples/CRUDandScan.java \
+ ${package_srcdir}/ndbj/examples/DeleteUsingPrimaryKey.java \
+ ${package_srcdir}/ndbj/examples/ExamplesConfigurator.java \
+ ${package_srcdir}/ndbj/examples/HelloWorldInsert.java \
+ ${package_srcdir}/ndbj/examples/InsertUsingPrimaryKey.java \
+ ${package_srcdir}/ndbj/examples/JoinUsingScanAndIndexScan.java \
+ ${package_srcdir}/ndbj/examples/PrimaryKeyBatchOps.java \
+ ${package_srcdir}/ndbj/examples/PrimaryKeyOpBlob.java \
+ ${package_srcdir}/ndbj/examples/ReadRowsUsingTableScan.java \
+ ${package_srcdir}/ndbj/examples/ReadUsingOrderedIndexOnPK.java \
+ ${package_srcdir}/ndbj/examples/ReadUsingPrimaryKey.java \
+ ${package_srcdir}/ndbj/examples/RetryTransaction.java \
+ ${package_srcdir}/ndbj/examples/TestAsync.java \
+ ${package_srcdir}/ndbj/examples/TestBaseCallback.java \
+ ${package_srcdir}/ndbj/examples/TestEvent.java \
+ ${package_srcdir}/ndbj/examples/UpdateUsingPrimaryKey.java \
+ ${package_srcdir}/ndbj/util/NdbConfigurator.java \
+ ${srcdir}/testsuite/BaseNdbjTestCase.java \
+ ${srcdir}/testsuite/BaseTestCase.java \
+ ${srcdir}/testsuite/TestCallback.java \
+ ${srcdir}/testsuite/ndbj/BasicTest.java \
+ ${srcdir}/testsuite/ndbj/ImmediatePollTimeoutTest.java \
+ ${srcdir}/testsuite/ndbj/InsertRetryTest.java \
+ ${srcdir}/testsuite/ndbj/Latin1InsertReadTest.java \
+ ${srcdir}/testsuite/ndbj/MultiPartPrimaryKeyStringTest.java \
+ ${srcdir}/testsuite/ndbj/MultipleAsyncTest.java \
+ ${srcdir}/testsuite/ndbj/NdbBlobTest.java \
+ ${srcdir}/testsuite/ndbj/NdbIndexScanOperationUtf8Latin1Test.java \
+ ${srcdir}/testsuite/ndbj/NdbOperationByteLongTest.java \
+ ${srcdir}/testsuite/ndbj/NdbOperationIDTest.java \
+ ${srcdir}/testsuite/ndbj/NdbOperationMultiPartPrimaryKeyTest.java \
+ ${srcdir}/testsuite/ndbj/NdbOperationTest.java \
+ ${srcdir}/testsuite/ndbj/NdbOperationsFailedTest.java \
+ ${srcdir}/testsuite/ndbj/NdbScanFilterTest.java \
+ ${srcdir}/testsuite/ndbj/NdbScanTest.java \
+ ${srcdir}/testsuite/ndbj/NdbTest.java \
+ ${srcdir}/testsuite/ndbj/NullSetTest.java \
+ ${srcdir}/testsuite/ndbj/OrderedIndexScanTest.java \
+ ${srcdir}/testsuite/ndbj/QuickAsyncTest.java \
+ ${srcdir}/testsuite/ndbj/QuickBFTest.java \
+ ${srcdir}/testsuite/ndbj/SelectCountTest.java \
+ ${srcdir}/testsuite/ndbj/Utf8InsertReadTest.java \
+ ${srcdir}/testsuite/ndbj/OutOfConnectionProblemTest.java
+NDBAPI_JAVA_CLASSES = $(package_builddir)/ndbj/BaseCallback.class \
+ ${package_builddir}/ndbj/BlobUndefinedException.class \
+ ${package_builddir}/ndbj/INdbEventCallable.class \
+ ${package_builddir}/ndbj/MgmApiException.class \
+ ${package_builddir}/ndbj/Ndb.class \
+ ${package_builddir}/ndbj/NdbApiException.class \
+ ${package_builddir}/ndbj/NdbApiPermanentException.class \
+ ${package_builddir}/ndbj/NdbApiRuntimeException.class \
+ ${package_builddir}/ndbj/NdbApiTemporaryException.class \
+ ${package_builddir}/ndbj/NdbApiTimeStampOutOfBoundsException.class \
+ ${package_builddir}/ndbj/NdbApiUserErrorPermanentException.class \
+ ${package_builddir}/ndbj/NdbBaseOperation.class \
+ ${package_builddir}/ndbj/NdbBaseOperationEquals.class \
+ ${package_builddir}/ndbj/NdbBlob.class \
+ ${package_builddir}/ndbj/NdbClusterConnection.class \
+ ${package_builddir}/ndbj/NdbClusterConnectionPermanentException.class \
+ ${package_builddir}/ndbj/NdbClusterConnectionTemporaryException.class \
+ ${package_builddir}/ndbj/NdbErrorNotAvailable.class \
+ ${package_builddir}/ndbj/NdbEventOperation.class \
+ ${package_builddir}/ndbj/NdbEventOperationResults.class \
+ ${package_builddir}/ndbj/NdbEventOperationResultsImpl.class \
+ ${package_builddir}/ndbj/NdbFactory.class \
+ ${package_builddir}/ndbj/NdbIndexOperation.class \
+ ${package_builddir}/ndbj/NdbIndexScanOperation.class \
+ ${package_builddir}/ndbj/NdbInterpretedOperation.class \
+ ${package_builddir}/ndbj/NdbOperation.class \
+ ${package_builddir}/ndbj/NdbOperationResults.class \
+ ${package_builddir}/ndbj/NdbOperationResultsImpl.class \
+ ${package_builddir}/ndbj/NdbRecAttr.class \
+ ${package_builddir}/ndbj/NdbResultSet.class \
+ ${package_builddir}/ndbj/NdbResultSetImpl.class \
+ ${package_builddir}/ndbj/NdbScanFilter.class \
+ ${package_builddir}/ndbj/NdbScanFilterImpl.class \
+ ${package_builddir}/ndbj/NdbScanOperation.class \
+ ${package_builddir}/ndbj/NdbTransaction.class \
+ ${package_builddir}/ndbj/NoSuchColumnException.class \
+ ${package_builddir}/ndbj/NoSuchIndexException.class \
+ ${package_builddir}/ndbj/NoSuchTableException.class \
+ ${package_builddir}/ndbj/examples/CRUDandScan.class \
+ ${package_builddir}/ndbj/examples/DeleteUsingPrimaryKey.class \
+ ${package_builddir}/ndbj/examples/ExamplesConfigurator.class \
+ ${package_builddir}/ndbj/examples/HelloWorldInsert.class \
+ ${package_builddir}/ndbj/examples/InsertUsingPrimaryKey.class \
+ ${package_builddir}/ndbj/examples/JoinUsingScanAndIndexScan.class \
+ ${package_builddir}/ndbj/examples/PrimaryKeyBatchOps.class \
+ ${package_builddir}/ndbj/examples/PrimaryKeyOpBlob.class \
+ ${package_builddir}/ndbj/examples/ReadRowsUsingTableScan.class \
+ ${package_builddir}/ndbj/examples/ReadUsingOrderedIndexOnPK.class \
+ ${package_builddir}/ndbj/examples/ReadUsingPrimaryKey.class \
+ ${package_builddir}/ndbj/examples/RetryTransaction.class \
+ ${package_builddir}/ndbj/examples/TestAsync.class \
+ ${package_builddir}/ndbj/examples/TestBaseCallback.class \
+ ${package_builddir}/ndbj/examples/TestEvent.class \
+ ${package_builddir}/ndbj/examples/UpdateUsingPrimaryKey.class \
+ ${package_builddir}/ndbj/util/NdbConfigurator.class \
+ ${builddir}/testsuite/BaseNdbjTestCase.class \
+ ${builddir}/testsuite/BaseTestCase.class \
+ ${builddir}/testsuite/TestCallback.class \
+ ${builddir}/testsuite/ndbj/BasicTest.class \
+ ${builddir}/testsuite/ndbj/ImmediatePollTimeoutTest.class \
+ ${builddir}/testsuite/ndbj/InsertRetryTest.class \
+ ${builddir}/testsuite/ndbj/Latin1InsertReadTest.class \
+ ${builddir}/testsuite/ndbj/MultiPartPrimaryKeyStringTest.class \
+ ${builddir}/testsuite/ndbj/MultipleAsyncTest.class \
+ ${builddir}/testsuite/ndbj/NdbBlobTest.class \
+ ${builddir}/testsuite/ndbj/NdbIndexScanOperationUtf8Latin1Test.class \
+ ${builddir}/testsuite/ndbj/NdbOperationByteLongTest.class \
+ ${builddir}/testsuite/ndbj/NdbOperationIDTest.class \
+ ${builddir}/testsuite/ndbj/NdbOperationMultiPartPrimaryKeyTest.class \
+ ${builddir}/testsuite/ndbj/NdbOperationTest.class \
+ ${builddir}/testsuite/ndbj/NdbOperationsFailedTest.class \
+ ${builddir}/testsuite/ndbj/NdbScanFilterTest.class \
+ ${builddir}/testsuite/ndbj/NdbScanTest.class \
+ ${builddir}/testsuite/ndbj/NdbTest.class \
+ ${builddir}/testsuite/ndbj/NullSetTest.class \
+ ${builddir}/testsuite/ndbj/OrderedIndexScanTest.class \
+ ${builddir}/testsuite/ndbj/QuickAsyncTest.class \
+ ${builddir}/testsuite/ndbj/QuickBFTest.class \
+ ${builddir}/testsuite/ndbj/SelectCountTest.class \
+ ${builddir}/testsuite/ndbj/Utf8InsertReadTest.class \
+ ${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
-libndbj_la_SOURCES = ndbj.cxx
+nodist_libndbj_la_SOURCES = ndbj.cxx
libndbj_la_LIBADD = -lstdc++
libndbj_la_LDFLAGS = -fPIC
libndbj_la_CPPFLAGS = $(JAVA_CXXFLAGS) $(PTHREAD_CFLAGS) -fPIC
-libmgmj_la_SOURCES = mgmj.cxx
+nodist_libmgmj_la_SOURCES = mgmj.cxx
libmgmj_la_CPPFLAGS = $(JAVA_CXXFLAGS) $(PTHREAD_CFLAGS) -fPIC
all-local: ndbj.jar
clean-local:
- $(ANT) clean
- @rm swig-stamp
+ @rm -f swig-stamp
SUFFIXES = .cxx .i
-swig-stamp:
- ( cd $(top_srcdir)/swig && $(MAKE) $(AM_MAKEFLAGS) )
- touch swig-stamp
-
-ndbj.cxx: swig-stamp ${NDBAPI_SWIG_SRC}
-
-mgmj.cxx: swig-stamp ${MGMAPI_SWIG_SRC}
-
-.i.cxx: swig-stamp
- $(SWIG) -java -outdir ${package_namespace}/$* -package `echo ${package_namespace}/$* |
sed 's,/,.,g'` -I$(SWIG_DIR) -I./swig $(MYSQL_INCLUDES) $(DEFAULT_INCLUDES) -o $@ $<
-
-ndbj.jar: libndbj.la libmgmj.la
- $(ANT) build-jar
+${NDBAPI_BUILT_J}: ndbj.cxx
+
+${MGMAPI_BUILT_J}: mgmj.cxx
+
+#swig-stamp:
+# ( cd $(top_builddir)/swig && $(MAKE) $(AM_MAKEFLAGS) )
+# touch swig-stamp
+
+ndbj.cxx: ${NDBAPI_SWIG_SRC}
+
+mgmj.cxx: ${MGMAPI_SWIG_SRC}
+
+.java.class:
+ @mkdir -p `dirname $*`
+ $(JAVAC) -classpath
$(srcdir):$(srcdir)/lib/mysql-connector-java-5.0.4-bin.jar:$(srcdir)/lib/junit.jar
-sourcepath $(srcdir):$(builddir) -d $(builddir) $<
+
+.i.cxx:
+ @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 $@ $<
+
+# $(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
=== modified file 'java/build.xml'
--- a/java/build.xml 2007-10-31 15:04:37 +0000
+++ b/java/build.xml 2007-11-16 04:28:11 +0000
@@ -28,8 +28,6 @@
<fileset dir="." includes="ndbj.jar"/>
<fileset dir="com/mysql/cluster" includes="**/SWIG*" />
<fileset dir="com/mysql/cluster" includes="**/*Ref*" />
- <fileset dir="com/mysql/cluster/ndbj" includes="ndbj*" />
- <fileset dir="com/mysql/cluster/ndbj" includes="NdbRecAttrImpl*" />
<fileset dir="com/mysql/cluster/mgmj" includes="mgmj*" />
<fileset dir="com/mysql/cluster/mgmj" includes="NdbLogEvent.java" />
<fileset dir="com/mysql/cluster/mgmj" includes="NdbLogEventType.java" />
@@ -46,15 +44,6 @@
<fileset dir="com/mysql/cluster/mgmj" includes="NodeType.java" />
<fileset dir="com/mysql/cluster/mgmj" includes="NdbMgmLoglevel.java" />
<fileset dir="com/mysql/cluster/mgmj" includes="NdbMgmSeverity.java" />
- <fileset dir="com/mysql/cluster/ndbj" includes="NdbColumn.java" />
- <fileset dir="com/mysql/cluster/ndbj" includes="AbortOption.java" />
- <fileset dir="com/mysql/cluster/ndbj" includes="ExecType.java" />
- <fileset dir="com/mysql/cluster/ndbj" includes="NdbDictionary.java" />
- <fileset dir="com/mysql/cluster/ndbj" includes="NdbEvent.java" />
- <fileset dir="com/mysql/cluster/ndbj" includes="NdbIndex.java" />
- <fileset dir="com/mysql/cluster/ndbj" includes="NdbObject.java" />
- <fileset dir="com/mysql/cluster/ndbj" includes="NdbTable.java" />
- <fileset dir="com/mysql/cluster/ndbj" includes="NdbError.java" />
<fileset dir="com/mysql/cluster/mgmj" includes="BackupAborted.java" />
<fileset dir="com/mysql/cluster/mgmj" includes="BaseEvent.java" />
<fileset dir="com/mysql/cluster/mgmj" includes="CommunicationClosed.java" />
@@ -68,16 +57,6 @@
<fileset dir="com/mysql/cluster/mgmj" includes="NdbLogEventListener.java" />
<fileset dir="com/mysql/cluster/mgmj" includes="NdbLogEventManager.java" />
<fileset dir="com/mysql/cluster/mgmj" includes="NdbLogEventTypeListener.java"
/>
- <fileset dir="com/mysql/cluster/ndbj" includes="BaseEventCallback.java" />
- <fileset dir="com/mysql/cluster/ndbj" includes="NdbBlobImpl.java" />
- <fileset dir="com/mysql/cluster/ndbj" includes="NdbClusterConnectionImpl.java"
/>
- <fileset dir="com/mysql/cluster/ndbj" includes="NdbEventOperationImpl.java"
/>
- <fileset dir="com/mysql/cluster/ndbj" includes="NdbImpl.java" />
- <fileset dir="com/mysql/cluster/ndbj" includes="NdbIndexOperationImpl.java"
/>
- <fileset dir="com/mysql/cluster/ndbj" includes="NdbIndexScanOperationImpl.java"
/>
- <fileset dir="com/mysql/cluster/ndbj" includes="NdbOperationImpl.java" />
- <fileset dir="com/mysql/cluster/ndbj" includes="NdbScanOperationImpl.java" />
- <fileset dir="com/mysql/cluster/ndbj" includes="NdbTransactionImpl.java" />
</delete>
<delete dir="javadoc" />
@@ -127,7 +106,7 @@
<classpath refid="NdbConnectors.classpath"/>
</java>
</target>
- <target name="testasync" depends="build">
+ <target name="testasync">
<mkdir dir="${junit.output.dir}"/>
<junit fork="yes" printsummary="withOutAndErr">
<formatter type="xml"/>
=== modified file 'perl/Makefile.am'
--- a/perl/Makefile.am 2007-11-06 22:59:00 +0000
+++ b/perl/Makefile.am 2007-11-15 23:22:16 +0000
@@ -6,7 +6,8 @@
fakedir=$(prefix)
fake_DATA=build-perl-stamp
-EXTRA_DIST=ndbapi.i mgmapi.i
+EXTRA_DIST=ndbapi.i mgmapi.i Makefile.PL ndbapi/Makefile.PL \
+ mgmapi/Makefile.PL async.pl blob.pl test.pl swig
CLEANFILES=$(PERL_CRUFT) ${SWIG_OUTPUTS}
MAINTAINERCLEANFILES=
=== modified file 'php/Makefile.am'
--- a/php/Makefile.am 2007-04-27 05:48:34 +0000
+++ b/php/Makefile.am 2007-11-15 23:22:16 +0000
@@ -1,5 +1,5 @@
BUILT_SOURCES = ndbapi_wrap.cpp php_libndbapi.h libndbapi.php
-SWIG_SRC = ndbapi.i $(SWIG_SOURCES)
+NDBAPI_SWIG_SRC = ndbapi.i $(SWIG_NDB_SOURCES)
libdir = $(PHP_EXTDIR)
lib_LTLIBRARIES = libndbapi.la
@@ -8,8 +8,10 @@
noinst_HEADERS = php_libndbapi.h
-ndbapi_wrap.cpp : $(SWIG_SRC)
- $(SWIG) -php5 -I$(SWIG_DIR) $(MYSQL_INCLUDES) -o $@ $<
+php_libndbapi.h: ndbapi_wrap.cpp
+
+ndbapi_wrap.cpp: $(NDBAPI_SWIG_SRC)
+ $(SWIG) -php5 -I$(SWIG_DIR) $(DEFAULT_INCLUDES) $(MYSQL_INCLUDES) -o $@ $<
distclean-local:
rm -fr $(BUILT_SOURCES)
=== modified file 'php/ndbapi.i'
--- a/php/ndbapi.i 2007-04-27 05:51:26 +0000
+++ b/php/ndbapi.i 2007-11-15 23:22:16 +0000
@@ -39,12 +39,12 @@
return retval; }
%}
-%include "NdbFactory.i"
-%include "NdbClusterConnection.i"
-%include "Ndb.i"
-%include "NdbTransaction.i"
-%include "NdbOperation.i"
-%include "NdbScanOperation.i"
-%include "NdbRecAttr.i"
-%include "NdbError.i"
+%include "ndbapi/NdbFactory.i"
+%include "ndbapi/NdbClusterConnection.i"
+%include "ndbapi/Ndb.i"
+%include "ndbapi/NdbTransaction.i"
+%include "ndbapi/NdbOperation.i"
+%include "ndbapi/NdbScanOperation.i"
+%include "ndbapi/NdbRecAttr.i"
+%include "ndbapi/NdbError.i"
=== modified file 'swig/Makefile.am'
--- a/swig/Makefile.am 2007-11-04 21:32:20 +0000
+++ b/swig/Makefile.am 2007-11-16 05:43:29 +0000
@@ -1,10 +1,30 @@
-all-local:
- cd SWIG && $(MAKE) $(AM_MAKEFLAGS)
-check-local:
- cd SWIG && $(MAKE) $(AM_MAKEFLAGS) test
+all-local:
+ cd $(builddir)/SWIG && $(MAKE) $(AM_MAKEFLAGS)
+check-local:
+ cd $(builddir)/SWIG && true #$(MAKE) $(AM_MAKEFLAGS) check
clean-local:
- cd SWIG && $(MAKE) $(AM_MAKEFLAGS) clean
-
+ cd $(builddir)/SWIG && $(MAKE) $(AM_MAKEFLAGS) clean
+distclean:
+ cd $(builddir)/SWIG && $(MAKE) $(AM_MAKEFLAGS) distclean
+
+dist-hook:
+ mkdir $(distdir)/SWIG
+ for f in `bzr ls --versioned SWIG` ; do tar cfp - $$f | tar xfp - -C $(distdir) ; done
+ cp $(srcdir)/SWIG/configure $(distdir)/SWIG
+ cp $(srcdir)/SWIG/aclocal.m4 $(distdir)/SWIG
+ cp $(srcdir)/SWIG/Source/Makefile.in $(distdir)/SWIG/Source
+ cp $(srcdir)/SWIG/Source/Include/swigconfig.h.in $(distdir)/SWIG/Source/Include
+# cd $(srcdir)/SWIG && [ -f Makefile ] && $(MAKE) $(AM_MAKEFLAGS) clean
|| true
+# cp -a $(srcdir)/SWIG $(distdir)
+
+#$(srcdir)/SWIG/Makefile:
+# cd $(top_builddir) && ./config.status --recheck
+# cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+#distcheck:
+# cd $(srcdir)/SWIG && $(MAKE) $(AM_MAKEFLAGS) distcheck
+
+#dist:
+# cd $(srcdir)/SWIG && $(MAKE) $(AM_MAKEFLAGS) dist
#We don't actually want to install anything
#install-data-local:
# cd subdir && $(MAKE) $(AM_MAKEFLAGS) install-data
@@ -13,3 +33,4 @@
#uninstall-local:
# cd subdir && $(MAKE) $(AM_MAKEFLAGS) uninstall
+#EXTRA_DIST = $(shell bzr ls SWIG)
=== modified file 'swig/SWIG/Source/Makefile.am'
--- a/swig/SWIG/Source/Makefile.am 2007-11-04 21:32:20 +0000
+++ b/swig/SWIG/Source/Makefile.am 2007-11-16 05:43:29 +0000
@@ -99,7 +99,7 @@
# This occurs on each invocation of make and is a step towards providing support for
multiple
# build directories.
all-local: eswig@EXEEXT@
- cp eswig@EXEEXT@ ../swig@EXEEXT@
+ cp -f $(srcdir)/eswig@EXEEXT@ $(builddir)/../swig@EXEEXT@
clean-local:
rm -f ../swig@EXEEXT@
| Thread |
|---|
| • Rev 228: Merge build changes from devel. Bumped version number to 5.6.3.5 in http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/telco-6.3 | Monty Taylor | 16 Nov |
