diff options
Diffstat (limited to 'build.conf')
| -rw-r--r-- | build.conf | 177 |
1 files changed, 90 insertions, 87 deletions
@@ -38,11 +38,14 @@ private-includes = subversion/include/private/*.h subversion/bindings/swig/include/*.swg subversion/libsvn_delta/compose_delta.c - subversion/bindings/cxxhl/include/*.hpp - subversion/bindings/cxxhl/include/svncxxhl/*.hpp - subversion/bindings/cxxhl/src/*.hpp - subversion/bindings/cxxhl/src/aprwrap/*.hpp - subversion/bindings/cxxhl/src/private/*.hpp + subversion/bindings/cxx/include/*.hpp + subversion/bindings/cxx/include/svnxx/*.hpp + subversion/bindings/cxx/include/svnxx/client/*.hpp + subversion/bindings/cxx/include/svnxx/detail/*.hpp + subversion/bindings/cxx/src/*.hpp + subversion/bindings/cxx/src/aprwrap/*.hpp + subversion/bindings/cxx/src/private/*.hpp + subversion/bindings/cxx/tests/*.hpp subversion/bindings/javahl/native/*.hpp subversion/bindings/javahl/native/jniwrapper/jni_*.hpp tools/dev/svnmover/linenoise/linenoise.h @@ -371,7 +374,8 @@ type = lib install = fsmod-lib path = subversion/libsvn_subr sources = *.c lz4/*.c -libs = aprutil apriconv apr xml zlib apr_memcache sqlite magic intl lz4 utf8proc +libs = aprutil apriconv apr xml zlib apr_memcache + sqlite magic intl lz4 utf8proc macos-plist macos-keychain msvc-libs = kernel32.lib advapi32.lib shfolder.lib ole32.lib crypt32.lib version.lib msvc-export = @@ -392,7 +396,7 @@ msvc-export = private\svn_string_private.h private\svn_magic.h private\svn_subr_private.h private\svn_mutex.h private\svn_packed_data.h private\svn_object_pool.h private\svn_cert.h - private\svn_config_private.h + private\svn_config_private.h private\svn_dirent_uri_private.h # Working copy management lib [libsvn_wc] @@ -438,7 +442,7 @@ description = Subversion FSFS Repository Manipulation Tool type = exe path = subversion/svnfsfs install = bin -libs = libsvn_repos libsvn_fs libsvn_fs_fs libsvn_delta libsvn_subr apriconv apr +libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr apriconv apr # ---------------------------------------------------------------------------- # @@ -608,16 +612,14 @@ msvc-export = ../bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h [javahl-java] 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/remote - subversion/bindings/javahl/src/org/apache/subversion/javahl/types - subversion/bindings/javahl/src/org/apache/subversion/javahl/util -src-root = subversion/bindings/javahl/src sources = *.java +native = CommitItemStateFlags.java NativeResources.java SVNClient.java + SVNRepos.java install = javahl-java link-cmd = $(COMPILE_JAVAHL_JAVAC) classes = subversion/bindings/javahl/classes -package-roots = org +headers = subversion/bindings/javahl/include +package = org.apache.subversion.javahl [javahl-compat-java] type = java @@ -626,10 +628,12 @@ sources = *.java install = javahl-java link-cmd = $(COMPILE_JAVAHL_COMPAT_JAVAC) classes = subversion/bindings/javahl/classes -add-deps = $(javahl_java_DEPS) +add-deps = $(javahl_callback_java_DEPS) $(javahl_remote_java_DEPS) + $(javahl_types_java_DEPS) $(javahl_util_java_DEPS) + $(javahl_java_DEPS) ### Replace JAR call in INSTALL_EXTRA_JAVAHL_JAVA macro Makefile.in. #jar = svn-javahl.jar -package-roots = org +package = org.tigris.subversion.javahl [javahl-tests] type = java @@ -638,10 +642,12 @@ sources = *.java install = javahl-java link-cmd = $(COMPILE_JAVAHL_JAVAC) classes = subversion/bindings/javahl/classes -package-roots = org +package = org.apache.subversion.javahl ### Java targets don't do up-to-date checks yet. #add-deps = javahl-java -add-deps = $(javahl_java_DEPS) +add-deps = $(javahl_callback_java_DEPS) $(javahl_remote_java_DEPS) + $(javahl_types_java_DEPS) $(javahl_util_java_DEPS) + $(javahl_java_DEPS) [javahl-compat-tests] type = java @@ -650,65 +656,59 @@ sources = *.java install = javahl-java link-cmd = $(COMPILE_JAVAHL_COMPAT_JAVAC) classes = subversion/bindings/javahl/classes -package-roots = org +package = org.tigris.subversion.javahl ### Java targets don't do up-to-date checks yet. #add-deps = javahl-compat-java add-deps = $(javahl_compat_java_DEPS) -[javahl-callback-javah] -type = javah +[javahl-callback-java] +type = java path = subversion/bindings/javahl/src/org/apache/subversion/javahl/callback classes = subversion/bindings/javahl/classes headers = subversion/bindings/javahl/include package = org.apache.subversion.javahl.callback sources = *.java -add-deps = $(javahl_java_DEPS) -install = javahl-javah -link-cmd = $(COMPILE_JAVAHL_JAVAH) -force +native = UserPasswordCallback.java +install = javahl-java +link-cmd = $(COMPILE_JAVAHL_JAVAC) -[javahl-remote-javah] -type = javah +[javahl-remote-java] +type = java path = subversion/bindings/javahl/src/org/apache/subversion/javahl/remote classes = subversion/bindings/javahl/classes headers = subversion/bindings/javahl/include package = org.apache.subversion.javahl.remote sources = *.java -add-deps = $(javahl_java_DEPS) -install = javahl-javah -link-cmd = $(COMPILE_JAVAHL_JAVAH) -force +native = CommitEditor.java RemoteFactory.java RemoteSession.java + StateReporter.java +install = javahl-java +link-cmd = $(COMPILE_JAVAHL_JAVAC) -[javahl-types-javah] -type = javah +[javahl-types-java] +type = java path = subversion/bindings/javahl/src/org/apache/subversion/javahl/types classes = subversion/bindings/javahl/classes headers = subversion/bindings/javahl/include package = org.apache.subversion.javahl.types sources = *.java -add-deps = $(javahl_java_DEPS) -install = javahl-javah -link-cmd = $(COMPILE_JAVAHL_JAVAH) -force +native = NativeInputStream.java NativeOutputStream.java Revision.java + RevisionRangeList.java RuntimeVersion.java VersionExtended.java + Version.java +install = javahl-java +link-cmd = $(COMPILE_JAVAHL_JAVAC) -[javahl-util-javah] -type = javah +[javahl-util-java] +type = java path = subversion/bindings/javahl/src/org/apache/subversion/javahl/util classes = subversion/bindings/javahl/classes headers = subversion/bindings/javahl/include package = org.apache.subversion.javahl.util sources = *.java -add-deps = $(javahl_java_DEPS) -install = javahl-javah -link-cmd = $(COMPILE_JAVAHL_JAVAH) -force - -[javahl-javah] -type = javah -path = subversion/bindings/javahl/src/org/apache/subversion/javahl -classes = subversion/bindings/javahl/classes -headers = subversion/bindings/javahl/include -package = org.apache.subversion.javahl -sources = *.java -add-deps = $(javahl_java_DEPS) -install = javahl-javah -link-cmd = $(COMPILE_JAVAHL_JAVAH) -force +native = ConfigImpl.java ConfigLib.java DiffLib.java PropLib.java + RequestChannel.java ResponseChannel.java SubstLib.java + TunnelChannel.java +install = javahl-java +link-cmd = $(COMPILE_JAVAHL_JAVAC) [libsvnjavahl] description = Subversion Java HighLevel binding @@ -717,9 +717,9 @@ 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 java-sdk sources = *.cpp jniwrapper/*.cpp -add-deps = $(javahl_java_DEPS) $(javahl_callback_javah_DEPS) - $(javahl_remote_javah_DEPS) $(javahl_types_javah_DEPS) - $(javahl_util_javah_DEPS) $(javahl_javah_DEPS) +add-deps = $(javahl_java_DEPS) $(javahl_callback_java_DEPS) + $(javahl_remote_java_DEPS) $(javahl_types_java_DEPS) + $(javahl_util_java_DEPS) $(javahl_java_DEPS) install = javahl-lib # need special build rule to include -I$(JDK)/include/jni.h compile-cmd = $(COMPILE_JAVAHL_CXX) @@ -727,48 +727,34 @@ link-cmd = $(LINK_JAVAHL_CXX) # ---------------------------------------------------------------------------- # -# C++HL targets +# SVN++ targets # -[libsvncxxhl] -description = Subversion C++ HighLevel bindings +[libsvnxx] +description = Subversion C++ bindings +when = SVN_BUILD_SVNXX type = lib -path = subversion/bindings/cxxhl +path = subversion/bindings/cxx libs = libsvn_repos libsvn_client libsvn_wc libsvn_ra libsvn_delta libsvn_diff libsvn_subr libsvn_fs aprutil apriconv apr sources = src/*.cpp src/aprwrap/*.cpp -install = cxxhl-lib +install = svnxx-lib msvc-static = yes -compile-cmd = $(COMPILE_CXXHL_CXX) +compile-cmd = $(COMPILE_SVNXX) link-cmd = $(LINK_CXX_LIB) -[cxxhl-tests] -description = Unit tests for Subversion C++ HighLevel bindings -when = SVN_USE_GOOGLEMOCK +[svnxx-tests] +description = Unit tests for Subversion C++ bindings +when = SVN_BUILD_SVNXX_TESTS type = exe -path = subversion/bindings/cxxhl -libs = libsvncxxhl libgooglemock libsvn_subr apr +path = subversion/bindings/cxx +libs = libsvnxx + libsvn_repos libsvn_client libsvn_wc libsvn_ra libsvn_delta libsvn_diff + libsvn_subr libsvn_fs aprutil apriconv apr sources = tests/*.cpp -install = cxxhl-tests -compile-cmd = $(COMPILE_CXXHL_GOOGLEMOCK_CXX) -link-cmd = $(LINK_CXX) - - -# ---------------------------------------------------------------------------- -# -# Googlemock targets -# - -[libgooglemock] -description = Googlemock Library -when = SVN_USE_GOOGLEMOCK -type = lib -path = googlemock -sources = googletest/src/gtest-all.cc googlemock/src/gmock-all.cc -install = cxxhl-tests -msvc-static = yes -compile-cmd = $(COMPILE_GOOGLEMOCK_CXX) -link-cmd = $(LINK_CXX_LIB) +install = svnxx-tests +compile-cmd = $(COMPILE_SVNXX_TEST) +link-cmd = $(LINK_SVNXX_TEST) # ---------------------------------------------------------------------------- # @@ -845,7 +831,7 @@ type = exe path = subversion/tests/libsvn_fs_fs sources = fs-fs-private-test.c install = test -libs = libsvn_test libsvn_fs libsvn_fs_fs libsvn_delta +libs = libsvn_test libsvn_fs libsvn_delta libsvn_repos libsvn_subr apriconv apr msvc-force-static = yes @@ -1474,6 +1460,14 @@ external-lib = $(SVN_KWALLET_LIBS) type = lib external-lib = $(SVN_MAGIC_LIBS) +[macos-plist] +type = lib +external-lib = $(SVN_MACOS_PLIST_LIBS) + +[macos-keychain] +type = lib +external-lib = $(SVN_MACOS_KEYCHAIN_LIBS) + [sasl] type = lib external-lib = $(SVN_SASL_LIBS) @@ -1588,7 +1582,7 @@ libs = __ALL__ conflict-data-test db-test pristine-store-test entries-compat-test op-depth-test dirent_uri-test wc-queries-test wc-test auth-test - parse-diff-test x509-test xml-test afl-x509 compress-test + parse-diff-test x509-test xml-test afl-x509 afl-svndiff compress-test svndiff-stream-test [__MORE__] @@ -1630,7 +1624,7 @@ lang = ruby [__JAVAHL__] type = project path = build/win32 -libs = javahl-java javahl-javah libsvnjavahl +libs = javahl-java libsvnjavahl [__JAVAHL_TESTS__] type = project @@ -1749,3 +1743,12 @@ sources = afl-x509.c install = test libs = libsvn_subr apr testing = skip + +[afl-svndiff] +description = AFL fuzzer for svndiff to txdelta parser +type = exe +path = subversion/tests/afl +sources = afl-svndiff.c +install = test +libs = libsvn_delta libsvn_subr apr +testing = skip |