List:NDB Connectors« Previous MessageNext Message »
From:Monty Taylor Date:December 4 2007 9:03pm
Subject:Rev 265: Merged. in http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/telco-6.3
View as plain text  
At http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/telco-6.3

------------------------------------------------------------
revno: 265
revision-id: mtaylor@stripped
parent: mtaylor@stripped
parent: mtaylor@stripped
committer: Monty Taylor <mtaylor@stripped>
branch nick: telco-6.3
timestamp: Tue 2007-12-04 13:03:04 -0800
message:
  Merged.
modified:
  swig/Makefile.am               makefile.am-20071104211339-fod7yzi8t7xd3g0w-3
  swig/SWIG/Lib/java/enums.swg   enums.swg-20071104211339-fod7yzi8t7xd3g0w-909
  swig/update_from_swigsvn.sh    update_from_swigsvn.-20071104211339-fod7yzi8t7xd3g0w-5
    ------------------------------------------------------------
    revno: 192.1.25.1.109
    revision-id: mtaylor@stripped
    parent: mtaylor@stripped
    committer: Monty Taylor <mtaylor@stripped>
    branch nick: devel
    timestamp: Tue 2007-12-04 11:27:41 -0800
    message:
      Added make clean to swig make dist
      Updated update_from_swigsvn.sh
    modified:
      swig/Makefile.am               makefile.am-20071104211339-fod7yzi8t7xd3g0w-3
      swig/update_from_swigsvn.sh   
update_from_swigsvn.-20071104211339-fod7yzi8t7xd3g0w-5
    ------------------------------------------------------------
    revno: 192.1.25.1.108
    revision-id: mtaylor@stripped
    parent: mtaylor@stripped
    committer: Monty Taylor <mtaylor@stripped>
    branch nick: devel
    timestamp: Tue 2007-12-04 11:24:53 -0800
    message:
      Added SuppressWarnings to java enums.
    modified:
      swig/SWIG/Lib/java/enums.swg   enums.swg-20071104211339-fod7yzi8t7xd3g0w-909
=== modified file 'swig/Makefile.am'
--- a/swig/Makefile.am	2007-11-26 02:05:33 +0000
+++ b/swig/Makefile.am	2007-12-04 19:27:41 +0000
@@ -7,7 +7,7 @@
 distclean: 
 	cd $(top_builddir)/swig/SWIG && $(MAKE) $(AM_MAKEFLAGS) distclean
 
-dist-hook:
+dist-hook: clean
 	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

=== modified file 'swig/SWIG/Lib/java/enums.swg'
--- a/swig/SWIG/Lib/java/enums.swg	2007-11-04 21:32:20 +0000
+++ b/swig/SWIG/Lib/java/enums.swg	2007-12-04 19:24:53 +0000
@@ -92,15 +92,18 @@
     throw new IllegalArgumentException("No enum " + $javaclassname.class + " with value "
+ swigValue);
   }
 
+  @SuppressWarnings("unused")
   private $javaclassname() {
     this.swigValue = SwigNext.next++;
   }
 
+  @SuppressWarnings("unused")
   private $javaclassname(int swigValue) {
     this.swigValue = swigValue;
     SwigNext.next = swigValue+1;
   }
 
+  @SuppressWarnings("unused")
   private $javaclassname($javaclassname swigEnum) {
     this.swigValue = swigEnum.swigValue;
     SwigNext.next = this.swigValue+1;

=== modified file 'swig/update_from_swigsvn.sh'
--- a/swig/update_from_swigsvn.sh	2007-11-26 02:09:08 +0000
+++ b/swig/update_from_swigsvn.sh	2007-12-04 19:27:41 +0000
@@ -1,7 +1,8 @@
 #!/bin/sh
 
-bzr diff -r231..293 SWIG/Source/Makefile.am > SWIG.patch 
+bzr diff -r231..309 SWIG/Source/Makefile.am > SWIG.patch 
 bzr diff -r290..293 SWIG/Makefile.in >> SWIG.patch
+bzr diff -r231..325 SWIG/Lib/java/enums.swg >> SWIG.patch
 rm -rf SWIG
 svn export https://swig.svn.sourceforge.net/svnroot/swig/tags/rel-1.3.33 SWIG
 rm SWIG/Tools/config/config.guess SWIG/Tools/config/config.sub

Thread
Rev 265: Merged. in http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/telco-6.3Monty Taylor4 Dec