List:NDB Connectors« Previous MessageNext Message »
From:Monty Taylor Date:December 6 2007 9:25am
Subject:Rev 337: Fixed build issues caused by new helper lib. 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: 337
revision-id: mtaylor@stripped
parent: mtaylor@stripped
committer: Monty Taylor <mtaylor@stripped>
branch nick: devel
timestamp: Thu 2007-12-06 01:25:04 -0800
message:
  Fixed build issues caused by new helper lib.
modified:
  Makefile.am                    makefile.am-20070228020914-u2pk759xg7thauwf-4
  configure.in                   configure.in-20070228020914-u2pk759xg7thauwf-13
  java/Makefile.am               makefile.am-20070415032352-9dpe6aurqcnuwcrd-1
  lua/Makefile.am                makefile.am-20070727221140-30x3yi1g0lf9rflk-2
  mgmpp/Makefile.am              makefile.am-20071206045946-ugo2x6q480oerp8f-2
  perl/Makefile.am               makefile.am-20070228070325-lv4v4ey3018yr147-1
  python/Makefile.am             makefile.am-20070925115907-x2wrdte5kicyfrrw-1
  ruby/Makefile.am               makefile.am-20070228212451-7arjxk90dkwcn5xr-2
  swig/update_from_swigsvn.sh    update_from_swigsvn.-20071104211339-fod7yzi8t7xd3g0w-5
=== modified file 'Makefile.am'
--- a/Makefile.am	2007-12-01 03:11:00 +0000
+++ b/Makefile.am	2007-12-06 09:25:04 +0000
@@ -24,7 +24,7 @@
 if BUILD_PHP_SUBDIR
   d_php = php
 endif
-SUBDIRS = $(d_swig) $(d_java) $(d_python) $(d_perl) $(d_csharp) $(d_ruby) $(d_php)
$(d_lua) 
+SUBDIRS = mgmpp $(d_swig) $(d_java) $(d_python) $(d_perl) $(d_csharp) $(d_ruby) $(d_php)
$(d_lua) 
 EXTRA_DIST = testndbapi interface autogen.sh 
 
 distclean-local:

=== modified file 'configure.in'
--- a/configure.in	2007-12-06 08:07:23 +0000
+++ b/configure.in	2007-12-06 09:25:04 +0000
@@ -80,10 +80,10 @@
 SWIG_NDB_SOURCES="\${top_srcdir}/interface/globals.i "
 SWIG_MGM_SOURCES="\${top_srcdir}/interface/globals.i "
 
-for f in `find interface/ndbapi | grep -v '\#'` ; do  
+for f in `find interface/ndbapi | grep -v '\#' | grep -v '~'` ; do  
   SWIG_NDB_SOURCES="\${top_srcdir}/$f ${SWIG_NDB_SOURCES} "
 done
-for f in `find interface/mgmapi | grep -v '\#'` ; do  
+for f in `find interface/mgmapi | grep -v '\#' | grep -v '~'` ; do  
   SWIG_MGM_SOURCES="\${top_srcdir}/$f ${SWIG_MGM_SOURCES} "
 done
   

=== modified file 'java/Makefile.am'
--- a/java/Makefile.am	2007-12-06 08:07:23 +0000
+++ b/java/Makefile.am	2007-12-06 09:25:04 +0000
@@ -358,7 +358,7 @@
 	${builddir}/testsuite/mgmj/*.class
 
 
-EXTRA_DIST = lib build.xml ndbj.props.in ndbj.i mgmj.i events.i swig $(NDBAPI_JAVA_SRC)
$(MGMAPI_JAVA_SRC) 
+EXTRA_DIST = lib build.xml ndbj.props.in ndbj.i mgmj.i events.i listeners.i swig
$(NDBAPI_JAVA_SRC) $(MGMAPI_JAVA_SRC) 
 
 lib_LTLIBRARIES = libndbj.la libmgmj.la 
 nodist_libndbj_la_SOURCES = ndbj.cxx

=== modified file 'lua/Makefile.am'
--- a/lua/Makefile.am	2007-11-26 02:05:33 +0000
+++ b/lua/Makefile.am	2007-12-06 09:25:04 +0000
@@ -20,7 +20,7 @@
 	$(SWIG) -c++ -lua $(SWIG_OPTS) -o $@ $<
 
 .cpp.o:
-	$(CXX) $(SWIG_OPTS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS)
$(AM_CFLAGS) $(STANDARD_CFLAGS) -fPIC -DPIC $(LUA_CFLAGS) $< -c -o $@
+	$(CXX) $(SWIG_OPTS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CXXFLAGS)
$(AM_CFLAGS) $(STANDARD_CFLAGS) -fPIC -DPIC $(LUA_CFLAGS) $< -c -o $@
 
 .o.so: 
 	echo $(CXX) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -shared $< $(LUA_LDFLAGS)
-o $@ 

=== modified file 'mgmpp/Makefile.am'
--- a/mgmpp/Makefile.am	2007-12-06 08:07:23 +0000
+++ b/mgmpp/Makefile.am	2007-12-06 09:25:04 +0000
@@ -2,4 +2,5 @@
 
 libmgmpp_la_CPPFLAGS = $(JAVA_CXXFLAGS) $(PTHREAD_CFLAGS) -fPIC
 
-libmgmpp_la_SOURCES = $(srcdir)/events.cpp $(srcdir)/listeners.cpp
${srcdir}/NdbEventListener.cpp
+libmgmpp_la_SOURCES = $(srcdir)/events.cpp $(srcdir)/listeners.cpp
${srcdir}/NdbEventListener.cpp $(srcdir)/libmgmpp.h $(srcdir)/events.hpp
$(srcdir)/listeners.hpp ${srcdir}/NdbEventListener.hpp
+

=== modified file 'perl/Makefile.am'
--- a/perl/Makefile.am	2007-11-15 23:22:16 +0000
+++ b/perl/Makefile.am	2007-12-06 09:25:04 +0000
@@ -23,7 +23,7 @@
 	$(SWIG) $(SWIG_OPTS) -o mgmapi/mgmapi_wrap.cpp mgmapi.i
 
 $(PERL_MAKEFILE): $(srcdir)/Makefile.PL ndbapi/ndbapi_wrap.cpp mgmapi/mgmapi_wrap.cpp
lib/mysql/cluster/ndbapi.pm lib/mysql/cluster/mgmapi.pm $(srcdir)/Makefile.am
-	CFLAGS="$(CPPFLAGS) $(CFLAGS) $(MYSQL_INCLUDES)" LDFLAGS="$(AM_LDFLAGS) $(LDFLAGS)
$(LIBS)" $(PERL) $(srcdir)/Makefile.PL $(MAKE_PL_OPTS)
+	CFLAGS="-I../.. -I../../mgmpp $(CPPFLAGS) $(CFLAGS) $(MYSQL_INCLUDES)"
LDFLAGS="$(AM_LDFLAGS) $(LDFLAGS) $(LIBS)" $(PERL) $(srcdir)/Makefile.PL $(MAKE_PL_OPTS)
 	
 -perl install-perl: $(PERL_MAKEFILE)
 	@target=`echo $@ | sed -e 's/-perl//'`; \

=== modified file 'python/Makefile.am'
--- a/python/Makefile.am	2007-12-06 08:07:23 +0000
+++ b/python/Makefile.am	2007-12-06 09:25:04 +0000
@@ -4,7 +4,7 @@
 pythonarch_DATA=${builddir}/mysql/cluster/_ndbapi.so ${builddir}/mysql/cluster/_mgmapi.so
 
 CLEANFILES=ndbapi.cpp ndbapi.h mgmapi.cpp mysql/cluster/ndbapi.py mysql/cluster/mgmapi.py
mysql/cluster/events.py mysql/cluster/listeners.py *.so mysql/cluster/*pyc *pyc mgmapi.h
events.cpp listeners.cpp events.h listeners.h
-EXTRA_DIST = *py mgmapi.i ndbapi.i events.i PKG-INFO README MANIFEST.in
mysql/cluster/alchemy.py mysql/__init__.py mysql/cluster/__init__.py 
mysql/cluster/NdbObject mysql/cluster/tests
+EXTRA_DIST = *py mgmapi.i ndbapi.i events.i listeners.i PKG-INFO README MANIFEST.in
mysql/cluster/alchemy.py mysql/__init__.py mysql/cluster/__init__.py 
mysql/cluster/NdbObject mysql/cluster/tests
 
 SWIG_OPTS=-O -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -I$(SWIG_DIR) @MYSQL_INCLUDES@
-outdir $(builddir)/mysql/cluster
 

=== modified file 'ruby/Makefile.am'
--- a/ruby/Makefile.am	2007-11-26 02:05:33 +0000
+++ b/ruby/Makefile.am	2007-12-06 09:25:04 +0000
@@ -21,12 +21,12 @@
 	$(SWIG) -c++ -ruby -autorename $(SWIG_OPTS) -o $@ $<
 
 .cpp.o: 
-	$(CXX) $(SWIG_OPTS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS)
$(AM_CFLAGS) $(STANDARD_CFLAGS) -fPIC -DPIC -I$(rubyarchdir) -c $<  -o $@
+	$(CXX) $(SWIG_OPTS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CXXFLAGS)
$(AM_CFLAGS) $(STANDARD_CFLAGS) -fPIC -DPIC -I$(rubyarchdir) -c $<  -o $@
 
 $(srcdir)/mysql/cluster/%.so: %.o
 	mkdir -p mysql/cluster
-	echo $(CXX) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -shared $<
$(LIBRUBYARG_SHARED) -o $@ 
-	$(CXX) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -shared $<
$(LIBRUBYARG_SHARED) -o $@ 
+	echo $(CXX) $(AM_CFLAGS) $(CFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -shared $<
$(LIBRUBYARG_SHARED) -o $@ 
+	$(CXX) $(AM_CFLAGS) $(CFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -shared $<
$(LIBRUBYARG_SHARED) -o $@ 
 	if test `uname` = Darwin; then \
           $(INSTALL_PROGRAM) $(RUBY_PACKAGE).so $(RUBY_PACKAGE).bundle; \
         fi

=== modified file 'swig/update_from_swigsvn.sh'
--- a/swig/update_from_swigsvn.sh	2007-12-05 06:37:22 +0000
+++ b/swig/update_from_swigsvn.sh	2007-12-06 09:25:04 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-bzr diff -r231..309 SWIG/Source/Makefile.am > SWIG.patch 
+bzr diff -r231..336 SWIG/Source/Makefile.am > SWIG.patch 
 bzr diff -r290..293 SWIG/Makefile.in >> SWIG.patch
 bzr diff -r324..325 SWIG/Lib/java/enums.swg >> SWIG.patch
 bzr diff -r324..328 SWIG/Lib/java/enumtypesafe.swg >> SWIG.patch

Thread
Rev 337: Fixed build issues caused by new helper lib. in http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/develMonty Taylor6 Dec