[[[
JavaHL: Include the new Ra java code in the build process
* build.conf
(options): Don't try to find new jni header files before they are
generated
(javahl-java): compile classes in the
src/org/apache/subversion/javahl/ra directory
(javahl-ra-javah): new section for generating jni header files for
the Ra classes
(libsvnjavahl): make the javahl library depend on the ra jni files
]]]
Index: build.conf
===================================================================
--- build.conf (revision 1328758)
+++ build.conf (working copy)
@@ -57,6 +57,11 @@ private-built-includes =
subversion/bindings/javahl/include/org_apache_subversion_javahl_types_Version.h
subversion/bindings/javahl/include/org_apache_subversion_javahl_types_Revision.h
subversion/bindings/javahl/include/org_apache_subversion_javahl_callback_UserPasswordCallback.h
+
subversion/bindings/javahl/include/org_apache_subversion_javahl_ra_SVNEditor.h
+
subversion/bindings/javahl/include/org_apache_subversion_javahl_ra_SVNDirectory.h
+
subversion/bindings/javahl/include/org_apache_subversion_javahl_ra_SVNFile.h
+
subversion/bindings/javahl/include/org_apache_subversion_javahl_ra_SVNRa.h
+
subversion/bindings/javahl/include/org_apache_subversion_javahl_ra_SVNRaFactory.h
test-scripts =
@@ -526,6 +531,7 @@ type = java
path = subversion/bindings/javahl/src/org/apache/subversion/javahl
subversion/bindings/javahl/src/org/apache/subversion/javahl/callback
subversion/bindings/javahl/src/org/apache/subversion/javahl/types
+ subversion/bindings/javahl/src/org/apache/subversion/javahl/ra
src-root = subversion/bindings/javahl/src
sources = *.java
install = javahl-java
@@ -580,6 +586,17 @@ add-deps = $(javahl_java_DEPS)
install = javahl-javah
link-cmd = $(COMPILE_JAVAHL_JAVAH) -force
+[javahl-ra-javah]
+type = javah
+path = subversion/bindings/javahl/src/org/apache/subversion/javahl/ra
+classes = subversion/bindings/javahl/classes
+headers = subversion/bindings/javahl/include
+package = org.apache.subversion.javahl.ra
+sources = *.java
+add-deps = $(javahl_java_DEPS)
+install = javahl-javah
+link-cmd = $(COMPILE_JAVAHL_JAVAH) -force
+
[javahl-callback-javah]
type = javah
path = subversion/bindings/javahl/src/org/apache/subversion/javahl/callback
@@ -609,7 +626,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)
$(javahl_callback_javah_DEPS) $(javahl_types_javah_DEPS)
+add-deps = $(javahl_javah_DEPS) $(javahl_java_DEPS)
$(javahl_callback_javah_DEPS) $(javahl_types_javah_DEPS) $(javahl_ra_javah_DEPS)
install = javahl-lib
# need special build rule to include -I$(JDK)/include/jni.h
compile-cmd = $(COMPILE_JAVAHL_CXX)
