subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r926890 - in /subversion/trunk: build.conf build/generator/gen_win.py
Date Wed, 24 Mar 2010 01:02:26 GMT
Author: rhuijben
Date: Wed Mar 24 01:02:26 2010
New Revision: 926890

URL: http://svn.apache.org/viewvc?rev=926890&view=rev
Log:
I love doing parallel builds... but it would be nice if it shows the
same errors every time, instead of generating different ones.

* build.conf
  (javahl-tests, javahl-compat-tests):
    Add more missing dependencies in the javahl support.
    
* build/generator/gen_win.py
  (adjust_win_depends):
    Following up on r926876 and r926884 apply a more generic
    java check, to hopefully avoid further patches here.

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

Modified: subversion/trunk/build.conf
URL: http://svn.apache.org/viewvc/subversion/trunk/build.conf?rev=926890&r1=926889&r2=926890&view=diff
==============================================================================
--- subversion/trunk/build.conf (original)
+++ subversion/trunk/build.conf Wed Mar 24 01:02:26 2010
@@ -539,7 +539,8 @@ link-cmd = $(COMPILE_JAVAHL_JAVAC)
 classes = subversion/bindings/javahl/classes
 package-roots = org
 ### Java targets don't do up-to-date checks yet.
-#add-deps = javahl-compat
+#add-deps = javahl-java
+add-deps = $(javahl_java_DEPS)
 
 [javahl-compat-tests]
 type = java
@@ -550,7 +551,8 @@ link-cmd = $(COMPILE_JAVAHL_JAVAC)
 classes = subversion/bindings/javahl/classes
 package-roots = org
 ### Java targets don't do up-to-date checks yet.
-#add-deps = javahl-java
+#add-deps = javahl-compat-java
+add-deps = $(javahl_compat_java_DEPS)
 
 [javahl-callback-javah]
 type = javah 

Modified: subversion/trunk/build/generator/gen_win.py
URL: http://svn.apache.org/viewvc/subversion/trunk/build/generator/gen_win.py?rev=926890&r1=926889&r2=926890&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_win.py (original)
+++ subversion/trunk/build/generator/gen_win.py Wed Mar 24 01:02:26 2010
@@ -698,9 +698,7 @@ class WinGeneratorBase(GeneratorBase):
     #
     # This section parses those dependencies and adds them to the dependency list
     # for this target.
-    if name == 'javahl-javah' or name == 'libsvnjavahl' \
-        or name == 'javahl-callback-javah' or name == 'javahl-compat-java':
-
+    if name[0:7] == 'javahl-' or name == 'libsvnjavahl':
       for dep in re.findall('\$\(([^\)]*)_DEPS\)', target.add_deps):
         dep = dep.replace('_', '-')
         depends.extend(self.sections[dep].get_targets())



Mime
View raw message