diff options
Diffstat (limited to 'build.conf')
| -rw-r--r-- | build.conf | 439 |
1 files changed, 353 insertions, 86 deletions
@@ -40,13 +40,23 @@ private-includes = 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/javahl/native/*.hpp + subversion/bindings/javahl/native/jniwrapper/jni_*.hpp + subversion/libsvn_subr/utf8proc/utf8proc.h + subversion/libsvn_subr/utf8proc/utf8proc.c + subversion/libsvn_subr/utf8proc/utf8proc_data.c private-built-includes = subversion/svn_private_config.h subversion/libsvn_fs_fs/rep-cache-db.h + subversion/libsvn_fs_x/rep-cache-db.h subversion/libsvn_wc/wc-metadata.h subversion/libsvn_wc/wc-queries.h subversion/libsvn_wc/wc-checks.h subversion/libsvn_subr/internal_statements.h + subversion/tests/libsvn_wc/wc-test-queries.h subversion/bindings/swig/proxy/swig_python_external_runtime.swg subversion/bindings/swig/proxy/swig_perl_external_runtime.swg subversion/bindings/swig/proxy/swig_ruby_external_runtime.swg @@ -56,15 +66,30 @@ private-built-includes = subversion/bindings/javahl/include/org_apache_subversion_javahl_Path.h subversion/bindings/javahl/include/org_apache_subversion_javahl_SVNRepos.h subversion/bindings/javahl/include/org_apache_subversion_javahl_SVNClient.h + subversion/bindings/javahl/include/org_apache_subversion_javahl_types_NativeInputStream.h + subversion/bindings/javahl/include/org_apache_subversion_javahl_types_NativeOutputStream.h subversion/bindings/javahl/include/org_apache_subversion_javahl_types_Version.h subversion/bindings/javahl/include/org_apache_subversion_javahl_types_VersionExtended.h subversion/bindings/javahl/include/org_apache_subversion_javahl_types_VersionExtended_LinkedLib.h subversion/bindings/javahl/include/org_apache_subversion_javahl_types_VersionExtended_LinkedLibIterator.h subversion/bindings/javahl/include/org_apache_subversion_javahl_types_VersionExtended_LoadedLib.h subversion/bindings/javahl/include/org_apache_subversion_javahl_types_VersionExtended_LoadedLibIterator.h + subversion/bindings/javahl/include/org_apache_subversion_javahl_types_RuntimeVersion.h subversion/bindings/javahl/include/org_apache_subversion_javahl_types_Revision.h + subversion/bindings/javahl/include/org_apache_subversion_javahl_types_RevisionRangeList.h subversion/bindings/javahl/include/org_apache_subversion_javahl_callback_UserPasswordCallback.h - + subversion/bindings/javahl/include/org_apache_subversion_javahl_remote_RemoteSession.h + subversion/bindings/javahl/include/org_apache_subversion_javahl_remote_RemoteFactory.h + subversion/bindings/javahl/include/org_apache_subversion_javahl_remote_CommitEditor.h + subversion/bindings/javahl/include/org_apache_subversion_javahl_remote_StateReporter.h + subversion/bindings/javahl/include/org_apache_subversion_javahl_util_ConfigImpl_Category.h + subversion/bindings/javahl/include/org_apache_subversion_javahl_util_ConfigLib.h + subversion/bindings/javahl/include/org_apache_subversion_javahl_util_DiffLib.h + subversion/bindings/javahl/include/org_apache_subversion_javahl_util_PropLib.h + subversion/bindings/javahl/include/org_apache_subversion_javahl_util_SubstLib.h + subversion/bindings/javahl/include/org_apache_subversion_javahl_util_TunnelChannel.h + subversion/bindings/javahl/include/org_apache_subversion_javahl_util_RequestChannel.h + subversion/bindings/javahl/include/org_apache_subversion_javahl_util_ResponseChannel.h test-scripts = subversion/tests/cmdline/*_tests.py @@ -106,6 +131,7 @@ swig-checkout-files = common.swg swigrun.swg runtime.swg # msvc-libs - additional libraries to link with on Windows # msvc-export - additional list of files to expose in dsp/vc(x)proj # msvc-static - visual studio target produces only a static lib +# msvc-force-static- visual studio always uses static libraries for svn libs # add-deps - expands to additional autoconf-defined dependencies # add-install-deps - like add-deps, but for the install step # external-lib - expands to additional autoconf-defined libs @@ -121,6 +147,7 @@ libs = libsvn_client libsvn_wc libsvn_ra libsvn_delta libsvn_diff libsvn_subr apriconv apr manpages = subversion/svn/svn.1 install = bin +msvc-libs = setargv.obj # The subversion repository administration tool [svnadmin] @@ -130,6 +157,7 @@ path = subversion/svnadmin install = bin manpages = subversion/svnadmin/svnadmin.1 libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr apriconv apr +msvc-libs = setargv.obj # The subversion repository dump filtering tool [svndumpfilter] @@ -215,7 +243,7 @@ type = lib path = subversion/libsvn_client libs = libsvn_wc libsvn_ra libsvn_delta libsvn_diff libsvn_subr apriconv apr install = lib -msvc-export = svn_client.h private/svn_client_private.h +msvc-export = svn_client.h private/svn_client_mtcc.h private/svn_client_private.h # Routines for binary diffing and tree-deltas [libsvn_delta] @@ -248,6 +276,7 @@ add-install-deps = $(SVN_FS_LIB_INSTALL_DEPS) msvc-export = svn_fs.h private/svn_fs_private.h [libsvn_fs_base] +description = Subversion Filesystem Base Library type = fs-module path = subversion/libsvn_fs_base sources = *.c bdb/*.c util/*.c @@ -256,14 +285,24 @@ libs = libsvn_delta libsvn_subr aprutil apriconv apr bdb libsvn_fs_util msvc-static = yes [libsvn_fs_fs] +description = Subversion FSFS Repository Filesystem Library type = fs-module path = subversion/libsvn_fs_fs install = fsmod-lib libs = libsvn_delta libsvn_subr aprutil apriconv apr libsvn_fs_util msvc-static = yes +[libsvn_fs_x] +description = Subversion FSX Repository Filesystem Library +type = fs-module +path = subversion/libsvn_fs_x +install = fsmod-lib +libs = libsvn_delta libsvn_subr aprutil apriconv apr libsvn_fs_util +msvc-static = yes + # Low-level grab bag of utilities [libsvn_fs_util] +description = Subversion Filesystem Utility Library type = lib install = fsmod-lib path = subversion/libsvn_fs_util @@ -273,7 +312,7 @@ msvc-static = yes # General API for accessing repositories [libsvn_ra] -description = Subversion Repository Access Library +description = Subversion General Repository Access Library type = lib path = subversion/libsvn_ra libs = libsvn_delta libsvn_subr ra-libs apriconv apr @@ -285,15 +324,16 @@ msvc-export = svn_ra.h private\svn_ra_private.h # Accessing repositories via DAV through serf [libsvn_ra_serf] +description = Subversion HTTP/WebDAV Protocol Repository Access Library type = ra-module path = subversion/libsvn_ra_serf install = serf-lib -libs = libsvn_delta libsvn_subr aprutil apriconv apr serf xml -msvc-libs = secur32.lib +libs = libsvn_delta libsvn_subr aprutil apriconv apr serf xml zlib msvc-static = yes # Accessing repositories via SVN [libsvn_ra_svn] +description = Subversion SVN Protocol Repository Access Library type = ra-module path = subversion/libsvn_ra_svn install = ramod-lib @@ -302,6 +342,7 @@ msvc-static = yes # Accessing repositories via direct libsvn_fs [libsvn_ra_local] +description = Subversion Local Repository Access Library type = ra-module path = subversion/libsvn_ra_local install = ramod-lib @@ -323,7 +364,7 @@ description = Subversion General Utility Library type = lib install = fsmod-lib path = subversion/libsvn_subr -libs = aprutil apriconv apr xml zlib apr_memcache sqlite magic +libs = aprutil apriconv apr xml zlib apr_memcache sqlite magic intl msvc-libs = kernel32.lib advapi32.lib shfolder.lib ole32.lib crypt32.lib version.lib msvc-export = @@ -332,7 +373,7 @@ msvc-export = svn_error.h svn_hash.h svn_io.h svn_iter.h svn_md5.h svn_mergeinfo.h svn_nls.h svn_opt.h svn_path.h svn_pools.h svn_props.h svn_quoprint.h svn_sorts.h svn_string.h svn_subst.h svn_time.h svn_types.h svn_user.h - svn_utf.h svn_version.h svn_xml.h + svn_utf.h svn_version.h svn_xml.h svn_x509.h private\svn_atomic.h private\svn_cache.h private\svn_cmdline_private.h private\svn_debug.h private\svn_error_private.h private\svn_fspath.h private\svn_log.h private\svn_mergeinfo_private.h @@ -340,9 +381,10 @@ msvc-export = private\svn_utf_private.h private\svn_eol_private.h private\svn_token.h private\svn_adler32.h private\svn_temp_serializer.h private\svn_io_private.h + private\svn_sorts_private.h private\svn_auth_private.h private\svn_string_private.h private\svn_magic.h - private\svn_subr_private.h private\svn_mutex.h private\svn_named_atomic.h - private\svn_cert.h + private\svn_subr_private.h private\svn_mutex.h + private\svn_packed_data.h private\svn_object_pool.h private\svn_cert.h # Working copy management lib [libsvn_wc] @@ -360,10 +402,9 @@ when = INSTALL_APACHE_MODS type = apache-mod path = subversion/mod_dav_svn sources = *.c reports/*.c posts/*.c -libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr +libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr libhttpd mod_dav nonlibs = apr aprutil install = apache-mod -msvc-libs = mod_dav.lib libhttpd.lib [mod_authz_svn] description = Subversion path-based authorization module for Apache @@ -371,9 +412,8 @@ when = INSTALL_APACHE_MODS type = apache-mod path = subversion/mod_authz_svn nonlibs = mod_dav_svn apr aprutil -libs = libsvn_repos libsvn_subr +libs = libsvn_repos libsvn_subr libhttpd install = apache-mod -msvc-libs = libhttpd.lib [mod_dontdothat] description = Apache Httpd module to block certain kinds of Apache Subversion requests @@ -381,21 +421,35 @@ when = INSTALL_APACHE_MODS type = apache-mod path = tools/server-side/mod_dontdothat nonlibs = mod_dav_svn apr aprutil -libs = libsvn_subr xml +libs = libsvn_subr xml libhttpd install = tools -msvc-libs = libhttpd.lib + +# The Subversion FSFS repository manipulation tool +[svnfsfs] +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 +msvc-libs = setargv.obj # ---------------------------------------------------------------------------- # # CONSTRUCTED HEADERS # -[rep_cache] -description = Schema for the rep-sharing feature +[rep_cache_fs_fs] +description = Schema for the FSFS rep-sharing feature type = sql-header path = subversion/libsvn_fs_fs sources = rep-cache-db.sql +[rep_cache_fs_x] +description = Schema for the FSX rep-sharing feature +type = sql-header +path = subversion/libsvn_fs_x +sources = rep-cache-db.sql + [wc_queries] desription = Queries on the WC database type = sql-header @@ -408,6 +462,11 @@ type = sql-header path = subversion/libsvn_subr sources = internal_statements.sql +[wc_test_queries] +description = Queries using working copy tests +type = sql-header +path = subversion/tests/libsvn_wc +sources = wc-test-queries.sql # ---------------------------------------------------------------------------- # @@ -431,7 +490,6 @@ sources = core.i libs = libsvn_swig_py libsvn_swig_perl libsvn_swig_ruby libsvn_diff libsvn_subr apr description = Subversion core library bindings -include-runtime = yes [swig_client] type = swig @@ -501,35 +559,39 @@ description = Subversion WC library bindings type = swig_lib lang = python path = subversion/bindings/swig/python/libsvn_swig_py -libs = libsvn_client libsvn_wc libsvn_ra libsvn_delta libsvn_subr apriconv apr +libs = libsvn_client libsvn_wc libsvn_ra libsvn_delta libsvn_subr + apriconv apr python swig link-cmd = $(LINK) install = swig-py-lib # need special build rule to include -DSWIGPYTHON compile-cmd = $(COMPILE_SWIG_PY) msvc-static = no +msvc-export = ../bindings/swig/python/libsvn_swig_py/swigutil_py.h # SWIG utility library for Perl modules [libsvn_swig_perl] type = swig_lib lang = perl path = subversion/bindings/swig/perl/libsvn_swig_perl -libs = libsvn_delta libsvn_subr apriconv apr +libs = libsvn_delta libsvn_subr apriconv apr perl swig install = swig-pl-lib # need special build rule to include compile-cmd = $(COMPILE_SWIG_PL) -msvc-static = yes +msvc-static = no +msvc-export = ../bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h # SWIG utility library for Ruby modules [libsvn_swig_ruby] type = swig_lib lang = ruby path = subversion/bindings/swig/ruby/libsvn_swig_ruby -libs = libsvn_client libsvn_wc libsvn_delta libsvn_subr apriconv apr +libs = libsvn_client libsvn_wc libsvn_delta libsvn_subr apriconv apr ruby swig link-cmd = $(LINK) $(SWIG_RB_LIBS) install = swig-rb-lib # need special build rule to include compile-cmd = $(COMPILE_SWIG_RB) msvc-static = no +msvc-export = ../bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.h # ---------------------------------------------------------------------------- # @@ -539,7 +601,9 @@ msvc-static = no 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 install = javahl-java @@ -552,7 +616,7 @@ type = java path = subversion/bindings/javahl/src/org/tigris/subversion/javahl sources = *.java install = javahl-java -link-cmd = $(COMPILE_JAVAHL_JAVAC) +link-cmd = $(COMPILE_JAVAHL_COMPAT_JAVAC) classes = subversion/bindings/javahl/classes add-deps = $(javahl_java_DEPS) ### Replace JAR call in INSTALL_EXTRA_JAVAHL_JAVA macro Makefile.in. @@ -576,15 +640,37 @@ type = java path = subversion/bindings/javahl/tests/org/tigris/subversion/javahl sources = *.java install = javahl-java -link-cmd = $(COMPILE_JAVAHL_JAVAC) +link-cmd = $(COMPILE_JAVAHL_COMPAT_JAVAC) classes = subversion/bindings/javahl/classes package-roots = org ### 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 +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 + +[javahl-remote-javah] +type = javah +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 + [javahl-types-javah] -type = javah +type = javah path = subversion/bindings/javahl/src/org/apache/subversion/javahl/types classes = subversion/bindings/javahl/classes headers = subversion/bindings/javahl/include @@ -594,19 +680,19 @@ 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 +[javahl-util-javah] +type = javah +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.callback +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 +type = javah path = subversion/bindings/javahl/src/org/apache/subversion/javahl classes = subversion/bindings/javahl/classes headers = subversion/bindings/javahl/include @@ -621,9 +707,11 @@ description = Subversion Java HighLevel binding type = lib 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 -sources = *.cpp *.c -add-deps = $(javahl_javah_DEPS) $(javahl_java_DEPS) $(javahl_callback_javah_DEPS) $(javahl_types_javah_DEPS) + 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) install = javahl-lib # need special build rule to include -I$(JDK)/include/jni.h compile-cmd = $(COMPILE_JAVAHL_CXX) @@ -640,7 +728,7 @@ type = lib path = subversion/bindings/cxxhl libs = libsvn_repos libsvn_client libsvn_wc libsvn_ra libsvn_delta libsvn_diff libsvn_subr libsvn_fs aprutil apriconv apr -sources = src/*.cpp +sources = src/*.cpp src/aprwrap/*.cpp install = cxxhl-lib msvc-static = yes compile-cmd = $(COMPILE_CXXHL_CXX) @@ -648,14 +736,32 @@ link-cmd = $(LINK_CXX_LIB) [cxxhl-tests] description = Unit tests for Subversion C++ HighLevel bindings +when = SVN_USE_GMOCK type = exe path = subversion/bindings/cxxhl -libs = libsvncxxhl libsvn_subr +libs = libsvncxxhl libgmock libsvn_subr apr sources = tests/*.cpp install = tests -compile-cmd = $(COMPILE_CXXHL_CXX) +compile-cmd = $(COMPILE_CXXHL_GMOCK_CXX) link-cmd = $(LINK_CXX) + +# ---------------------------------------------------------------------------- +# +# Gmock targets +# + +[libgmock] +description = Googlemock Library +when = SVN_USE_GMOCK +type = lib +path = gmock-fused +sources = gmock-gtest-all.cc +install = tests +msvc-static = yes +compile-cmd = $(COMPILE_GMOCK_CXX) +link-cmd = $(LINK_CXX_LIB) + # ---------------------------------------------------------------------------- # # TESTING TARGETS @@ -702,15 +808,52 @@ libs = libsvn_test libsvn_fs libsvn_fs_base libsvn_delta # ---------------------------------------------------------------------------- # Tests for libsvn_fs_fs -[fs-pack-test] +[fs-fs-pack-test] description = Test fsfs packing in libsvn_fs_fs type = exe path = subversion/tests/libsvn_fs_fs -sources = fs-pack-test.c +sources = fs-fs-pack-test.c install = test libs = libsvn_test libsvn_fs libsvn_fs_fs libsvn_delta libsvn_subr apriconv apr +[fs-fs-fuzzy-test] +description = Use fuzzying to test FSFS corruption resilience +type = exe +path = subversion/tests/libsvn_fs_fs +sources = fs-fs-fuzzy-test.c +install = sub-test +libs = libsvn_test libsvn_fs libsvn_fs_fs libsvn_delta + libsvn_repos libsvn_subr apriconv apr + +[fs-fs-private-test] +description = Test FSSF private API +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 + libsvn_repos libsvn_subr apriconv apr + +# ---------------------------------------------------------------------------- +# Tests for libsvn_fs_x +[fs-x-pack-test] +description = Test fsx packing in libsvn_fs_x +type = exe +path = subversion/tests/libsvn_fs_x +sources = fs-x-pack-test.c +install = test +libs = libsvn_test libsvn_fs libsvn_fs_x libsvn_delta + libsvn_subr apriconv apr + +[string-table-test] +description = Test fsfs string tables +type = exe +path = subversion/tests/libsvn_fs_x +sources = string-table-test.c +install = test +libs = libsvn_test libsvn_fs_x libsvn_subr apr + # ---------------------------------------------------------------------------- # Tests for libsvn_fs @@ -721,6 +864,7 @@ path = subversion/tests/libsvn_fs sources = locks-test.c install = test libs = libsvn_test libsvn_fs libsvn_delta libsvn_subr apriconv apr +msvc-force-static = yes [fs-test] description = Test locks in libsvn_fs @@ -729,7 +873,7 @@ path = subversion/tests/libsvn_fs sources = fs-test.c install = test libs = libsvn_test libsvn_fs libsvn_delta - libsvn_subr aprutil apriconv apr + libsvn_fs_util libsvn_subr aprutil apriconv apr # ---------------------------------------------------------------------------- # Tests for libsvn_repos @@ -742,6 +886,14 @@ sources = repos-test.c dir-delta-editor.c install = test libs = libsvn_test libsvn_repos libsvn_fs libsvn_delta libsvn_subr apriconv apr +[dump-load-test] +description = Test dumping/loading repositories in libsvn_repos +type = exe +path = subversion/tests/libsvn_repos +sources = dump-load-test.c +install = test +libs = libsvn_test libsvn_repos libsvn_fs libsvn_delta libsvn_subr apriconv apr + # ---------------------------------------------------------------------------- # Tests for libsvn_subr @@ -753,6 +905,14 @@ sources = auth-test.c install = test libs = libsvn_test libsvn_subr apr +[bit-array-test] +description = Test packed bit arrays +type = exe +path = subversion/tests/libsvn_subr +sources = bit-array-test.c +install = test +libs = libsvn_test libsvn_subr apr + [cache-test] description = Test in-memory cache type = exe @@ -768,6 +928,7 @@ path = subversion/tests/libsvn_subr sources = checksum-test.c install = test libs = libsvn_test libsvn_subr apr zlib +msvc-force-static = yes [compat-test] description = Test compatibility functions @@ -792,6 +953,7 @@ path = subversion/tests/libsvn_subr sources = crypto-test.c install = test libs = libsvn_test libsvn_subr aprutil apr +msvc-force-static = yes [dirent_uri-test] description = Test dirent_uri library @@ -849,27 +1011,35 @@ sources = mergeinfo-test.c install = test libs = libsvn_test libsvn_subr apr -[named_atomic-test] -description = Test named atomics +[packed-data-test] +description = Test path library type = exe path = subversion/tests/libsvn_subr -sources = named_atomic-test.c +sources = packed-data-test.c install = test -libs = libsvn_test libsvn_subr apr +libs = libsvn_test libsvn_subr apriconv apr -[named_atomic-proc-test] -description = Sub-process for named atomics +[path-test] +description = Test path library type = exe path = subversion/tests/libsvn_subr -sources = named_atomic-test-proc.c -install = sub-test -libs = libsvn_subr apr +sources = path-test.c +install = test +libs = libsvn_test libsvn_subr apriconv apr -[path-test] +[prefix-string-test] description = Test path library type = exe path = subversion/tests/libsvn_subr -sources = path-test.c +sources = prefix-string-test.c +install = test +libs = libsvn_test libsvn_subr apriconv apr + +[priority-queue-test] +description = Test path library +type = exe +path = subversion/tests/libsvn_subr +sources = priority-queue-test.c install = test libs = libsvn_test libsvn_subr apriconv apr @@ -881,6 +1051,14 @@ sources = revision-test.c install = test libs = libsvn_test libsvn_subr apr +[root-pools-test] +description = Test time functions +type = exe +path = subversion/tests/libsvn_subr +sources = root-pools-test.c +install = test +libs = libsvn_test libsvn_subr apriconv apr + [skel-test] description = Test skels in libsvn_subr type = exe @@ -913,6 +1091,14 @@ sources = string-test.c install = test libs = libsvn_test libsvn_subr apriconv apr +[sqlite-test] +description = Test stream library +type = exe +path = subversion/tests/libsvn_subr +sources = sqlite-test.c +install = test +libs = libsvn_test libsvn_subr apriconv apr + [time-test] description = Test time functions type = exe @@ -945,6 +1131,15 @@ sources = translate-test.c install = test libs = libsvn_test libsvn_subr apriconv apr +[x509-test] +description = Test x509 parser +type = exe +path = subversion/tests/libsvn_subr +sources = x509-test.c +install = test +libs = libsvn_test libsvn_subr apriconv apr + + # ---------------------------------------------------------------------------- # Tests for libsvn_delta @@ -974,6 +1169,15 @@ path = subversion/tests/libsvn_client sources = client-test.c install = test libs = libsvn_test libsvn_client libsvn_wc libsvn_repos libsvn_ra libsvn_fs libsvn_delta libsvn_subr apriconv apr +msvc-force-static = yes + +[mtcc-test] +description = Test Multi Command Context +type = exe +path = subversion/tests/libsvn_client +sources = mtcc-test.c +install = test +libs = libsvn_test libsvn_client libsvn_wc libsvn_repos libsvn_ra libsvn_fs libsvn_delta libsvn_subr apriconv apr # ---------------------------------------------------------------------------- # Tests for libsvn_diff @@ -1003,7 +1207,7 @@ type = exe path = subversion/tests/libsvn_ra sources = ra-test.c install = test -libs = libsvn_test libsvn_ra libsvn_fs libsvn_delta libsvn_subr +libs = libsvn_test libsvn_ra libsvn_ra_svn libsvn_fs libsvn_delta libsvn_subr apriconv apr # ---------------------------------------------------------------------------- @@ -1028,6 +1232,7 @@ path = subversion/tests/libsvn_wc sources = conflict-data-test.c utils.c install = test libs = libsvn_client libsvn_test libsvn_wc libsvn_subr apriconv apr +msvc-force-static = yes [db-test] description = Test the wc-ng database subsystem @@ -1036,6 +1241,7 @@ path = subversion/tests/libsvn_wc sources = db-test.c utils.c install = test libs = libsvn_client libsvn_test libsvn_wc libsvn_subr apriconv apr +msvc-force-static = yes [pristine-store-test] description = Test the wc-ng pristine text storage subsystem @@ -1044,6 +1250,7 @@ path = subversion/tests/libsvn_wc sources = pristine-store-test.c utils.c install = test libs = libsvn_client libsvn_test libsvn_wc libsvn_subr apriconv apr +msvc-force-static = yes [entries-compat-test] description = Test backwards compat for the entry interface @@ -1052,6 +1259,7 @@ path = subversion/tests/libsvn_wc sources = entries-compat.c utils.c install = test libs = libsvn_client libsvn_test libsvn_wc libsvn_subr apriconv apr +msvc-force-static = yes [op-depth-test] description = Test layered tree changes @@ -1060,12 +1268,13 @@ path = subversion/tests/libsvn_wc sources = op-depth-test.c utils.c install = test libs = libsvn_client libsvn_test libsvn_wc libsvn_subr apriconv apr +msvc-force-static = yes [wc-queries-test] description = Test Sqlite query evaluation type = exe path = subversion/tests/libsvn_wc -sources = wc-queries-test.c +sources = wc-queries-test.c ../../libsvn_subr/sqlite3wrapper.c install = test libs = libsvn_test libsvn_subr apriconv apr sqlite @@ -1076,6 +1285,7 @@ path = subversion/tests/libsvn_wc sources = wc-test.c utils.c install = test libs = libsvn_client libsvn_test libsvn_wc libsvn_subr apriconv apr +msvc-force-static = yes # ---------------------------------------------------------------------------- # These are not unit tests at all, they are small programs that exercise @@ -1107,6 +1317,7 @@ path = subversion/tests/cmdline sources = entries-dump.c install = test libs = libsvn_wc libsvn_subr apriconv apr +msvc-force-static = yes testing = skip [atomic-ra-revprop-change] @@ -1117,12 +1328,21 @@ install = test libs = libsvn_ra libsvn_subr apriconv apr testing = skip +[lock-helper] +type = exe +path = subversion/tests/cmdline +sources = lock-helper.c +install = test +libs = libsvn_fs libsvn_subr apriconv apr +testing = skip + [wc-lock-tester] type = exe path = subversion/tests/libsvn_wc sources = wc-lock-tester.c install = test libs = libsvn_wc libsvn_subr apriconv apr +msvc-force-static = yes testing = skip [wc-incomplete-tester] @@ -1131,6 +1351,16 @@ path = subversion/tests/libsvn_wc sources = wc-incomplete-tester.c install = test libs = libsvn_wc libsvn_subr apriconv apr +msvc-force-static = yes +testing = skip + +[svn-wc-db-tester] +type = exe +path = tools/dev/wc-ng +sources = svn-wc-db-tester.c +install = test +libs = libsvn_wc libsvn_subr apr +msvc-force-static = yes testing = skip # ---------------------------------------------------------------------------- @@ -1142,15 +1372,25 @@ testing = skip type = lib external-lib = $(SVN_APR_LIBS) msvc-libs = ws2_32.lib rpcrt4.lib mswsock.lib +pkg-config = apr-@SVN_APR_MAJOR_VERSION@ [aprutil] type = lib external-lib = $(SVN_APRUTIL_LIBS) +pkg-config = apr-util-@SVN_APR_MAJOR_VERSION@ [apriconv] type = lib external-lib = $(SVN_APRUTIL_LIBS) +[libhttpd] +type = lib +external-lib = $(SVN_HTTPD_LIBS) + +[mod_dav] +type = lib +external-lib = $(SVN_MOD_DAV_LIBS) + [bdb] type = lib external-lib = $(SVN_DB_LIBS) @@ -1158,6 +1398,7 @@ external-lib = $(SVN_DB_LIBS) [gnome-keyring] type = lib external-lib = $(SVN_GNOME_KEYRING_LIBS) +pkg-config = gnome-keyring-1 [kwallet] type = lib @@ -1171,10 +1412,18 @@ external-lib = $(SVN_MAGIC_LIBS) type = lib external-lib = $(SVN_SASL_LIBS) +[openssl] +type = lib +external-lib = $(SVN_OPENSSL_LIBS) +msvc-libs = ssleay32.lib libeay32.lib + +[intl] +type = lib +external-lib = $(SVN_INTL_LIBS) + [zlib] type = lib external-lib = $(SVN_ZLIB_LIBS) -external-project = zlib msvc-static = yes [apr_memcache] @@ -1184,18 +1433,41 @@ external-lib = $(SVN_APR_MEMCACHE_LIBS) [serf] type = lib external-lib = $(SVN_SERF_LIBS) -external-project = serf/serf -libs = apr aprutil xml -msvc-static = yes +libs = apr aprutil openssl xml zlib +msvc-libs = secur32.lib +pkg-config = serf-1 +pkg-config-private = yes [sqlite] type = lib external-lib = $(SVN_SQLITE_LIBS) +pkg-config = sqlite3 +pkg-config-private = yes [xml] type = lib external-lib = $(SVN_XML_LIBS) +[swig] +type = lib +external-lib = $(SVN_SWIG_LIBS) + +[perl] +type = lib +external-lib = $(SVN_PERL_LIBS) + +[python] +type = lib +external-lib = $(SVN_PYTHON_LIBS) + +[ruby] +type = lib +external-lib = $(SVN_RUBY_LIBS) + +[java-sdk] +type = lib +external-lib = $(SVN_JAVA_SDK_LIBS) + [ra-libs] type = lib external-lib = $(SVN_RA_LIB_LINK) @@ -1204,7 +1476,7 @@ libs = libsvn_ra_serf libsvn_ra_local libsvn_ra_svn [fs-libs] type = lib external-lib = $(SVN_FS_LIB_LINK) -libs = libsvn_fs_base libsvn_fs_fs +libs = libsvn_fs_base libsvn_fs_fs libsvn_fs_x [__ALL__] type = project @@ -1213,37 +1485,44 @@ libs = svn svnadmin svndumpfilter svnlook svnmucc svnserve svnrdump svnsync svnversion mod_authz_svn mod_dav_svn mod_dontdothat svnauthz svnauthz-validate svnraisetreeconflict + svnfsfs svnbench [__ALL_TESTS__] type = project path = build/win32 libs = __ALL__ - fs-test fs-base-test fs-fsfs-test fs-pack-test skel-test - strings-reps-test changes-test locks-test repos-test + fs-test fs-base-test fs-fsfs-test fs-fs-pack-test fs-fs-fuzzy-test + fs-fs-private-test fs-x-pack-test string-table-test + skel-test strings-reps-test changes-test locks-test + repos-test dump-load-test checksum-test compat-test config-test hashdump-test mergeinfo-test - opt-test path-test stream-test string-test time-test utf-test + opt-test packed-data-test path-test prefix-string-test + priority-queue-test root-pools-test stream-test + string-test time-test utf-test bit-array-test error-test error-code-test cache-test spillbuf-test crypto-test - named_atomic-test named_atomic-proc-test revision-test + revision-test subst_translate-test io-test translate-test random-test window-test diff-diff3-test ra-test ra-local-test + sqlite-test svndiff-test vdelta-test entries-dump atomic-ra-revprop-change wc-lock-tester wc-incomplete-tester - client-test + lock-helper + client-test mtcc-test 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 + parse-diff-test x509-test [__MORE__] type = project path = build/win32 libs = __ALL_TESTS__ - diff diff3 diff4 fsfs-reorg fsfs-stats fsfs-access-map svn-bench - svn-rep-sharing-stats svn-populate-node-origins-index + diff diff3 diff4 fsfs-access-map svnauth + svn-populate-node-origins-index x509-parser svn-wc-db-tester [__LIBS__] type = project @@ -1286,20 +1565,6 @@ libs = __JAVAHL__ javahl-tests javahl-compat-tests # ---------------------------------------------------------------------------- # Contrib and tools -[fsfs-reorg] -type = exe -path = tools/dev -sources = fsfs-reorg.c -install = tools -libs = libsvn_delta libsvn_subr apr - -[fsfs-stats] -type = exe -path = tools/server-side -sources = fsfs-stats.c -install = tools -libs = libsvn_delta libsvn_subr apr - [fsfs-access-map] type = exe path = tools/dev @@ -1328,10 +1593,11 @@ sources = diff4.c install = tools libs = libsvn_diff libsvn_subr apriconv apr -[svn-bench] +[svnbench] +description = Benchmarking and diagnostics tool for the network layer type = exe -path = tools/client-side/svn-bench -install = tools +path = subversion/svnbench +install = bin libs = libsvn_client libsvn_wc libsvn_ra libsvn_subr libsvn_delta apriconv apr @@ -1371,9 +1637,10 @@ path = tools/dev/svnraisetreeconflict libs = libsvn_wc libsvn_subr apriconv apr install = tools -[svn-rep-sharing-stats] +[x509-parser] +description = Tool to verify x509 certificates type = exe -path = tools/server-side -sources = svn-rep-sharing-stats.c +path = tools/dev +sources = x509-parser.c install = tools -libs = libsvn_repos libsvn_fs libsvn_fs_fs libsvn_subr apriconv apr +libs = libsvn_subr apr |