List:NDB Connectors« Previous MessageNext Message »
From:Monty Taylor Date:November 15 2007 11:22pm
Subject:Rev 254: 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 commit...
View as plain text  
At http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/devel

------------------------------------------------------------
revno: 254
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
=== 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 'configure.in'
--- a/configure.in	2007-11-09 10:42:28 +0000
+++ b/configure.in	2007-11-15 23:22:16 +0000
@@ -1,4 +1,4 @@
-AC_INIT([ndb], [0.5.0])
+AC_INIT([ndb-connectors], [0.5.0])
 AC_CONFIG_AUX_DIR([.])
 AM_INIT_AUTOMAKE
 AM_CONFIG_HEADER(config.h)

=== modified file 'java/Makefile.am'
--- a/java/Makefile.am	2007-11-06 22:59:00 +0000
+++ b/java/Makefile.am	2007-11-15 23:22:16 +0000
@@ -7,33 +7,118 @@
 MGMAPI_SWIG_SRC = mgmj.i $(SWIG_MGM_SOURCES)
 CLEANFILES = $(BUILT_SOURCES) *class *log ndbj.jar ndbj.h mgmj.h
 
+
 lib_LTLIBRARIES = libndbj.la libmgmj.la
 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
+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-stamp:
+#	( cd $(top_builddir)/swig && $(MAKE) $(AM_MAKEFLAGS) )
+#	touch swig-stamp
+
+ndbj.cxx: ${NDBAPI_SWIG_SRC}
+
+mgmj.cxx: ${MGMAPI_SWIG_SRC}
+
+.i.cxx:  
 	$(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
 
+EXTRA_DIST = lib build.xml ndbj.props.in ndbj.i mgmj.i swig \
+com/mysql/cluster/mgmj/MgmApiException.java \
+com/mysql/cluster/ndbj/BaseCallback.java \
+com/mysql/cluster/ndbj/BlobUndefinedException.java \
+com/mysql/cluster/ndbj/INdbEventCallable.java \
+com/mysql/cluster/ndbj/MgmApiException.java \
+com/mysql/cluster/ndbj/Ndb.java \
+com/mysql/cluster/ndbj/NdbApiException.java \
+com/mysql/cluster/ndbj/NdbApiPermanentException.java \
+com/mysql/cluster/ndbj/NdbApiRuntimeException.java \
+com/mysql/cluster/ndbj/NdbApiTemporaryException.java \
+com/mysql/cluster/ndbj/NdbApiTimeStampOutOfBoundsException.java \
+com/mysql/cluster/ndbj/NdbApiUserErrorPermanentException.java \
+com/mysql/cluster/ndbj/NdbBaseOperation.java \
+com/mysql/cluster/ndbj/NdbBaseOperationEquals.java \
+com/mysql/cluster/ndbj/NdbBlob.java \
+com/mysql/cluster/ndbj/NdbClusterConnection.java \
+com/mysql/cluster/ndbj/NdbClusterConnectionPermanentException.java \
+com/mysql/cluster/ndbj/NdbClusterConnectionTemporaryException.java \
+com/mysql/cluster/ndbj/NdbErrorNotAvailable.java \
+com/mysql/cluster/ndbj/NdbEventOperation.java \
+com/mysql/cluster/ndbj/NdbEventOperationResults.java \
+com/mysql/cluster/ndbj/NdbEventOperationResultsImpl.java \
+com/mysql/cluster/ndbj/NdbFactory.java \
+com/mysql/cluster/ndbj/NdbIndexOperation.java \
+com/mysql/cluster/ndbj/NdbIndexScanOperation.java \
+com/mysql/cluster/ndbj/NdbInterpretedOperation.java \
+com/mysql/cluster/ndbj/NdbOperation.java \
+com/mysql/cluster/ndbj/NdbOperationResults.java \
+com/mysql/cluster/ndbj/NdbOperationResultsImpl.java \
+com/mysql/cluster/ndbj/NdbRecAttr.java \
+com/mysql/cluster/ndbj/NdbResultSet.java \
+com/mysql/cluster/ndbj/NdbResultSetImpl.java \
+com/mysql/cluster/ndbj/NdbScanFilter.java \
+com/mysql/cluster/ndbj/NdbScanFilterImpl.java \
+com/mysql/cluster/ndbj/NdbScanOperation.java \
+com/mysql/cluster/ndbj/NdbTransaction.java \
+com/mysql/cluster/ndbj/NoSuchColumnException.java \
+com/mysql/cluster/ndbj/NoSuchIndexException.java \
+com/mysql/cluster/ndbj/NoSuchTableException.java \
+com/mysql/cluster/ndbj/examples/CRUDandScan.java \
+com/mysql/cluster/ndbj/examples/DeleteUsingPrimaryKey.java \
+com/mysql/cluster/ndbj/examples/ExamplesConfigurator.java \
+com/mysql/cluster/ndbj/examples/HelloWorldInsert.java \
+com/mysql/cluster/ndbj/examples/InsertUsingPrimaryKey.java \
+com/mysql/cluster/ndbj/examples/JoinUsingScanAndIndexScan.java \
+com/mysql/cluster/ndbj/examples/PrimaryKeyBatchOps.java \
+com/mysql/cluster/ndbj/examples/PrimaryKeyOpBlob.java \
+com/mysql/cluster/ndbj/examples/ReadRowsUsingTableScan.java \
+com/mysql/cluster/ndbj/examples/ReadUsingOrderedIndexOnPK.java \
+com/mysql/cluster/ndbj/examples/ReadUsingPrimaryKey.java \
+com/mysql/cluster/ndbj/examples/RetryTransaction.java \
+com/mysql/cluster/ndbj/examples/TestAsync.java \
+com/mysql/cluster/ndbj/examples/TestBaseCallback.java \
+com/mysql/cluster/ndbj/examples/TestEvent.java \
+com/mysql/cluster/ndbj/examples/UpdateUsingPrimaryKey.java \
+com/mysql/cluster/ndbj/util/NdbConfigurator.java \
+testsuite/BaseNdbjTestCase.java \
+testsuite/BaseTestCase.java \
+testsuite/TestCallback.java \
+testsuite/ndbj \
+testsuite/ndbj/BasicTest.java \
+testsuite/ndbj/ImmediatePollTimeoutTest.java \
+testsuite/ndbj/InsertRetryTest.java \
+testsuite/ndbj/Latin1InsertReadTest.java \
+testsuite/ndbj/MultiPartPrimaryKeyStringTest.java \
+testsuite/ndbj/MultipleAsyncTest.java \
+testsuite/ndbj/NdbBlobTest.java \
+testsuite/ndbj/NdbIndexScanOperationUtf8Latin1Test.java \
+testsuite/ndbj/NdbOperationByteLongTest.java \
+testsuite/ndbj/NdbOperationIDTest.java \
+testsuite/ndbj/NdbOperationMultiPartPrimaryKeyTest.java \
+testsuite/ndbj/NdbOperationTest.java \
+testsuite/ndbj/NdbOperationsFailedTest.java \
+testsuite/ndbj/NdbScanFilterTest.java \
+testsuite/ndbj/NdbScanTest.java \
+testsuite/ndbj/NdbTest.java \
+testsuite/ndbj/NullSetTest.java \
+testsuite/ndbj/OrderedIndexScanTest.java \
+testsuite/ndbj/QuickAsyncTest.java \
+testsuite/ndbj/QuickBFTest.java \
+testsuite/ndbj/SelectCountTest.java \
+testsuite/ndbj/Utf8InsertReadTest.java \
+testsuite/ndbj/OutOfConnectionProblemTest.java

=== 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-15 23:22:16 +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 && $(MAKE) $(AM_MAKEFLAGS) test
 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-15 23:22:16 +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 $(srcdir)/eswig@EXEEXT@ $(builddir)/../swig@EXEEXT@
 
 clean-local:
 	rm -f ../swig@EXEEXT@

Thread
Rev 254: 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 commit...Monty Taylor16 Nov