svn commit: r1504534 - /subversion/trunk/build/generator/gen_win.py

[rh...@apache.org]

Author: rhuijben
Date: Thu Jul 18 17:16:15 2013
New Revision: 1504534

URL: http://svn.apache.org/r1504534
Log:
* build/generator/gen_win.py
  (get_win_includes): Make swig include directory manipulation a
    bit clearer by assuming that we have swig when we create such a project.

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=1504534&r1=1504533&r2=1504534&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_win.py (original)
+++ subversion/trunk/build/generator/gen_win.py Thu Jul 18 17:16:15 2013
@@ -775,24 +775,29 @@ class WinGeneratorBase(gen_win_dependenc
     else:
       fakeincludes.extend([ self.path("subversion/bindings/swig/proxy") ])
 
-    if self.swig_libdir \
-       and (isinstance(target, gen_base.TargetSWIG)
-            or isinstance(target, gen_base.TargetSWIGLib)):
-      if self.swig_vernum >= 103028:
-        fakeincludes.append(self.apath(self.swig_libdir, target.lang))
-        if target.lang == 'perl':
+    if (isinstance(target, gen_base.TargetSWIG)
+        or isinstance(target, gen_base.TargetSWIGLib)):
+
+      # Projects aren't generated unless we have swig
+      assert self.swig_libdir
+
+      fakeincludes.append(self.apath(self.swig_libdir, target.lang))
+
+      if target.lang == "perl":
+        if self.swig_vernum >= 103028:
           # At least swigwin 1.3.38+ uses perl5 as directory name. Just add it
           # to the list to make sure we don't break old versions
           fakeincludes.append(self.apath(self.swig_libdir, 'perl5'))
-      else:
-        fakeincludes.append(self.swig_libdir)
-      if target.lang == "perl":
         fakeincludes.extend(self.perl_includes)
-      if target.lang == "python":
+      elif target.lang == "python":
         fakeincludes.extend(self.python_includes)
-      if target.lang == "ruby":
+      elif target.lang == "ruby":
         fakeincludes.extend(self.ruby_includes)
 
+      # And after the language specific includes, include the generic libdir,
+      # to allow overriding a generic with a per language include
+      fakeincludes.append(self.swig_libdir)
+
     if self.sqlite_inline:
       fakeincludes.append(self.apath(self.sqlite_path))
     else: