svn commit: r926884 - in /subversion/trunk: build.conf build/generator/gen_win.py

[rh...@apache.org]

Author: rhuijben
Date: Wed Mar 24 00:41:21 2010
New Revision: 926884

URL: http://svn.apache.org/viewvc?rev=926884&view=rev
Log:
* build.conf
  (javahl-compat-java): Add dependency on javahl-java

* build/generator/gen_win.py
  (adjust_win_depends): Apply transformations on javahl-compat-java.

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=926884&r1=926883&r2=926884&view=diff
==============================================================================
--- subversion/trunk/build.conf (original)
+++ subversion/trunk/build.conf Wed Mar 24 00:41:21 2010
@@ -525,6 +525,7 @@ sources = *.java
 install = javahl-java
 link-cmd = $(COMPILE_JAVAHL_JAVAC)
 classes = subversion/bindings/javahl/classes
+add-deps = $(javahl_java_DEPS)
 ### Replace JAR call in INSTALL_EXTRA_JAVAHL_JAVA macro Makefile.in.
 #jar = svn-javahl.jar
 package-roots = org

Modified: subversion/trunk/build/generator/gen_win.py
URL: http://svn.apache.org/viewvc/subversion/trunk/build/generator/gen_win.py?rev=926884&r1=926883&r2=926884&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_win.py (original)
+++ subversion/trunk/build/generator/gen_win.py Wed Mar 24 00:41:21 2010
@@ -698,7 +698,9 @@ 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':
+    if name == 'javahl-javah' or name == 'libsvnjavahl' \
+        or name == 'javahl-callback-javah' or name == 'javahl-compat-java':
+
       for dep in re.findall('\$\(([^\)]*)_DEPS\)', target.add_deps):
         dep = dep.replace('_', '-')
         depends.extend(self.sections[dep].get_targets())