Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@subversion.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1491788 - /subversion/trunk/build/generator/gen_win.py
Date: Tue, 11 Jun 2013 13:24:09 -0000
To: commits@subversion.apache.org
From: brane@apache.org
Message-Id: <20130611132409.2AE1523888E7@eris.apache.org>

Author: brane
Date: Tue Jun 11 13:24:08 2013
New Revision: 1491788

URL: http://svn.apache.org/r1491788
Log:
Fix Windows project file generator to not exclude .c files
generated by Swig from the build.

* build/generator/gen_win.py (GeneratorBase.__init__):
   Construct a set of all private include files that were explicitly
   listed in build.conf.
  (WinGeneratorBase.get_proj_sources): Only exclude from build those
   dependencies that appear in the exclude list.

Modified:
    subversion/trunk/build/generator/gen_win.py

Modified: subversion/trunk/build/generator/gen_win.py
URL: http://svn.apache.org/viewvc/subversion/trunk/build/generator/gen_win.py?rev=1491788&r1=1491787&r2=1491788&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_win.py (original)
+++ subversion/trunk/build/generator/gen_win.py Tue Jun 11 13:24:08 2013
@@ -207,6 +207,11 @@ class GeneratorBase(gen_base.GeneratorBa
     # Initialize parent
     gen_base.GeneratorBase.__init__(self, fname, verfname, options)
 
+    # These files will be excluded from the build when they're not
+    # explicitly listed as project sources.
+    self._excluded_from_build = frozenset(self.private_includes
+                                          + self.private_built_includes)
+
     # Find Berkeley DB
     self._find_bdb()
 
@@ -550,7 +555,8 @@ class WinGeneratorBase(GeneratorBase):
           rsrc = '"%s"' % rsrc
 
         if (not isinstance(source, gen_base.SourceFile)
-            and cbuild is None and ctarget is None and cdesc is None):
+            and cbuild is None and ctarget is None and cdesc is None
+            and source in self._excluded_from_build):
           # Make sure include dependencies are excluded from the build.
           # This is an 'orrible 'ack that relies on the source being a
           # string if it's an include dependency, or a SourceFile object