subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From svn-r...@apache.org
Subject svn commit: r1567520 - in /subversion/branches/1.8.x: ./ STATUS build/generator/gen_base.py
Date Wed, 12 Feb 2014 04:04:53 GMT
Author: svn-role
Date: Wed Feb 12 04:04:53 2014
New Revision: 1567520

URL: http://svn.apache.org/r1567520
Log:
Merge r1543187 from trunk:

 * r1543187
   Fix SWIG bindings not building in release mode with out of tree builds.
   Justification:
     Build systems should work.  This makes Branko cranky every release.
   Notes: Test by using ./autogen.sh --release, then do an out of tree build
     without this fix swig-py and swig-rb fail immediately.
   Votes:
     +1: breser, brane, rhuijben

Modified:
    subversion/branches/1.8.x/   (props changed)
    subversion/branches/1.8.x/STATUS
    subversion/branches/1.8.x/build/generator/gen_base.py

Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1543187

Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1567520&r1=1567519&r2=1567520&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Wed Feb 12 04:04:53 2014
@@ -232,12 +232,3 @@ Veto-blocked changes:
 
 Approved changes:
 =================
-
- * r1543187
-   Fix SWIG bindings not building in release mode with out of tree builds.
-   Justification:
-     Build systems should work.  This makes Branko cranky every release.
-   Notes: Test by using ./autogen.sh --release, then do an out of tree build
-     without this fix swig-py and swig-rb fail immediately.
-   Votes:
-     +1: breser, brane, rhuijben

Modified: subversion/branches/1.8.x/build/generator/gen_base.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/build/generator/gen_base.py?rev=1567520&r1=1567519&r2=1567520&view=diff
==============================================================================
--- subversion/branches/1.8.x/build/generator/gen_base.py (original)
+++ subversion/branches/1.8.x/build/generator/gen_base.py Wed Feb 12 04:04:53 2014
@@ -314,11 +314,16 @@ class ObjectFile(DependencyNode):
     self.source_generated = 0
 
 class SWIGObject(ObjectFile):
-  def __init__(self, filename, lang):
+  def __init__(self, filename, lang, release_mode):
     ObjectFile.__init__(self, filename)
     self.lang = lang
     self.lang_abbrev = lang_abbrev[lang]
-    self.source_generated = 1
+    # in release mode the sources are not generated by the build
+    # but rather by the packager
+    if release_mode:
+      self.source_generated = 0
+    else:
+      self.source_generated = 1
     ### hmm. this is Makefile-specific
     self.compile_cmd = '$(COMPILE_%s_WRAPPER)' % self.lang_abbrev.upper()
 
@@ -614,8 +619,10 @@ class TargetSWIG(TargetLib):
     self.filename = build_path_join(self.path, lib_filename)
 
     ifile = SWIGSource(ipath)
-    cfile = SWIGObject(build_path_join(self.path, cname), self.lang)
-    ofile = SWIGObject(build_path_join(self.path, oname), self.lang)
+    cfile = SWIGObject(build_path_join(self.path, cname), self.lang,
+                       self.gen_obj.release_mode)
+    ofile = SWIGObject(build_path_join(self.path, oname), self.lang,
+                       self.gen_obj.release_mode)
 
     # the .c file depends upon the .i file
     self.gen_obj.graph.add(DT_SWIG_C, cfile, ifile)



Mime
View raw message