Author: danielsh Date: Wed Feb 29 09:11:44 2012 New Revision: 1295023 URL: http://svn.apache.org/viewvc?rev=1295023&view=rev Log: Promote tools/client-side/svnmucc/ -> subversion/svnmucc/.
* tools/client-side/svnmucc/: Move to.. * subversion/svnmucc/: .. here. * Makefile.in (check, davcheck, davautocheck, svncheck, svnserveautocheck, svncheck6, svnsshcheck, bdbcheck): Remove the explicit svnmucc dependency; svnmucc has become a transitive dependency via the 'bin' target. * build.conf (svnmucc): Move this section and match it to the other built-in binaries' sections. * win-tests.py: Track directory move. * subversion/tests/cmdline/svntest/main.py (svnmucc_binary): Track the binary's move. * build/win32/make_dist.py Track the binary's move. * build/win32/vc6-build.bat.in * tools/dev/windows-build/Makefile Copy svnmucc too. Added: subversion/branches/svnmucc/subversion/svnmucc/ - copied from r1295006, subversion/trunk/tools/client-side/svnmucc/ Removed: subversion/branches/svnmucc/tools/client-side/svnmucc/ Modified: subversion/branches/svnmucc/Makefile.in subversion/branches/svnmucc/build.conf subversion/branches/svnmucc/build/win32/make_dist.py subversion/branches/svnmucc/build/win32/vc6-build.bat.in subversion/branches/svnmucc/subversion/tests/cmdline/svntest/main.py subversion/branches/svnmucc/tools/dev/windows-build/Makefile subversion/branches/svnmucc/win-tests.py Modified: subversion/branches/svnmucc/Makefile.in URL: http://svn.apache.org/viewvc/subversion/branches/svnmucc/Makefile.in?rev=1295023&r1=1295022&r2=1295023&view=diff ============================================================================== --- subversion/branches/svnmucc/Makefile.in (original) +++ subversion/branches/svnmucc/Makefile.in Wed Feb 29 09:11:44 2012 @@ -454,7 +454,7 @@ check-all-javahl: check-apache-javahl ch # "make check CLEANUP=true" will clean up directories for successful tests. # "make check TESTS=subversion/tests/cmdline/basic_tests.py" # will perform only basic tests (likewise for other tests). -check: bin @TRANSFORM_LIBTOOL_SCRIPTS@ $(TEST_DEPS) @BDB_TEST_DEPS@ svnmucc +check: bin @TRANSFORM_LIBTOOL_SCRIPTS@ $(TEST_DEPS) @BDB_TEST_DEPS@ @if test "$(PYTHON)" != "none"; then \ flags="--verbose"; \ if test "$(CLEANUP)" != ""; then \ @@ -504,38 +504,38 @@ check: bin @TRANSFORM_LIBTOOL_SCRIPTS@ $ # First, set up Apache as documented in # subversion/tests/cmdline/README. -davcheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@ apache-mod svnmucc +davcheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@ apache-mod @$(MAKE) check BASE_URL=http://localhost # Automatically configure and run Apache httpd on a random port, and then # run make check. -davautocheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@ apache-mod svnmucc +davautocheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@ apache-mod @# Takes MODULE_PATH, USE_HTTPV1 and SVN_PATH_AUTHZ in the environment. @APXS=$(APXS) bash $(top_srcdir)/subversion/tests/cmdline/davautocheck.sh # First, run: # subversion/svnserve/svnserve -d -r `pwd`/subversion/tests/cmdline -svncheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@ svnmucc +svncheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@ @$(MAKE) check BASE_URL=svn://127.0.0.1 # 'make svnserveautocheck' runs svnserve for you and kills it. -svnserveautocheck: svnserve bin $(TEST_DEPS) @BDB_TEST_DEPS@ svnmucc +svnserveautocheck: svnserve bin $(TEST_DEPS) @BDB_TEST_DEPS@ @env PYTHON=$(PYTHON) THREADED=$(THREADED) \ $(top_srcdir)/subversion/tests/cmdline/svnserveautocheck.sh # First, run: # subversion/svnserve/svnserve --listen-host "::1" -d -r `pwd`/subversion/tests/cmdline -svncheck6: bin $(TEST_DEPS) @BDB_TEST_DEPS@ svnmucc +svncheck6: bin $(TEST_DEPS) @BDB_TEST_DEPS@ @$(MAKE) check BASE_URL=svn://\[::1\] # First make sure you can ssh to localhost and that "svnserve" is in # the path of the resulting shell. -svnsshcheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@ svnmucc +svnsshcheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@ @$(MAKE) check \ BASE_URL=svn+ssh://localhost`pwd`/subversion/tests/cmdline -bdbcheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@ svnmucc +bdbcheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@ @$(MAKE) check FS_TYPE=bdb check-clean: Modified: subversion/branches/svnmucc/build.conf URL: http://svn.apache.org/viewvc/subversion/branches/svnmucc/build.conf?rev=1295023&r1=1295022&r2=1295023&view=diff ============================================================================== --- subversion/branches/svnmucc/build.conf (original) +++ subversion/branches/svnmucc/build.conf Wed Feb 29 09:11:44 2012 @@ -174,6 +174,16 @@ 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 +# TODO: svn-tools/svnmucc -> svnmucc compatibility symlink +libs = libsvn_client libsvn_ra libsvn_subr libsvn_delta apriconv apr neon +install = bin +# TODO: +# manpages = subversion/svnmucc/svnmucc.1 + # Support for GNOME Keyring [libsvn_auth_gnome_keyring] description = Subversion GNOME Keyring Library @@ -1191,13 +1201,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/branches/svnmucc/build/win32/make_dist.py URL: http://svn.apache.org/viewvc/subversion/branches/svnmucc/build/win32/make_dist.py?rev=1295023&r1=1295022&r2=1295023&view=diff ============================================================================== --- subversion/branches/svnmucc/build/win32/make_dist.py (original) +++ subversion/branches/svnmucc/build/win32/make_dist.py Wed Feb 29 09:11:44 2012 @@ -211,10 +211,10 @@ _disttree = {'': OptFile('%(readme)s', ' File('%(blddir)s/svnversion/svnversion.pdb'), File('%(blddir)s/svnrdump/svnrdump.exe'), File('%(blddir)s/svnrdump/svnrdump.pdb'), + File('%(blddir)s/svnmucc/svnmucc.exe'), + File('%(blddir)s/svnmucc/svnmucc.pdb'), File('%(blddir)s/../contrib/client-side/svn-push/svn-push.exe'), File('%(blddir)s/../contrib/client-side/svn-push/svn-push.pdb'), - File('%(blddir)s/../tools/client-side/svnmucc/svnmucc.exe'), - File('%(blddir)s/../tools/client-side/svnmucc/svnmucc.pdb'), File('%(blddir)s/../tools/server-side/svnauthz-validate.exe'), File('%(blddir)s/../tools/server-side/svnauthz-validate.pdb'), File('%(blddir)s/../tools/server-side/svn-populate-node-origins-index.exe'), Modified: subversion/branches/svnmucc/build/win32/vc6-build.bat.in URL: http://svn.apache.org/viewvc/subversion/branches/svnmucc/build/win32/vc6-build.bat.in?rev=1295023&r1=1295022&r2=1295023&view=diff ============================================================================== --- subversion/branches/svnmucc/build/win32/vc6-build.bat.in (original) +++ subversion/branches/svnmucc/build/win32/vc6-build.bat.in Wed Feb 29 09:11:44 2012 @@ -137,6 +137,7 @@ copy src-%DIR%\Release\subversion\svnloo 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\svnmucc\svnmucc.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/branches/svnmucc/subversion/tests/cmdline/svntest/main.py URL: http://svn.apache.org/viewvc/subversion/branches/svnmucc/subversion/tests/cmdline/svntest/main.py?rev=1295023&r1=1295022&r2=1295023&view=diff ============================================================================== --- subversion/branches/svnmucc/subversion/tests/cmdline/svntest/main.py (original) +++ subversion/branches/svnmucc/subversion/tests/cmdline/svntest/main.py Wed Feb 29 09:11:44 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. Modified: subversion/branches/svnmucc/tools/dev/windows-build/Makefile URL: http://svn.apache.org/viewvc/subversion/branches/svnmucc/tools/dev/windows-build/Makefile?rev=1295023&r1=1295022&r2=1295023&view=diff ============================================================================== --- subversion/branches/svnmucc/tools/dev/windows-build/Makefile (original) +++ subversion/branches/svnmucc/tools/dev/windows-build/Makefile Wed Feb 29 09:11:44 2012 @@ -128,7 +128,7 @@ all2: targetdir package: test -d $(SVNDIR)\$(CONFIG)\Subversion\tests\cmdline || mkdir $(SVNDIR)\$(CONFIG)\Subversion\tests\cmdline test -d $(TARGETDIR)\bin || mkdir $(TARGETDIR)\bin - for %%i in (svn svnadmin svndumpfilter svnlook svnserve svnsync svnversion svnrdump) do @$(CP) $(CONFIG)\subversion\%%i\%%i.exe $(TARGETDIR)\bin + for %%i in (svn svnadmin svndumpfilter svnlook svnserve svnsync svnversion svnrdump svnmucc) do @$(CP) $(CONFIG)\subversion\%%i\%%i.exe $(TARGETDIR)\bin for %%i in (diff diff3 diff4) do @if exist $(CONFIG)\tools\diff\%%i.exe $(CP) $(CONFIG)\tools\diff\%%i.exe $(TARGETDIR)\bin $(CP) $(APRDIR)\$(CONFIG)/*.dll $(TARGETDIR)\bin $(CP) $(APRUTILDIR)\$(CONFIG)/*.dll $(TARGETDIR)\bin Modified: subversion/branches/svnmucc/win-tests.py URL: http://svn.apache.org/viewvc/subversion/branches/svnmucc/win-tests.py?rev=1295023&r1=1295022&r2=1295023&view=diff ============================================================================== --- subversion/branches/svnmucc/win-tests.py (original) +++ subversion/branches/svnmucc/win-tests.py Wed Feb 29 09:11:44 2012 @@ -656,8 +656,6 @@ if create_dirs: baton = copied_execs for dirpath, dirs, files in os.walk('subversion'): copy_execs(baton, dirpath, dirs + files) - for dirpath, dirs, files in os.walk('tools/client-side/svnmucc'): - copy_execs(baton, dirpath, dirs + files) except: os.chdir(old_cwd) raise