diff options
Diffstat (limited to 'build.conf')
| -rw-r--r-- | build.conf | 178 |
1 files changed, 141 insertions, 37 deletions
diff --git a/build.conf b/build.conf index 4f020da1b055..8f5617b0a679 100644 --- a/build.conf +++ b/build.conf @@ -45,7 +45,9 @@ private-includes = subversion/bindings/cxxhl/src/private/*.hpp subversion/bindings/javahl/native/*.hpp subversion/bindings/javahl/native/jniwrapper/jni_*.hpp - subversion/libsvn_subr/utf8proc/utf8proc.h + tools/dev/svnmover/linenoise/linenoise.h + tools/dev/svnmover/linenoise/linenoise.c + subversion/libsvn_subr/utf8proc/utf8proc_internal.h subversion/libsvn_subr/utf8proc/utf8proc.c subversion/libsvn_subr/utf8proc/utf8proc_data.c private-built-includes = @@ -96,9 +98,9 @@ test-scripts = bdb-test-scripts = -swig-python-opts = $(SWIG_CPPFLAGS) -python -classic -swig-perl-opts = $(SWIG_CPPFLAGS) -perl -nopm -noproxy -swig-ruby-opts = $(SWIG_CPPFLAGS) -ruby +swig-python-opts = $(SWIG_FEATURES) -python $(SWIG_PY_FEATURES) -classic +swig-perl-opts = $(SWIG_FEATURES) -perl $(SWIG_PL_FEATURES) -nopm -noproxy +swig-ruby-opts = $(SWIG_FEATURES) -ruby $(SWIG_RB_FEATURES) swig-languages = python perl ruby swig-dirs = subversion/bindings/swig/python @@ -222,7 +224,7 @@ manpages = subversion/svnmucc/svnmucc.1 # Support for GNOME Keyring [libsvn_auth_gnome_keyring] description = Subversion GNOME Keyring Library -type = lib +type = shared-only-lib install = gnome-keyring-lib path = subversion/libsvn_auth_gnome_keyring libs = libsvn_subr apr gnome-keyring @@ -230,7 +232,7 @@ libs = libsvn_subr apr gnome-keyring # Support for KWallet [libsvn_auth_kwallet] description = Subversion KWallet Library -type = lib +type = shared-only-cxx-lib install = kwallet-lib path = subversion/libsvn_auth_kwallet libs = libsvn_subr apr kwallet @@ -252,7 +254,7 @@ type = lib install = fsmod-lib path = subversion/libsvn_delta libs = libsvn_subr aprutil apriconv apr zlib -msvc-export = svn_delta.h private/svn_editor.h private/svn_delta_private.h +msvc-export = svn_delta.h private/svn_editor.h private/svn_delta_private.h private/svn_element.h private/svn_branch.h private/svn_branch_compat.h private/svn_branch_impl.h private/svn_branch_nested.h private/svn_branch_repos.h # Routines for diffing [libsvn_diff] @@ -282,7 +284,8 @@ path = subversion/libsvn_fs_base sources = *.c bdb/*.c util/*.c install = bdb-lib libs = libsvn_delta libsvn_subr aprutil apriconv apr bdb libsvn_fs_util -msvc-static = yes +msvc-export = ../libsvn_fs_base/fs_init.h +msvc-delayload = yes [libsvn_fs_fs] description = Subversion FSFS Repository Filesystem Library @@ -290,7 +293,8 @@ 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 +msvc-export = private/svn_fs_fs_private.h ../libsvn_fs_fs/fs_init.h +msvc-delayload = yes [libsvn_fs_x] description = Subversion FSX Repository Filesystem Library @@ -298,7 +302,8 @@ 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 +msvc-export = ../libsvn_fs_x/fs_init.h +msvc-delayload = yes # Low-level grab bag of utilities [libsvn_fs_util] @@ -308,7 +313,7 @@ install = fsmod-lib path = subversion/libsvn_fs_util libs = libsvn_subr aprutil apriconv apr msvc-libs = advapi32.lib shfolder.lib -msvc-static = yes +msvc-export = private/svn_fs_util.h # General API for accessing repositories [libsvn_ra] @@ -321,6 +326,7 @@ add-deps = $(SVN_RA_LIB_DEPS) add-install-deps = $(SVN_RA_LIB_INSTALL_DEPS) install = lib msvc-export = svn_ra.h private\svn_ra_private.h +msvc-delayload = yes # Accessing repositories via DAV through serf [libsvn_ra_serf] @@ -328,7 +334,7 @@ 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 zlib +libs = libsvn_delta libsvn_subr aprutil apriconv apr serf zlib msvc-static = yes # Accessing repositories via SVN @@ -356,7 +362,7 @@ type = lib path = subversion/libsvn_repos install = ramod-lib libs = libsvn_fs libsvn_delta libsvn_subr apriconv apr -msvc-export = svn_repos.h private/svn_repos_private.h +msvc-export = svn_repos.h private/svn_repos_private.h ../libsvn_repos/authz.h # Low-level grab bag of utilities [libsvn_subr] @@ -364,7 +370,8 @@ description = Subversion General Utility Library type = lib install = fsmod-lib path = subversion/libsvn_subr -libs = aprutil apriconv apr xml zlib apr_memcache sqlite magic intl +sources = *.c lz4/*.c +libs = aprutil apriconv apr xml zlib apr_memcache sqlite magic intl lz4 utf8proc msvc-libs = kernel32.lib advapi32.lib shfolder.lib ole32.lib crypt32.lib version.lib msvc-export = @@ -385,6 +392,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 # Working copy management lib [libsvn_wc] @@ -421,7 +429,7 @@ when = INSTALL_APACHE_MODS type = apache-mod path = tools/server-side/mod_dontdothat nonlibs = mod_dav_svn apr aprutil -libs = libsvn_subr xml libhttpd +libs = libsvn_subr libhttpd install = tools # The Subversion FSFS repository manipulation tool @@ -431,7 +439,6 @@ 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 # ---------------------------------------------------------------------------- # @@ -567,6 +574,7 @@ install = swig-py-lib compile-cmd = $(COMPILE_SWIG_PY) msvc-static = no msvc-export = ../bindings/swig/python/libsvn_swig_py/swigutil_py.h +description = Subversion utility library for Python bindings # SWIG utility library for Perl modules [libsvn_swig_perl] @@ -736,30 +744,30 @@ link-cmd = $(LINK_CXX_LIB) [cxxhl-tests] description = Unit tests for Subversion C++ HighLevel bindings -when = SVN_USE_GMOCK +when = SVN_USE_GOOGLEMOCK type = exe path = subversion/bindings/cxxhl -libs = libsvncxxhl libgmock libsvn_subr apr +libs = libsvncxxhl libgooglemock libsvn_subr apr sources = tests/*.cpp -install = tests -compile-cmd = $(COMPILE_CXXHL_GMOCK_CXX) +install = cxxhl-tests +compile-cmd = $(COMPILE_CXXHL_GOOGLEMOCK_CXX) link-cmd = $(LINK_CXX) # ---------------------------------------------------------------------------- # -# Gmock targets +# Googlemock targets # -[libgmock] +[libgooglemock] description = Googlemock Library -when = SVN_USE_GMOCK +when = SVN_USE_GOOGLEMOCK type = lib -path = gmock-fused -sources = gmock-gtest-all.cc -install = tests +path = googlemock +sources = googletest/src/gtest-all.cc googlemock/src/gmock-all.cc +install = cxxhl-tests msvc-static = yes -compile-cmd = $(COMPILE_GMOCK_CXX) +compile-cmd = $(COMPILE_GOOGLEMOCK_CXX) link-cmd = $(LINK_CXX_LIB) # ---------------------------------------------------------------------------- @@ -787,6 +795,7 @@ sources = fs-base-test.c install = bdb-test libs = libsvn_test libsvn_fs libsvn_fs_base libsvn_delta libsvn_fs_util libsvn_subr apriconv apr +msvc-force-static = yes [strings-reps-test] description = Test strings/reps in libsvn_fs_base @@ -796,6 +805,7 @@ sources = strings-reps-test.c install = bdb-test libs = libsvn_test libsvn_fs libsvn_fs_base libsvn_delta libsvn_subr apriconv apr +msvc-force-static = yes [changes-test] description = Test changes in libsvn_fs_base @@ -805,6 +815,7 @@ sources = changes-test.c install = bdb-test libs = libsvn_test libsvn_fs libsvn_fs_base libsvn_delta libsvn_subr apriconv apr +msvc-force-static = yes # ---------------------------------------------------------------------------- # Tests for libsvn_fs_fs @@ -816,6 +827,7 @@ sources = fs-fs-pack-test.c install = test libs = libsvn_test libsvn_fs libsvn_fs_fs libsvn_delta libsvn_subr apriconv apr +msvc-force-static = yes [fs-fs-fuzzy-test] description = Use fuzzying to test FSFS corruption resilience @@ -825,6 +837,7 @@ 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 +msvc-force-static = yes [fs-fs-private-test] description = Test FSSF private API @@ -834,6 +847,7 @@ sources = fs-fs-private-test.c install = test libs = libsvn_test libsvn_fs libsvn_fs_fs libsvn_delta libsvn_repos libsvn_subr apriconv apr +msvc-force-static = yes # ---------------------------------------------------------------------------- # Tests for libsvn_fs_x @@ -845,6 +859,7 @@ sources = fs-x-pack-test.c install = test libs = libsvn_test libsvn_fs libsvn_fs_x libsvn_delta libsvn_subr apriconv apr +msvc-force-static = yes [string-table-test] description = Test fsfs string tables @@ -853,6 +868,7 @@ path = subversion/tests/libsvn_fs_x sources = string-table-test.c install = test libs = libsvn_test libsvn_fs_x libsvn_subr apr +msvc-force-static = yes # ---------------------------------------------------------------------------- # Tests for libsvn_fs @@ -867,7 +883,7 @@ libs = libsvn_test libsvn_fs libsvn_delta libsvn_subr apriconv apr msvc-force-static = yes [fs-test] -description = Test locks in libsvn_fs +description = Tests in libsvn_fs type = exe path = subversion/tests/libsvn_fs sources = fs-test.c @@ -875,9 +891,26 @@ install = test libs = libsvn_test libsvn_fs libsvn_delta libsvn_fs_util libsvn_subr aprutil apriconv apr +[fs-sequential-test] +description = Tests in libsvn_fs run sequentially +type = exe +path = subversion/tests/libsvn_fs +sources = fs-sequential-test.c +install = test +libs = libsvn_test libsvn_fs libsvn_delta + libsvn_fs_util libsvn_subr aprutil apriconv apr + # ---------------------------------------------------------------------------- # Tests for libsvn_repos +[authz-test] +description = Test authz parsing in libsvn_repos +type = exe +path = subversion/tests/libsvn_repos +sources = authz-test.c +install = test +libs = libsvn_test libsvn_repos libsvn_fs libsvn_delta libsvn_subr apriconv apr + [repos-test] description = Test delta editor in libsvn_repos type = exe @@ -1139,6 +1172,21 @@ sources = x509-test.c install = test libs = libsvn_test libsvn_subr apriconv apr +[xml-test] +description = Test XML parser in libsvn_subr +type = exe +path = subversion/tests/libsvn_subr +sources = xml-test.c +install = test +libs = libsvn_test libsvn_subr apriconv apr + +[compress-test] +description = Test compression functions +type = exe +path = subversion/tests/libsvn_subr +sources = compress-test.c +install = test +libs = libsvn_test libsvn_subr apr # ---------------------------------------------------------------------------- # Tests for libsvn_delta @@ -1159,6 +1207,14 @@ sources = window-test.c install = test libs = libsvn_test libsvn_delta libsvn_subr apriconv apr +[svndiff-stream-test] +description = Test svndiff streams +type = exe +path = subversion/tests/libsvn_delta +sources = svndiff-stream-test.c +install = test +libs = libsvn_test libsvn_delta libsvn_subr apriconv apr + # ---------------------------------------------------------------------------- # Tests for libsvn_client @@ -1179,6 +1235,15 @@ 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 +[conflicts-test] +description = Test libsvn_client conflict resolver +type = exe +path = subversion/tests/libsvn_client +sources = conflicts-test.c ../libsvn_wc/utils.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 + # ---------------------------------------------------------------------------- # Tests for libsvn_diff @@ -1414,8 +1479,7 @@ external-lib = $(SVN_SASL_LIBS) [openssl] type = lib -external-lib = $(SVN_OPENSSL_LIBS) -msvc-libs = ssleay32.lib libeay32.lib +external-lib = $(SVN_OPENSSL_LIBS) $(SVN_LIBCRYPTO_LIBS) [intl] type = lib @@ -1426,6 +1490,14 @@ type = lib external-lib = $(SVN_ZLIB_LIBS) msvc-static = yes +[lz4] +type = lib +external-lib = $(SVN_LZ4_LIBS) + +[utf8proc] +type = lib +external-lib = $(SVN_UTF8PROC_LIBS) + [apr_memcache] type = lib external-lib = $(SVN_APR_MEMCACHE_LIBS) @@ -1433,7 +1505,7 @@ external-lib = $(SVN_APR_MEMCACHE_LIBS) [serf] type = lib external-lib = $(SVN_SERF_LIBS) -libs = apr aprutil openssl xml zlib +libs = apr aprutil openssl zlib msvc-libs = secur32.lib pkg-config = serf-1 pkg-config-private = yes @@ -1485,16 +1557,16 @@ libs = svn svnadmin svndumpfilter svnlook svnmucc svnserve svnrdump svnsync svnversion mod_authz_svn mod_dav_svn mod_dontdothat svnauthz svnauthz-validate svnraisetreeconflict - svnfsfs svnbench + svnfsfs svnbench svnmover [__ALL_TESTS__] type = project path = build/win32 libs = __ALL__ 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 + fs-fs-private-test fs-x-pack-test string-table-test fs-sequential-test skel-test strings-reps-test changes-test locks-test - repos-test dump-load-test + repos-test authz-test dump-load-test checksum-test compat-test config-test hashdump-test mergeinfo-test opt-test packed-data-test path-test prefix-string-test priority-queue-test root-pools-test stream-test @@ -1511,18 +1583,20 @@ libs = __ALL__ svndiff-test vdelta-test entries-dump atomic-ra-revprop-change wc-lock-tester wc-incomplete-tester lock-helper - client-test mtcc-test + client-test conflicts-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 x509-test + parse-diff-test x509-test xml-test afl-x509 compress-test + svndiff-stream-test [__MORE__] type = project path = build/win32 libs = __ALL_TESTS__ - diff diff3 diff4 fsfs-access-map svnauth + diff diff3 diff4 fsfs-access-map svn-populate-node-origins-index x509-parser svn-wc-db-tester + svn-mergeinfo-normalizer svnconflict [__LIBS__] type = project @@ -1637,6 +1711,13 @@ path = tools/dev/svnraisetreeconflict libs = libsvn_wc libsvn_subr apriconv apr install = tools +[svn-mergeinfo-normalizer] +type = exe +path = tools/client-side/svn-mergeinfo-normalizer +install = tools +libs = libsvn_client libsvn_wc libsvn_ra libsvn_delta libsvn_diff libsvn_subr + apriconv apr + [x509-parser] description = Tool to verify x509 certificates type = exe @@ -1644,3 +1725,26 @@ path = tools/dev sources = x509-parser.c install = tools libs = libsvn_subr apr + +[svnmover] +description = Subversion Mover Command Client +type = exe +path = tools/dev/svnmover +sources = *.c +libs = libsvn_client libsvn_ra libsvn_subr libsvn_delta apriconv apr +install = tools + +[svnconflict] +type = exe +path = tools/client-side/svnconflict +install = tools +libs = libsvn_client libsvn_wc libsvn_ra libsvn_subr apriconv apr + +[afl-x509] +description = AFL fuzzer for x509 parser +type = exe +path = subversion/tests/afl +sources = afl-x509.c +install = test +libs = libsvn_subr apr +testing = skip |