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

[rh...@apache.org]

Author: rhuijben
Date: Wed Mar 24 00:14:02 2010
New Revision: 926876

URL: http://svn.apache.org/viewvc?rev=926876&view=rev
Log:
Fix JavaHL dependency calculation on Windows.

* build.conf
  (libsvnjavahl): Add dependency on javahl_callback_javah.

* build/generator/gen_win.py
  (adjust_win_depends): Apply dependency transformations on
    javahl-callback-javah.

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=926876&r1=926875&r2=926876&view=diff
==============================================================================
--- subversion/trunk/build.conf (original)
+++ subversion/trunk/build.conf Wed Mar 24 00:14:02 2010
@@ -580,7 +580,7 @@ path = subversion/bindings/javahl/native
 libs = libsvn_repos libsvn_client libsvn_wc libsvn_ra libsvn_delta libsvn_diff 
        libsvn_subr libsvn_fs aprutil apriconv apr neon
 sources = *.cpp *.c
-add-deps = $(javahl_javah_DEPS) $(javahl_java_DEPS)
+add-deps = $(javahl_javah_DEPS) $(javahl_java_DEPS) $(javahl_callback_javah_DEPS)
 install = javahl-lib
 # need special build rule to include -I$(JDK)/include/jni.h
 compile-cmd = $(COMPILE_JAVAHL_CXX)

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