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

[rh...@apache.org]

Author: rhuijben
Date: Thu Apr  1 16:56:16 2010
New Revision: 930042

URL: http://svn.apache.org/viewvc?rev=930042&view=rev
Log:
Fix the swig build on Windows (broken since r926613) and use a simpler 
construct to check a prefix.

* build/generator/gen_win.py
  (get_proj_sources): Add description to swig custom build operations
  (get_proj_sources): Use .startswith() instead of a range check.

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=930042&r1=930041&r2=930042&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_win.py (original)
+++ subversion/trunk/build/generator/gen_win.py Thu Apr  1 16:56:16 2010
@@ -562,10 +562,13 @@ class WinGeneratorBase(GeneratorBase):
 
                 cbuild = '%s %s -o %s $(InputPath)' \
                          % (self.swig_exe, " ".join(swig_options), cout)
+                         
+                cdesc = 'Generating %s' % cout
 
                 sources.append(ProjectItem(path=isrc, reldir=None,
                                            custom_build=cbuild,
                                            custom_target=csrc,
+                                           custom_desc=cdesc,
                                            user_deps=user_deps,
                                            extension=''))
 
@@ -698,7 +701,7 @@ class WinGeneratorBase(GeneratorBase):
     #
     # This section parses those dependencies and adds them to the dependency list
     # for this target.
-    if name[0:7] == 'javahl-' or name == 'libsvnjavahl':
+    if name.startswith('javahl') or name == 'libsvnjavahl':
       for dep in re.findall('\$\(([^\)]*)_DEPS\)', target.add_deps):
         dep = dep.replace('_', '-')
         depends.extend(self.sections[dep].get_targets())