You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by da...@apache.org on 2012/02/29 09:16:17 UTC
svn commit: r1295004 - in /subversion/trunk: build.conf
build/win32/vc6-build.bat.in subversion/svnmucc/
subversion/tests/cmdline/svntest/main.py tools/client-side/svnmucc/
Author: danielsh
Date: Wed Feb 29 08:16:17 2012
New Revision: 1295004
URL: http://svn.apache.org/viewvc?rev=1295004&view=rev
Log:
* build/win32/vc6-build.bat.in: Add svnrdump.
Added:
subversion/trunk/subversion/svnmucc/
- copied from r1294995, subversion/trunk/tools/client-side/svnmucc/
Removed:
subversion/trunk/tools/client-side/svnmucc/
Modified:
subversion/trunk/build.conf
subversion/trunk/build/win32/vc6-build.bat.in
subversion/trunk/subversion/tests/cmdline/svntest/main.py
Modified: subversion/trunk/build.conf
URL: http://svn.apache.org/viewvc/subversion/trunk/build.conf?rev=1295004&r1=1295003&r2=1295004&view=diff
==============================================================================
--- subversion/trunk/build.conf (original)
+++ subversion/trunk/build.conf Wed Feb 29 08:16:17 2012
@@ -174,6 +174,15 @@ libs = libsvn_client libsvn_ra libsvn_re
install = bin
manpages = subversion/svnrdump/svnrdump.1
+[svnmucc]
+description = Subversion Multiple URL Command Client
+type = exe
+path = subversion/svnmucc
+libs = libsvn_client libsvn_ra libsvn_subr libsvn_delta apriconv apr neon
+# TODO: svn-tools/svnmucc->svnmucc compat symlink
+install = bin
+# TODO: write this manpages = subversion/svnmucc/svnmucc.1
+
# Support for GNOME Keyring
[libsvn_auth_gnome_keyring]
description = Subversion GNOME Keyring Library
@@ -1191,13 +1200,6 @@ libs = __JAVAHL__ javahl-tests javahl-co
# ----------------------------------------------------------------------------
# Contrib and tools
-[svnmucc]
-type = exe
-path = tools/client-side/svnmucc
-sources = svnmucc.c
-install = tools
-libs = libsvn_client libsvn_ra libsvn_subr libsvn_delta apriconv apr neon
-
[diff]
type = exe
path = tools/diff
Modified: subversion/trunk/build/win32/vc6-build.bat.in
URL: http://svn.apache.org/viewvc/subversion/trunk/build/win32/vc6-build.bat.in?rev=1295004&r1=1295003&r2=1295004&view=diff
==============================================================================
--- subversion/trunk/build/win32/vc6-build.bat.in (original)
+++ subversion/trunk/build/win32/vc6-build.bat.in Wed Feb 29 08:16:17 2012
@@ -136,6 +136,7 @@ copy src-%DIR%\Release\subversion\svndum
copy src-%DIR%\Release\subversion\svnlook\svnlook.exe svn-win32-%VER%\bin
copy src-%DIR%\Release\subversion\svnserve\svnserve.exe svn-win32-%VER%\bin
copy src-%DIR%\Release\subversion\svnversion\svnversion.exe svn-win32-%VER%\bin
+copy src-%DIR%\Release\subversion\svnrdump\svnrdump.exe svn-win32-%VER%\bin
copy src-%DIR%\Release\subversion\mod_authz_svn\mod_authz_svn.so svn-win32-%VER%\httpd
copy src-%DIR%\Release\subversion\mod_dav_svn\mod_dav_svn.so svn-win32-%VER%\httpd
copy svn-win32-%VER%\bin\intl.dll "%APACHEDIR%\bin"
Modified: subversion/trunk/subversion/tests/cmdline/svntest/main.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/main.py?rev=1295004&r1=1295003&r2=1295004&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/main.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/main.py Wed Feb 29 08:16:17 2012
@@ -161,13 +161,12 @@ svnsync_binary = os.path.abspath('../../
svnversion_binary = os.path.abspath('../../svnversion/svnversion' + _exe)
svndumpfilter_binary = os.path.abspath('../../svndumpfilter/svndumpfilter' + \
_exe)
+svnmucc_binary=os.path.abspath('../../svnmucc/svnmucc' + _exe)
entriesdump_binary = os.path.abspath('entries-dump' + _exe)
atomic_ra_revprop_change_binary = os.path.abspath('atomic-ra-revprop-change' + \
_exe)
wc_lock_tester_binary = os.path.abspath('../libsvn_wc/wc-lock-tester' + _exe)
wc_incomplete_tester_binary = os.path.abspath('../libsvn_wc/wc-incomplete-tester' + _exe)
-svnmucc_binary=os.path.abspath('../../../tools/client-side/svnmucc/svnmucc' + \
- _exe)
# Location to the pristine repository, will be calculated from test_area_url
# when we know what the user specified for --url.