List:NDB Connectors« Previous MessageNext Message »
From:Monty Taylor Date:January 29 2008 3:36am
Subject:bzr COMMIT - http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/devel (mtaylor 428 )
View as plain text  
#At http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/devel

------------------------------------------------------------
revno: 428
revision-id:mtaylor@stripped
parent: mtaylor@stripped
committer: Monty Taylor <mtaylor@stripped>
branch nick: devel
timestamp: Mon 2008-01-28 19:35:49 -0800
message:
  Further work trying to get make diskcheck working. It really at this point looks like
I'm going to have to automake all of swig. *shudder*
modified:
  swig/Makefile.am               makefile.am-20071104211339-fod7yzi8t7xd3g0w-3
  swig/SWIG/Makefile.in          makefile.in-20071104211637-mxknek16uhsegtxr-1
  swig/SWIG/Tools/config/config.guess config.guess-20071112210008-1re17e4tsaaokwgh-5
  swig/SWIG/Tools/config/config.sub config.sub-20071112210008-1re17e4tsaaokwgh-2
  swig/update_from_swigsvn.sh    update_from_swigsvn.-20071104211339-fod7yzi8t7xd3g0w-5
=== modified file 'swig/Makefile.am'
--- a/swig/Makefile.am	2007-12-05 06:37:22 +0000
+++ b/swig/Makefile.am	2008-01-29 03:35:49 +0000
@@ -24,6 +24,9 @@
 #	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 #distcheck:
 #	cd $(srcdir)/SWIG && $(MAKE) $(AM_MAKEFLAGS) distcheck
+#
+distcleancheck:
+	echo "Not doing dist clean check in SWIG"
 
 #dist: 
 #	cd $(srcdir)/SWIG && $(MAKE) $(AM_MAKEFLAGS) dist

=== modified file 'swig/SWIG/Makefile.in'
--- a/swig/SWIG/Makefile.in	2007-11-26 02:05:33 +0000
+++ b/swig/SWIG/Makefile.in	2008-01-29 03:35:49 +0000
@@ -5,6 +5,7 @@
 prefix      = @prefix@
 exec_prefix = @exec_prefix@
 srcdir      = @srcdir@
+top_builddir = @top_builddir@
 datarootdir = @datarootdir@
 
 ##############################################################################
@@ -24,7 +25,7 @@
 source:
 	@cd $(SOURCE) && $(MAKE)
 
-libfiles: $(srcdir)/Lib/swigwarn.swg
+libfiles: $(top_builddir)/Lib/swigwarn.swg
 
 # Files required just for the tarball
 maintainer: libfiles
@@ -310,7 +311,7 @@
 	@rm -f $(TARGET)
 
 clean-libfiles:
-	@rm -f $(srcdir)/Lib/swigwarn.swg
+	@rm -f $(top_builddir)/Lib/swigwarn.swg
 
 clean-examples:
 	@$(MAKE) -k -s check-examples ACTION=clean
@@ -394,7 +395,7 @@
 # Note: Generated into the source tree rather than build tree
 #####################################################################
 
-$(srcdir)/Lib/swigwarn.swg: $(srcdir)/Source/Include/swigwarn.h
+$(top_builddir)/Lib/swigwarn.swg: $(srcdir)/Source/Include/swigwarn.h
 	mkdir -p Lib
 	echo "/* Automatically generated file containing all the swig warning codes.  */" >
$@
 	echo "/* Do not modify this file by hand, change 'Source/Include/swigwarn.h'  */"
>> $@
@@ -403,7 +404,7 @@
 	awk '/#define WARN/{$$1="%define"; $$2="SWIG"$$2; $$3=sprintf("%d %%enddef", $$3); print
$$0; next;}\
 	      /#/{next;} {print $0}' < $? >> $@
 
-dist-hook: $(srcdir)/Lib/swigwarn.swg
+dist-hook: $(top_builddir)/Lib/swigwarn.swg
 
 #####################################################################
 # TARGETS: install & friends

=== modified file 'swig/SWIG/Tools/config/config.guess'
--- a/swig/SWIG/Tools/config/config.guess	2007-11-25 22:01:45 +0000
+++ b/swig/SWIG/Tools/config/config.guess	2008-01-29 03:35:49 +0000
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
 #   Inc.
 
-timestamp='2007-03-06'
+timestamp='2007-07-22'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -330,7 +330,7 @@
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
-    i86pc:SunOS:5.*:*)
+    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
 	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
     sun4*:SunOS:6*:*)
@@ -793,7 +793,7 @@
 	exit ;;
     *:Interix*:[3456]*)
     	case ${UNAME_MACHINE} in
-	    x86) 
+	    x86)
 		echo i586-pc-interix${UNAME_RELEASE}
 		exit ;;
 	    EM64T | authenticamd)

=== modified file 'swig/SWIG/Tools/config/config.sub'
--- a/swig/SWIG/Tools/config/config.sub	2007-11-25 22:01:45 +0000
+++ b/swig/SWIG/Tools/config/config.sub	2008-01-29 03:35:49 +0000
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
 #   Inc.
 
-timestamp='2007-01-18'
+timestamp='2007-06-28'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -475,8 +475,8 @@
 		basic_machine=craynv-cray
 		os=-unicosmp
 		;;
-	cr16c)
-		basic_machine=cr16c-unknown
+	cr16)
+		basic_machine=cr16-unknown
 		os=-elf
 		;;
 	crds | unos)
@@ -683,6 +683,10 @@
 		basic_machine=i386-pc
 		os=-mingw32
 		;;
+	mingw32ce)
+		basic_machine=arm-unknown
+		os=-mingw32ce
+		;;
 	miniframe)
 		basic_machine=m68000-convergent
 		;;

=== modified file 'swig/update_from_swigsvn.sh'
--- a/swig/update_from_swigsvn.sh	2007-12-19 12:51:16 +0000
+++ b/swig/update_from_swigsvn.sh	2008-01-29 03:35:49 +0000
@@ -1,10 +1,10 @@
 #!/bin/sh
 
 bzr diff -rtag:swig_initial..tag:swig_goodautomake SWIG/Source/Makefile.am >
SWIG.patch 
-bzr diff -rtag:swig_1_3_33..tag:swig_disthook SWIG/Makefile.in >> SWIG.patch
 bzr diff -rtag:swig_initial..tag:swig_enums SWIG/Lib/java/enums.swg >> SWIG.patch
 bzr diff -rtag:swig_initial..tag:swig_enums SWIG/Lib/java/enumtypesafe.swg >>
SWIG.patch
 bzr diff -rtag:swig_initial..tag:swig_enums SWIG/Source/Modules/java.cxx >>
SWIG.patch
+bzr diff -rtag:swig_initial..tag:swig_distcheck SWIG/Makefile.in >> SWIG.patch
 
 rm -rf SWIG
 svn export https://swig.svn.sourceforge.net/svnroot/swig/tags/rel-1.3.33 SWIG

Thread
bzr COMMIT - http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/devel (mtaylor 428 )Monty Taylor29 Jan