You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by cm...@apache.org on 2012/05/16 18:44:47 UTC
svn commit: r1339262 - in /subversion/trunk: ./ build/generator/
build/win32/ notes/ subversion/svnmucc/ subversion/tests/cmdline/svntest/
tools/client-side/svnmucc/ tools/dev/windows-build/
Author: cmpilato
Date: Wed May 16 16:44:47 2012
New Revision: 1339262
URL: http://svn.apache.org/viewvc?rev=1339262&view=rev
Log:
Finish issue #3308 ("Promote 'svnmucc' tool (or functionality) into a
fully supported binary"). This change was made using semi-manual
invocations of 'svn diff' and 'svn patch' from danielsh's
^/subversion/branches/svnmucc/ branch (to account for changes made to
svnmucc.c since the branch was cut).
* Makefile.in
(check, davcheck, davautocheck, svncheck, svncheck6, svnsshcheck,
bdbcheck): Remove explicit svnmucc dependency.
(INSTALL_EXTRA_TOOLS): New.
* subversion/tests/cmdline/svntest/main.py
(svnmucc_binary): Account for relocated binary.
* tools/client-side/svnmucc,
* tools/client-side/svnmucc/svnmucc.c
Moved these from here ...
* subversion/svnmucc,
* subversion/svnmucc/svnmucc.c
... to here.
* subversion/svnmucc/svnmucc.1
New.
* tools/dev/windows-build/Makefile
(package): Remove svnmucc from list of copied binaries.
* build.conf
(svnmucc): Move this section to where other first-class binaries
live, and update to track new src/binary location.
* win-tests.py
(): Don't copy the svnmucc binary.
* notes/knobs
(SVN_TRY_THIS_AT_HOME): New placeholder.
* build/generator/gen_make.py
(Generator.write): Set 'extra_install' for the 'tools' area, too.
* build/win32/vc6-build.bat.in
Also copy svnmucc.exe.
* build/win32/make_dist.py
Track new locations for svnmucc.exe and svnmucc.pdb.
Added:
subversion/trunk/subversion/svnmucc/
- copied from r1339252, subversion/trunk/tools/client-side/svnmucc/
subversion/trunk/subversion/svnmucc/svnmucc.1
Removed:
subversion/trunk/tools/client-side/svnmucc/
Modified:
subversion/trunk/Makefile.in
subversion/trunk/build.conf
subversion/trunk/build/generator/gen_make.py
subversion/trunk/build/win32/make_dist.py
subversion/trunk/build/win32/vc6-build.bat.in
subversion/trunk/notes/knobs
subversion/trunk/subversion/tests/cmdline/svntest/main.py
subversion/trunk/tools/dev/windows-build/Makefile
subversion/trunk/win-tests.py
Modified: subversion/trunk/Makefile.in
URL: http://svn.apache.org/viewvc/subversion/trunk/Makefile.in?rev=1339262&r1=1339261&r2=1339262&view=diff
==============================================================================
--- subversion/trunk/Makefile.in (original)
+++ subversion/trunk/Makefile.in Wed May 16 16:44:47 2012
@@ -451,7 +451,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) $(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:
@@ -863,3 +863,11 @@ clean-ctypes-python:
# manually describe a dependency, which we won't otherwise detect
subversion/libsvn_wc/wc-queries.h: $(abs_srcdir)/subversion/libsvn_wc/wc-metadata.sql
subversion/libsvn_wc/wc-queries.h: $(abs_srcdir)/subversion/libsvn_wc/wc-checks.sql
+
+# Compatibility symlink.
+# This runs after the target of the same name in build-outputs.mk.
+INSTALL_EXTRA_TOOLS=\
+ $(MKDIR) $(DESTDIR)$(bindir); \
+ test -n "$$SVN_TRY_THIS_AT_HOME" && \
+ ln -sf svnmucc$(EXEEXT) $(DESTDIR)$(bindir)/svnsyitf$(EXEEXT); \
+ ln -sf $(DESTDIR)$(bindir)/svnmucc$(EXEEXT) $(DESTDIR)$(toolsdir)/svnmucc$(EXEEXT)
Modified: subversion/trunk/build.conf
URL: http://svn.apache.org/viewvc/subversion/trunk/build.conf?rev=1339262&r1=1339261&r2=1339262&view=diff
==============================================================================
--- subversion/trunk/build.conf (original)
+++ subversion/trunk/build.conf Wed May 16 16:44:47 2012
@@ -174,6 +174,14 @@ 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
+install = bin
+manpages = subversion/svnmucc/svnmucc.1
+
# Support for GNOME Keyring
[libsvn_auth_gnome_keyring]
description = Subversion GNOME Keyring Library
@@ -1215,13 +1223,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/generator/gen_make.py
URL: http://svn.apache.org/viewvc/subversion/trunk/build/generator/gen_make.py?rev=1339262&r1=1339261&r2=1339262&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_make.py (original)
+++ subversion/trunk/build/generator/gen_make.py Wed May 16 16:44:47 2012
@@ -422,7 +422,8 @@ class Generator(gen_base.GeneratorBase):
# in Makefile.in
### we should turn AREA into an object, then test it instead of this
if area[:5] == 'swig-' and area[-4:] != '-lib' or \
- area[:7] == 'javahl-':
+ area[:7] == 'javahl-' \
+ or area == 'tools':
ezt_area.extra_install = 'yes'
########################################
Modified: subversion/trunk/build/win32/make_dist.py
URL: http://svn.apache.org/viewvc/subversion/trunk/build/win32/make_dist.py?rev=1339262&r1=1339261&r2=1339262&view=diff
==============================================================================
--- subversion/trunk/build/win32/make_dist.py (original)
+++ subversion/trunk/build/win32/make_dist.py Wed May 16 16:44:47 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/trunk/build/win32/vc6-build.bat.in
URL: http://svn.apache.org/viewvc/subversion/trunk/build/win32/vc6-build.bat.in?rev=1339262&r1=1339261&r2=1339262&view=diff
==============================================================================
--- subversion/trunk/build/win32/vc6-build.bat.in (original)
+++ subversion/trunk/build/win32/vc6-build.bat.in Wed May 16 16:44:47 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/trunk/notes/knobs
URL: http://svn.apache.org/viewvc/subversion/trunk/notes/knobs?rev=1339262&r1=1339261&r2=1339262&view=diff
==============================================================================
--- subversion/trunk/notes/knobs (original)
+++ subversion/trunk/notes/knobs Wed May 16 16:44:47 2012
@@ -460,5 +460,10 @@ SVN_I_LIKE_LATENCY_SO_IGNORE_HTTPV2
advertisement of HTTPv2 protocol support (if any), effectively
causing them to only speak our original HTTP protocol.
+7.7 SVN_TRY_THIS_AT_HOME
+
+ Scope:
+ Purpose:
+
* (TODO: others)
Added: subversion/trunk/subversion/svnmucc/svnmucc.1
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnmucc/svnmucc.1?rev=1339262&view=auto
==============================================================================
--- subversion/trunk/subversion/svnmucc/svnmucc.1 (added)
+++ subversion/trunk/subversion/svnmucc/svnmucc.1 Wed May 16 16:44:47 2012
@@ -0,0 +1,47 @@
+.\"
+.\"
+.\" Licensed to the Apache Software Foundation (ASF) under one
+.\" or more contributor license agreements. See the NOTICE file
+.\" distributed with this work for additional information
+.\" regarding copyright ownership. The ASF licenses this file
+.\" to you under the Apache License, Version 2.0 (the
+.\" "License"); you may not use this file except in compliance
+.\" with the License. You may obtain a copy of the License at
+.\"
+.\" http://www.apache.org/licenses/LICENSE-2.0
+.\"
+.\" Unless required by applicable law or agreed to in writing,
+.\" software distributed under the License is distributed on an
+.\" "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+.\" KIND, either express or implied. See the License for the
+.\" specific language governing permissions and limitations
+.\" under the License.
+.\"
+.\"
+.\" You can view this file with:
+.\" nroff -man [filename]
+.\"
+.TH svnmucc 1
+.SH NAME
+svnmucc \- Multiple URL Command Client for Subversion
+.SH SYNOPSIS
+.TP
+\fBsvnmucc\fP [\fIoptions\fP]
+.SH OVERVIEW
+Subversion is a version control system, which allows you to keep old
+versions of files and directories (usually source code), keep a log of
+who, when, and why changes occurred, etc., like CVS, RCS or SCCS.
+\fBSubversion\fP keeps a single copy of the master sources. This copy
+is called the source ``repository''; it contains all the information
+to permit extracting previous versions of those files at any time.
+
+For more information about the Subversion project, visit
+http://subversion.apache.org.
+
+Documentation for Subversion and its tools, including detailed usage
+explanations of the \fBsvn\fP, \fBsvnadmin\fP, \fBsvnserve\fP and
+\fBsvnlook\fP programs, historical background, philosophical
+approaches and reasonings, etc., can be found at
+http://svnbook.red-bean.com/.
+
+Run `svnmucc --help' to access the built-in tool documentation.
Modified: subversion/trunk/subversion/tests/cmdline/svntest/main.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/main.py?rev=1339262&r1=1339261&r2=1339262&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/main.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/main.py Wed May 16 16:44:47 2012
@@ -148,13 +148,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/trunk/tools/dev/windows-build/Makefile
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dev/windows-build/Makefile?rev=1339262&r1=1339261&r2=1339262&view=diff
==============================================================================
--- subversion/trunk/tools/dev/windows-build/Makefile (original)
+++ subversion/trunk/tools/dev/windows-build/Makefile Wed May 16 16:44:47 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/trunk/win-tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/win-tests.py?rev=1339262&r1=1339261&r2=1339262&view=diff
==============================================================================
--- subversion/trunk/win-tests.py (original)
+++ subversion/trunk/win-tests.py Wed May 16 16:44:47 2012
@@ -660,8 +660,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
Re: svn commit: r1339262 - in /subversion/trunk: ./ build/generator/
build/win32/ notes/ subversion/svnmucc/ subversion/tests/cmdline/svntest/
tools/client-side/svnmucc/ tools/dev/windows-build/
Posted by "C. Michael Pilato" <cm...@collab.net>.
On 05/16/2012 12:57 PM, Daniel Shahaf wrote:
> cmpilato@apache.org wrote on Wed, May 16, 2012 at 16:44:47 -0000:
>> Author: cmpilato
>> Date: Wed May 16 16:44:47 2012
>> New Revision: 1339262
>>
>> URL: http://svn.apache.org/viewvc?rev=1339262&view=rev
>> Log:
>> Finish issue #3308 ("Promote 'svnmucc' tool (or functionality) into a
>> fully supported binary"). This change was made using semi-manual
>> invocations of 'svn diff' and 'svn patch' from danielsh's
>> ^/subversion/branches/svnmucc/ branch (to account for changes made to
>> svnmucc.c since the branch was cut).
>
> Thanks!
You did all the hard work -- thank you!
--
C. Michael Pilato <cm...@collab.net>
CollabNet <> www.collab.net <> Enterprise Cloud Development
Re: svn commit: r1339262 - in /subversion/trunk: ./ build/generator/
build/win32/ notes/ subversion/svnmucc/ subversion/tests/cmdline/svntest/
tools/client-side/svnmucc/ tools/dev/windows-build/
Posted by "C. Michael Pilato" <cm...@collab.net>.
On 05/16/2012 12:57 PM, Daniel Shahaf wrote:
> cmpilato@apache.org wrote on Wed, May 16, 2012 at 16:44:47 -0000:
>> Author: cmpilato
>> Date: Wed May 16 16:44:47 2012
>> New Revision: 1339262
>>
>> URL: http://svn.apache.org/viewvc?rev=1339262&view=rev
>> Log:
>> Finish issue #3308 ("Promote 'svnmucc' tool (or functionality) into a
>> fully supported binary"). This change was made using semi-manual
>> invocations of 'svn diff' and 'svn patch' from danielsh's
>> ^/subversion/branches/svnmucc/ branch (to account for changes made to
>> svnmucc.c since the branch was cut).
>
> Thanks!
You did all the hard work -- thank you!
--
C. Michael Pilato <cm...@collab.net>
CollabNet <> www.collab.net <> Enterprise Cloud Development
Re: svn commit: r1339262 - in /subversion/trunk: ./
build/generator/ build/win32/ notes/ subversion/svnmucc/
subversion/tests/cmdline/svntest/ tools/client-side/svnmucc/
tools/dev/windows-build/
Posted by Daniel Shahaf <d....@daniel.shahaf.name>.
cmpilato@apache.org wrote on Wed, May 16, 2012 at 16:44:47 -0000:
> Author: cmpilato
> Date: Wed May 16 16:44:47 2012
> New Revision: 1339262
>
> URL: http://svn.apache.org/viewvc?rev=1339262&view=rev
> Log:
> Finish issue #3308 ("Promote 'svnmucc' tool (or functionality) into a
> fully supported binary"). This change was made using semi-manual
> invocations of 'svn diff' and 'svn patch' from danielsh's
> ^/subversion/branches/svnmucc/ branch (to account for changes made to
> svnmucc.c since the branch was cut).
Thanks!
Re: svn commit: r1339262 - in /subversion/trunk: ./
build/generator/ build/win32/ notes/ subversion/svnmucc/
subversion/tests/cmdline/svntest/ tools/client-side/svnmucc/
tools/dev/windows-build/
Posted by Daniel Shahaf <d....@daniel.shahaf.name>.
cmpilato@apache.org wrote on Wed, May 16, 2012 at 16:44:47 -0000:
> Author: cmpilato
> Date: Wed May 16 16:44:47 2012
> New Revision: 1339262
>
> URL: http://svn.apache.org/viewvc?rev=1339262&view=rev
> Log:
> Finish issue #3308 ("Promote 'svnmucc' tool (or functionality) into a
> fully supported binary"). This change was made using semi-manual
> invocations of 'svn diff' and 'svn patch' from danielsh's
> ^/subversion/branches/svnmucc/ branch (to account for changes made to
> svnmucc.c since the branch was cut).
Thanks!