You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2015/11/13 10:28:27 UTC
svn commit: r1714166 - in /subversion/branches/move-tracking-2: LICENSE
build.conf subversion/svnmover/ subversion/tests/cmdline/svntest/main.py
tools/dev/svnmover/
Author: julianfoad
Date: Fri Nov 13 09:28:27 2015
New Revision: 1714166
URL: http://svn.apache.org/viewvc?rev=1714166&view=rev
Log:
On the 'move-tracking-2' branch: Move 'svnmover' into the 'tools/dev'
subdirectory, as it is not intended for end users.
* build.conf
(private-includes): Update the paths.
(svnmover): Move down to the 'tools' section of the file, and update the
paths.
(__ALL__): Move the 'svnmover' lib from here...
(__MORE__): ... to here.
* subversion/svnmover
Move from here...
* tools/dev/svnmover
... to here.
* subversion/tests/cmdline/svntest/main.py
(svnmover_binary): Update the default path.
(execute_tests): Update the path given by '--bin' and '--tools-bin' options.
* LICENSE
Update the path to the 'linenoise' library.
Added:
subversion/branches/move-tracking-2/tools/dev/svnmover/
- copied from r1714165, subversion/branches/move-tracking-2/subversion/svnmover/
Removed:
subversion/branches/move-tracking-2/subversion/svnmover/
Modified:
subversion/branches/move-tracking-2/LICENSE
subversion/branches/move-tracking-2/build.conf
subversion/branches/move-tracking-2/subversion/tests/cmdline/svntest/main.py
Modified: subversion/branches/move-tracking-2/LICENSE
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/LICENSE?rev=1714166&r1=1714165&r2=1714166&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/LICENSE (original)
+++ subversion/branches/move-tracking-2/LICENSE Fri Nov 13 09:28:27 2015
@@ -367,7 +367,7 @@ subversion/libsvn_subr/x509.h
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-For the (modified) 'linenoise' library in subversion/svnmover/linenoise
+For the (modified) 'linenoise' library in tools/dev/svnmover/linenoise
Copyright (c) 2010-2014, Salvatore Sanfilippo <antirez at gmail dot com>
Copyright (c) 2010-2013, Pieter Noordhuis <pcnoordhuis at gmail dot com>
Modified: subversion/branches/move-tracking-2/build.conf
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/build.conf?rev=1714166&r1=1714165&r2=1714166&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/build.conf (original)
+++ subversion/branches/move-tracking-2/build.conf Fri Nov 13 09:28:27 2015
@@ -45,8 +45,8 @@ private-includes =
subversion/bindings/cxxhl/src/private/*.hpp
subversion/bindings/javahl/native/*.hpp
subversion/bindings/javahl/native/jniwrapper/jni_*.hpp
- subversion/svnmover/linenoise/linenoise.h
- subversion/svnmover/linenoise/linenoise.c
+ tools/dev/svnmover/linenoise/linenoise.h
+ tools/dev/svnmover/linenoise/linenoise.c
subversion/libsvn_subr/utf8proc/utf8proc.h
subversion/libsvn_subr/utf8proc/utf8proc.c
subversion/libsvn_subr/utf8proc/utf8proc_data.c
@@ -213,14 +213,6 @@ libs = libsvn_client libsvn_ra libsvn_re
install = bin
manpages = subversion/svnrdump/svnrdump.1
-[svnmover]
-description = Subversion Mover Command Client
-type = exe
-path = subversion/svnmover
-libs = libsvn_client libsvn_ra libsvn_subr libsvn_delta apriconv apr
-install = bin
-manpages = subversion/svnmover/svnmover.1
-
[svnmucc]
description = Subversion Multiple URL Command Client
type = exe
@@ -1512,7 +1504,7 @@ libs = libsvn_fs_base libsvn_fs_fs libsv
[__ALL__]
type = project
path = build/win32
-libs = svn svnadmin svndumpfilter svnlook svnmover svnmucc svnserve svnrdump svnsync
+libs = svn svnadmin svndumpfilter svnlook svnmucc svnserve svnrdump svnsync
svnversion
mod_authz_svn mod_dav_svn mod_dontdothat
svnauthz svnauthz-validate svnraisetreeconflict
@@ -1554,7 +1546,7 @@ path = build/win32
libs = __ALL_TESTS__
diff diff3 diff4 fsfs-access-map svnauth
svn-populate-node-origins-index x509-parser svn-wc-db-tester
- svn-mergeinfo-normalizer
+ svn-mergeinfo-normalizer svnmover
[__LIBS__]
type = project
@@ -1683,3 +1675,12 @@ 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
+manpages = tools/dev/svnmover/svnmover.1
Modified: subversion/branches/move-tracking-2/subversion/tests/cmdline/svntest/main.py
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/tests/cmdline/svntest/main.py?rev=1714166&r1=1714165&r2=1714166&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/tests/cmdline/svntest/main.py (original)
+++ subversion/branches/move-tracking-2/subversion/tests/cmdline/svntest/main.py Fri Nov 13 09:28:27 2015
@@ -162,7 +162,6 @@ svnrdump_binary = P('svnrdump/svnrdump')
svnsync_binary = P('svnsync/svnsync')
svnversion_binary = P('svnversion/svnversion')
svndumpfilter_binary = P('svndumpfilter/svndumpfilter')
-svnmover_binary = P('svnmover/svnmover')
svnmucc_binary = P('svnmucc/svnmucc')
svnfsfs_binary = P('svnfsfs/svnfsfs')
entriesdump_binary = P('tests/cmdline/entries-dump')
@@ -180,6 +179,7 @@ svnauthz_binary = os.path.abspath('../..
svnauthz_validate_binary = os.path.abspath(
'../../../tools/server-side/svnauthz-validate' + _exe
)
+svnmover_binary = os.path.abspath('../../../tools/dev/svnmover/svnmover' + _exe)
# Location to the pristine repository, will be calculated from test_area_url
# when we know what the user specified for --url.
@@ -2277,7 +2277,6 @@ def execute_tests(test_list, serial_only
'jsvndumpfilter' + _bat)
svnversion_binary = os.path.join(options.svn_bin,
'jsvnversion' + _bat)
- svnmover_binary = os.path.join(options.svn_bin, 'jsvnmover' + _bat)
svnmucc_binary = os.path.join(options.svn_bin, 'jsvnmucc' + _bat)
else:
if options.svn_bin:
@@ -2289,13 +2288,13 @@ def execute_tests(test_list, serial_only
svndumpfilter_binary = os.path.join(options.svn_bin,
'svndumpfilter' + _exe)
svnversion_binary = os.path.join(options.svn_bin, 'svnversion' + _exe)
- svnmover_binary = os.path.join(options.svn_bin, 'svnmover' + _exe)
svnmucc_binary = os.path.join(options.svn_bin, 'svnmucc' + _exe)
if options.tools_bin:
svnauthz_binary = os.path.join(options.tools_bin, 'svnauthz' + _exe)
svnauthz_validate_binary = os.path.join(options.tools_bin,
'svnauthz-validate' + _exe)
+ svnmover_binary = os.path.join(options.tools_bin, 'svnmover' + _exe)
######################################################################