You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2010/08/10 19:03:37 UTC
svn commit: r984122 [2/40] - in /subversion/branches/ignore-mergeinfo: ./
build/ build/ac-macros/ build/generator/ build/generator/swig/
build/generator/templates/ build/generator/util/ build/hudson/
build/hudson/jobs/ build/hudson/jobs/subversion-1.6....
Propchange: subversion/branches/ignore-mergeinfo/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 10 17:03:06 2010
@@ -1,35 +1,36 @@
-subversion/branches/1.5.x-r30215:870312
-subversion/branches/bdb-reverse-deltas:872050-872529
-subversion/branches/diff-callbacks3:870059-870761
-subversion/branches/dont-save-plaintext-passwords-by-default:870728-871118
-subversion/branches/double-delete:870511-872970
-subversion/branches/explore-wc:875486,875493,875497,875507,875511,875514,875559,875580-875581,875584,875587,875611,875627,875647,875667-875668,875711-875712,875733-875734,875736,875744-875748,875751,875758,875782,875795-875796,875830,875836,875838,875842,875852,875855,875864,875870,875873,875880,875885-875888,875890,875897-875898,875905,875907-875909,875935,875943-875944,875946,875979,875982-875983,875985-875986,875990,875997
-subversion/branches/file-externals:871779-873302
-subversion/branches/fs-rep-sharing:869036-873803
-subversion/branches/fsfs-pack:873717-874575
-subversion/branches/gnome-keyring:870558-871410
-subversion/branches/http-protocol-v2:874395-876041
-subversion/branches/in-memory-cache:869829-871452
-subversion/branches/issue-2843-dev:871432-874179
-subversion/branches/issue-3000:871713,871716-871719,871721-871726,871728,871734
-subversion/branches/issue-3067-deleted-subtrees:873375-874084
-subversion/branches/issue-3148-dev:875193-875204
-subversion/branches/issue-3220-dev:872210-872226
-subversion/branches/issue-3334-dirs:875156-875867
-subversion/branches/kwallet:870785-871314
-subversion/branches/log-g-performance:870941-871032
-subversion/branches/merge-skips-obstructions:874525-874615
-subversion/branches/ra_serf-digest-authn:875693-876404
-subversion/branches/reintegrate-improvements:873853-874164
-subversion/branches/subtree-mergeinfo:876734-878766
-subversion/branches/svn-mergeinfo-enhancements:870119-870195,870197-870288
-subversion/branches/svnpatch-diff:865738-876477
-subversion/branches/svnraisetc:874709-875149
-subversion/branches/svnserve-logging:869828-870893
-subversion/branches/tc-issue-3334:874697-874773
-subversion/branches/tc-merge-notify:874017-874062
-subversion/branches/tc-resolve:874191-874239
-subversion/branches/tc_url_rev:874351-874483
-subversion/branches/tree-conflicts:868291-873154
-subversion/branches/tree-conflicts-notify:873926-874008
-subversion/trunk:873097-880314
+/subversion/branches/1.5.x-r30215:870312
+/subversion/branches/bdb-reverse-deltas:872050-872529
+/subversion/branches/diff-callbacks3:870059-870761
+/subversion/branches/dont-save-plaintext-passwords-by-default:870728-871118
+/subversion/branches/double-delete:870511-872970
+/subversion/branches/explore-wc:875486,875493,875497,875507,875511,875514,875559,875580-875581,875584,875587,875611,875627,875647,875667-875668,875711-875712,875733-875734,875736,875744-875748,875751,875758,875782,875795-875796,875830,875836,875838,875842,875852,875855,875864,875870,875873,875880,875885-875888,875890,875897-875898,875905,875907-875909,875935,875943-875944,875946,875979,875982-875983,875985-875986,875990,875997
+/subversion/branches/file-externals:871779-873302
+/subversion/branches/fs-rep-sharing:869036-873803
+/subversion/branches/fsfs-pack:873717-874575
+/subversion/branches/gnome-keyring:870558-871410
+/subversion/branches/http-protocol-v2:874395-876041
+/subversion/branches/in-memory-cache:869829-871452
+/subversion/branches/issue-2843-dev:871432-874179
+/subversion/branches/issue-3000:871713,871716-871719,871721-871726,871728,871734
+/subversion/branches/issue-3067-deleted-subtrees:873375-874084
+/subversion/branches/issue-3148-dev:875193-875204
+/subversion/branches/issue-3220-dev:872210-872226
+/subversion/branches/issue-3242-dev:879653-896436
+/subversion/branches/issue-3334-dirs:875156-875867
+/subversion/branches/kwallet:870785-871314
+/subversion/branches/log-g-performance:870941-871032
+/subversion/branches/merge-skips-obstructions:874525-874615
+/subversion/branches/ra_serf-digest-authn:875693-876404
+/subversion/branches/reintegrate-improvements:873853-874164
+/subversion/branches/subtree-mergeinfo:876734-878766
+/subversion/branches/svn-mergeinfo-enhancements:870119-870195,870197-870288
+/subversion/branches/svnpatch-diff:865738-876477
+/subversion/branches/svnraisetc:874709-875149
+/subversion/branches/svnserve-logging:869828-870893
+/subversion/branches/tc-issue-3334:874697-874773
+/subversion/branches/tc-merge-notify:874017-874062
+/subversion/branches/tc-resolve:874191-874239
+/subversion/branches/tc_url_rev:874351-874483
+/subversion/branches/tree-conflicts:868291-873154
+/subversion/branches/tree-conflicts-notify:873926-874008
+/subversion/trunk:873097-900000
Modified: subversion/branches/ignore-mergeinfo/CHANGES
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/CHANGES?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/CHANGES (original)
+++ subversion/branches/ignore-mergeinfo/CHANGES Tue Aug 10 17:03:06 2010
@@ -1,5 +1,38 @@
+Version 1.6.8
+(15 Jan 2010, from /branches/1.6.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.6.8
+
+ User-visible changes:
+ * allow multiple external updates over ra_svn (issue #3487)
+ * fix a segmentation fault when using FSFS (r881905)
+ * support Berkeley DB 4.8 (r879688)
+ * various autoprop improvements (r880274, -5)
+ * improve usage of svn+ssh:// on Windows (issue #2580)
+ * teach 1.6.x to recognize 1.7 working copies (1.6.x-future-proof branch)
+ * update help text for 'svn update' and 'svn switch' (r886164, -97)
+ * make 'svnadmin load --parent-dir' create valid mergeinfo (r888979, -9081)
+ * tolerate relative merge source paths in mergeinfo (r889840)
+ * teach mod_dav_svn to support the Label header (issue #3519)
+ * fixed: svnsync leaves stale sync-locks on mirrors (r884842)
+ * fix applicability of 'svn resolve --accept=theirs-conflict' (r880525, -6)
+ * fixed: segfault in 'svn resolve' (r896522, -47)
+
+ Developer-visible changes:
+ * update ruby bindings test expectation (r880162)
+ * don't allow rangelist and mergeinfo API to modify input args (r879093)
+
+
+Version 1.6.7
+(Not released, see changes for 1.6.8.)
+
+
+[ Note: All revision numbers for versions prior to 1.6.7 reference the
+ original repository on svn.collab.net. For more information see:
+ http://svn.apache.org/repos/asf/subversion/README ]
+
+
Version 1.6.6
-(16 Oct 2009, from /branches/1.6.x)
+(22 Oct 2009, from /branches/1.6.x)
http://svn.collab.net/repos/svn/tags/1.6.6
User-visible changes:
@@ -28,9 +61,9 @@ http://svn.collab.net/repos/svn/tags/1.6
* add svn.client.{log5,merge_peg3} to python bindings (r39635, -6, -7)
* include the time of a test run in tests.log (r39887)
-
+
Version 1.6.5
-(21 Aug 2009, from /branches/1.6.x)
+(22 Aug 2009, from /branches/1.6.x)
http://svn.collab.net/repos/svn/tags/1.6.5
User-visible changes:
Modified: subversion/branches/ignore-mergeinfo/COMMITTERS
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/COMMITTERS?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/COMMITTERS [UTF-8] (original)
+++ subversion/branches/ignore-mergeinfo/COMMITTERS [UTF-8] Tue Aug 10 17:03:06 2010
@@ -19,7 +19,7 @@ Blanket commit access:
fitz Brian W. Fitzpatrick <fi...@red-bean.com>
daniel Daniel Stenberg <da...@haxx.se>
cmpilato C. Michael Pilato <cm...@collab.net>
- philip Philip Martin <ph...@codematters.co.uk>
+ philip Philip Martin <ph...@wandisco.com>
jerenkrantz Justin Erenkrantz <ju...@erenkrantz.com>
rooneg Garrett Rooney <ro...@electricjellyfish.net>
blair Blair Zajac <bl...@orcaware.com>
@@ -29,17 +29,17 @@ Blanket commit access:
jaa Jani Averbach <ja...@iki.fi>
julianfoad Julian Foad <ju...@wandisco.com>
jszakmeister John Szakmeister <jo...@szakmeister.net>
- dionisos Erik Hülsmann <e....@gmx.net>
+ ehu Erik Hülsmann <e....@gmx.net>
breser Ben Reser <be...@reser.org>
maxb Max Bowsher <ma...@ukf.net>
dberlin Daniel Berlin <db...@dberlin.org>
danderson David Anderson <da...@natulte.net>
- zhakov Ivan Zhakov <ch...@gmail.com>
+ ivan Ivan Zhakov <ch...@gmail.com>
djames David James <ja...@cs.toronto.edu>
pburba Paul Burba <pb...@collab.net>
glasser David Glasser <gl...@davidglasser.net>
lgo Lieven Govaerts <lg...@mobsol.be>
- hwright Hyrum Wright <hy...@mail.utexas.edu>
+ hwright Hyrum Wright <hy...@wandisco.com>
vgeorgescu Vlad Georgescu <vg...@gmail.com>
kameshj Kamesh Jayachandran <ka...@collab.net>
markphip Mark Phippard <mp...@collab.net>
@@ -47,7 +47,7 @@ Blanket commit access:
stsp Stefan Sperling <st...@elego.de>
kou Kouhei Sutou <ko...@cozmixng.org>
danielsh Daniel Shahaf <d....@daniel.shahaf.name>
- psamuelson Peter Samuelson <pe...@p12n.org>
+ peters Peter Samuelson <pe...@p12n.org>
rhuijben Bert Huijben <b....@competence.biz>
stylesen Senthil Kumaran S <se...@collab.net>
steveking Stefan Küng <to...@gmail.com>
@@ -77,6 +77,7 @@ Partial committers who have asked to be
kon Kalle Olavi Niemitalo <ko...@iki.fi> (psvn.el)
rassilon Bill Tutt <bi...@tutts.org> (Win32, COM, issue-1003-dev br.)
+ pll Paul lussier <p....@comcast.net> (releases)
Commit access for specific areas:
@@ -105,7 +106,6 @@ Commit access for specific areas:
niemeyer Gustavo Niemeyer <ni...@conectiva.com> (svnperms.py)
zbrown Zack Brown <zb...@tumblerings.org> (doc)
mprice Michael Price <ec...@gmail.com> (releases)
- pll Paul lussier <p....@comcast.net> (releases)
jrepenning Jack Repenning <jr...@collab.net> (tools/dev)
lonestar Martin Maurer <ma...@email.de> (svnshow)
shlomif Shlomi Fish <sh...@vipe.technion.ac.il> (svn-push)
@@ -127,7 +127,8 @@ Commit access for specific areas:
mhagger Michael Haggerty <mh...@alum.mit.edu> (svntest)
madanus Madan U S <ma...@collab.net> (svnmerge)
wein Mathias Weinert <we...@mccw.de> (mailer)
- bhuvan Bhuvaneswaran <bh...@collab.net> (svn2feed.py)
+ bhuvan Bhuvaneswaran <bh...@collab.net> (svn2feed.py,
+ build/hudson)
aogier Anthony Ogier <ao...@iorga.com> (svn-merge-vendor.py)
dkagedal David Kågedal <da...@lysator.liu.se> (dsvn.el)
mattiase Mattias Engdegård <ma...@virtutech.com> (dsvn.el)
@@ -154,7 +155,7 @@ Commit access for specific areas:
marcosc Marcos Chaves <ma...@gmail.com> (po: pt_BR)
pynoos Hojin Choi <ho...@gmail.com> (po: ko)
blueboh Jeong Seolin <bl...@gmail.com> (po: ko)
- cauchy Dongsheng Song <so...@live.cn> (po: zh_CN)
+ dongsheng Dongsheng Song <so...@live.cn> (po: zh_CN)
hynnet YingNing Huang <hy...@bao.hynnet.com> (po: zh_CN)
lark Wang Jian <la...@linux.net.cn> (po: zh_CN)
giorgio_valoti Giorgio Valoti <gi...@mac.com> (po: it)
Modified: subversion/branches/ignore-mergeinfo/INSTALL
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/INSTALL?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/INSTALL (original)
+++ subversion/branches/ignore-mergeinfo/INSTALL Tue Aug 10 17:03:06 2010
@@ -700,7 +700,7 @@ II. INSTALLATION
a checkout and see an error like:
subversion/libsvn_ra/ra_loader.c:209: (apr_err=170000)
- svn: Unrecognized URL scheme 'http://svn.collab.net/repos/svn/trunk'
+ svn: Unrecognized URL scheme 'https://svn.apache.org/repos/asf/subversion/trunk'
It probably means that the dynamic loader/linker can't find all
of the libsvn_* libraries.
@@ -725,7 +725,7 @@ II. INSTALLATION
It is possible to configure and build Subversion on Unix in a
directory other than the working copy. For example
- $ svn co http://svn.collab.net/repos/svn/trunk svn
+ $ svn co https://svn.apache.org/repos/asf/subversion/trunk svn
$ cd svn
$ # get neon/apr as required
$ chmod +x autogen.sh
@@ -793,7 +793,7 @@ II. INSTALLATION
"command" from the Start menu's "Run..." menu option), change to
the directory you installed the executables into, and run:
- C:\test>svn co http://svn.collab.net/repos/svn/trunk svn
+ C:\test>svn co https://svn.apache.org/repos/asf/subversion/trunk svn
This will get the latest Subversion sources and put them into the
"svn" subdirectory.
@@ -892,7 +892,7 @@ II. INSTALLATION
* Make a directory SVN and cd into it.
* Either checkout Subversion:
- svn co http://svn.collab.net/repos/svn/trunk/ src-trunk
+ svn co https://svn.apache.org/repos/asf/subversion/trunk src-trunk
or unpack the zip file distribution and rename the directory to
src-trunk.
Modified: subversion/branches/ignore-mergeinfo/Makefile.in
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/Makefile.in?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/Makefile.in (original)
+++ subversion/branches/ignore-mergeinfo/Makefile.in Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
# Makefile.in: template Makefile for Subversion
#
# ====================================================================
-# Licensed to the Subversion Corporation (SVN Corp.) under one
+# 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 SVN Corp. licenses this file
+# 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
@@ -94,6 +94,7 @@ javahl_javadir = @libdir@/svn-javahl
javahl_javahdir = @libdir@/svn-javahl/include
javahl_libdir = @libdir@
javahl_test_rootdir=$(abs_builddir)/subversion/bindings/javahl/test-work
+javahl_test_srcdir=$(abs_srcdir)/subversion/bindings/javahl
MSGFMT = @MSGFMT@
MSGFMTFLAGS = @MSGFMTFLAGS@
@@ -151,8 +152,10 @@ JAVAHL_INCLUDES= @JNI_INCLUDES@ -I$(abs_
SVN_APR_INCLUDES = @SVN_APR_INCLUDES@
SVN_APR_PREFIX = @SVN_APR_PREFIX@
+SVN_APR_CONFIG = @SVN_APR_CONFIG@
SVN_APRUTIL_INCLUDES = @SVN_APRUTIL_INCLUDES@
SVN_APRUTIL_PREFIX = @SVN_APRUTIL_PREFIX@
+SVN_APRUTIL_CONFIG = @SVN_APRUTIL_CONFIG@
SVN_APR_MEMCACHE_PREFIX = @SVN_APR_MEMCACHE_PREFIX@
SVN_APR_MEMCACHE_INCLUDES = @SVN_APR_MEMCACHE_INCLUDES@
@@ -366,10 +369,9 @@ fast-clean: doc-clean
rm -rf .libs); \
fi \
done
- rm -f $(CLEAN_FILES)
+ echo $(CLEAN_FILES) | xargs rm -f
find $(CTYPES_PYTHON_SRC_DIR) $(SWIG_PY_SRC_DIR) $(SWIG_PY_DIR) \
- $(abs_srcdir)/build -name "*.pyc" -exec rm {} ';'
- find $(abs_srcdir)/subversion/tests/ -mindepth 2 -maxdepth 3 \
+ $(abs_srcdir)/build $(top_srcdir)/subversion/tests/cmdline/svntest \
-name "*.pyc" -exec rm {} ';'
# clean all but bulky test output, returning to before './configure' was run.
@@ -430,7 +432,7 @@ clean-javahl:
check-javahl: javahl
@FIX_JAVAHL_LIB@
- $(JAVA) "-Dtest.rootdir=$(javahl_test_rootdir)" "-Dtest.rooturl=$(BASE_URL)" "-Dtest.fstype=$(FS_TYPE)" -Djava.library.path=@JAVAHL_OBJDIR@:$(libdir) -classpath $(javahl_tests_PATH):$(javahl_tests_CLASSPATH) "-Dtest.tests=$(JAVAHL_TESTS)" org.tigris.subversion.javahl.RunTests
+ $(JAVA) "-Dtest.rootdir=$(javahl_test_rootdir)" "-Dtest.srcdir=$(javahl_test_srcdir)" "-Dtest.rooturl=$(BASE_URL)" "-Dtest.fstype=$(FS_TYPE)" -Djava.library.path=@JAVAHL_OBJDIR@:$(libdir) -classpath $(javahl_tests_PATH):$(javahl_tests_CLASSPATH) "-Dtest.tests=$(JAVAHL_TESTS)" org.tigris.subversion.javahl.RunTests
# "make check CLEANUP=true" will clean up directories for successful tests.
# "make check TESTS=subversion/tests/cmdline/basic_tests.py"
@@ -580,7 +582,7 @@ external-extraclean:
# DOCUMENTATION RULES
# Every single document in every format.
-doc: doc-misc-docs doc-api doc-javahl
+doc: doc-api doc-javahl
# Generate API documentation for the C libraries.
### This could also generate POD for swig-perl, etc.
@@ -596,24 +598,7 @@ doc-javahl:
-link http://java.sun.com/javase/6/docs/api/ \
org.tigris.subversion.javahl
-# Build all types of a certain doc.
-doc-misc-docs: doc-misc-docs-html doc-misc-docs-pdf doc-misc-docs-ps
-
-# Build all docs of a certain type.
-doc-all-html: doc-misc-docs-html
-doc-all-pdf: doc-misc-docs-pdf
-doc-all-ps: doc-misc-docs-ps
-
-# Assumes you have {xsltproc, fop, stylesheets} installed.
-doc-misc-docs-html:
- cd $(top_srcdir)/doc/misc-docs && $(MAKE) all-html
-doc-misc-docs-pdf:
- cd $(top_srcdir)/doc/misc-docs && $(MAKE) pdf
-doc-misc-docs-ps:
- cd $(top_srcdir)/doc/misc-docs && $(MAKE) ps
-
doc-clean:
- cd $(top_srcdir)/doc/misc-docs && $(MAKE) clean
rm -rf $(top_srcdir)/doc/doxygen
rm -rf $(top_srcdir)/doc/javadoc
@@ -828,7 +813,7 @@ install-swig-rb-doc:
# ctypes-python make targets
ctypes-python: local-all
- $(abs_srcdir)/build/run_ctypesgen.sh "$(LT_EXECUTE)" "$(CPPFLAGS)" "$(EXTRA_CTYPES_LDFLAGS)" "$(PYTHON)" "$(CTYPESGEN)" "$(abs_srcdir)" "$(abs_builddir)" "$(libdir)" "$(SVN_APR_PREFIX)" "$(SVN_APRUTIL_PREFIX)"
+ $(abs_srcdir)/build/run_ctypesgen.sh "$(LT_EXECUTE)" "$(CPPFLAGS)" "$(EXTRA_CTYPES_LDFLAGS)" "$(PYTHON)" "$(CTYPESGEN)" "$(abs_srcdir)" "$(abs_builddir)" "$(libdir)" "$(SVN_APR_CONFIG)" "$(SVN_APRUTIL_CONFIG)"
install-ctypes-python: ctypes-python
cd $(CTYPES_PYTHON_SRC_DIR); \
Modified: subversion/branches/ignore-mergeinfo/NOTICE
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/NOTICE?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/NOTICE (original)
+++ subversion/branches/ignore-mergeinfo/NOTICE Tue Aug 10 17:03:06 2010
@@ -1,11 +1,11 @@
Subversion
-Copyright 2009 The Subversion Corporation.
+Copyright 2009 The Apache Software Foundation
This product includes software developed by many people, and distributed
-under Contributor License Agreements to The Subversion Corporation
-(http://subversion.org/). See the accompanying COMMITTERS file and the
+under Contributor License Agreements to The Apache Software Foundation
+(http://www.apache.org/). See the accompanying COMMITTERS file and the
revision logs for an exact contribution history.
Portions of the python bindings are Copyright 2005 Edgewall Software. See
-http://svn.collab.net/repos/svn/trunk/subversion/bindings/swig/python/LICENSE_FOR_PYTHON_BINDINGS
+http://svn.apache.org/repos/asf/subversion/trunk/subversion/bindings/swig/python/LICENSE_FOR_PYTHON_BINDINGS
for more information.
Modified: subversion/branches/ignore-mergeinfo/README
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/README?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/README (original)
+++ subversion/branches/ignore-mergeinfo/README Tue Aug 10 17:03:06 2010
@@ -23,7 +23,7 @@ I. A FEW POINTERS
Once you have a Subversion client you can get the latest version
of the code with the command:
- $ svn co http://svn.collab.net/repos/svn/trunk subversion
+ $ svn co http://svn.apache.org/repos/asf/subversion/trunk subversion
Modified: subversion/branches/ignore-mergeinfo/aclocal.m4
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/aclocal.m4?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/aclocal.m4 (original)
+++ subversion/branches/ignore-mergeinfo/aclocal.m4 Tue Aug 10 17:03:06 2010
@@ -1,3 +1,23 @@
+#
+#
+# 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.
+#
+#
# aclocal.m4: Supplementary macros used by Subversion's configure.ac
#
# These are here rather than directly in configure.ac, since this prevents
Modified: subversion/branches/ignore-mergeinfo/autogen.sh
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/autogen.sh?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/autogen.sh (original)
+++ subversion/branches/ignore-mergeinfo/autogen.sh Tue Aug 10 17:03:06 2010
@@ -1,4 +1,24 @@
#!/bin/sh
+#
+#
+# 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.
+#
+#
### Run this to produce everything needed for configuration. ###
Modified: subversion/branches/ignore-mergeinfo/build.conf
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/build.conf?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/build.conf (original)
+++ subversion/branches/ignore-mergeinfo/build.conf Tue Aug 10 17:03:06 2010
@@ -2,10 +2,10 @@
# build.conf -- configuration information for building Subversion
#
######################################################################
-# Licensed to the Subversion Corporation (SVN Corp.) under one
+# 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 SVN Corp. licenses this file
+# 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
@@ -41,6 +41,7 @@ private-includes =
private-built-includes =
subversion/svn_private_config.h
subversion/libsvn_fs_fs/rep-cache-db.h
+ subversion/libsvn_fs_fs/revprops-db.h
subversion/libsvn_wc/wc-metadata.h
subversion/libsvn_wc/wc-queries.h
subversion/libsvn_wc/wc-checks.h
@@ -851,7 +852,7 @@ type = exe
path = subversion/tests/libsvn_client
sources = client-test.c
install = test
-libs = libsvn_test libsvn_delta libsvn_subr libsvn_client apriconv apr neon
+libs = libsvn_test libsvn_delta libsvn_subr libsvn_ra libsvn_client apriconv apr neon
# ----------------------------------------------------------------------------
# Tests for libsvn_diff
Modified: subversion/branches/ignore-mergeinfo/build/PrintPath
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/build/PrintPath?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/build/PrintPath (original)
+++ subversion/branches/ignore-mergeinfo/build/PrintPath Tue Aug 10 17:03:06 2010
@@ -1,4 +1,24 @@
#!/bin/sh
+#
+#
+# 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.
+#
+#
# Look for program[s] somewhere in $PATH.
#
# Options:
Modified: subversion/branches/ignore-mergeinfo/build/ac-macros/apache.m4
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/build/ac-macros/apache.m4?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/build/ac-macros/apache.m4 (original)
+++ subversion/branches/ignore-mergeinfo/build/ac-macros/apache.m4 Tue Aug 10 17:03:06 2010
@@ -1,3 +1,21 @@
+dnl ===================================================================
+dnl Licensed to the Apache Software Foundation (ASF) under one
+dnl or more contributor license agreements. See the NOTICE file
+dnl distributed with this work for additional information
+dnl regarding copyright ownership. The ASF licenses this file
+dnl to you under the Apache License, Version 2.0 (the
+dnl "License"); you may not use this file except in compliance
+dnl with the License. You may obtain a copy of the License at
+dnl
+dnl http://www.apache.org/licenses/LICENSE-2.0
+dnl
+dnl Unless required by applicable law or agreed to in writing,
+dnl software distributed under the License is distributed on an
+dnl "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+dnl KIND, either express or implied. See the License for the
+dnl specific language governing permissions and limitations
+dnl under the License.
+dnl ===================================================================
dnl
dnl Macros to find an Apache installation
dnl
Modified: subversion/branches/ignore-mergeinfo/build/ac-macros/apr.m4
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/build/ac-macros/apr.m4?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/build/ac-macros/apr.m4 (original)
+++ subversion/branches/ignore-mergeinfo/build/ac-macros/apr.m4 Tue Aug 10 17:03:06 2010
@@ -1,3 +1,21 @@
+dnl ===================================================================
+dnl Licensed to the Apache Software Foundation (ASF) under one
+dnl or more contributor license agreements. See the NOTICE file
+dnl distributed with this work for additional information
+dnl regarding copyright ownership. The ASF licenses this file
+dnl to you under the Apache License, Version 2.0 (the
+dnl "License"); you may not use this file except in compliance
+dnl with the License. You may obtain a copy of the License at
+dnl
+dnl http://www.apache.org/licenses/LICENSE-2.0
+dnl
+dnl Unless required by applicable law or agreed to in writing,
+dnl software distributed under the License is distributed on an
+dnl "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+dnl KIND, either express or implied. See the License for the
+dnl specific language governing permissions and limitations
+dnl under the License.
+dnl ===================================================================
dnl
dnl SVN_LIB_APR(wanted_regex, alt_wanted_regex)
dnl
@@ -94,6 +112,7 @@ AC_DEFUN(SVN_LIB_APR,
fi
AC_SUBST(SVN_APR_PREFIX)
+ AC_SUBST(SVN_APR_CONFIG, ["$apr_config"])
AC_SUBST(SVN_APR_INCLUDES)
AC_SUBST(SVN_APR_LIBS)
AC_SUBST(SVN_APR_SHLIB_PATH_VAR)
@@ -112,7 +131,7 @@ AC_DEFUN(SVN_DOWNLOAD_APR,
echo "get it with SVN and put it in a subdirectory of this source:"
echo ""
echo " svn co \\"
- echo " http://svn.apache.org/repos/asf/apr/apr/branches/1.2.x \\"
+ echo " http://svn.apache.org/repos/asf/apr/apr/branches/1.3.x \\"
echo " apr"
echo ""
echo "Run that right here in the top level of the Subversion tree."
@@ -125,7 +144,7 @@ AC_DEFUN(SVN_DOWNLOAD_APR,
echo "getting both from SVN with:"
echo ""
echo " svn co \\"
- echo " http://svn.apache.org/repos/asf/apr/apr-util/branches/1.2.x \\"
+ echo " http://svn.apache.org/repos/asf/apr/apr-util/branches/1.3.x \\"
echo " apr-util"
echo ""
AC_MSG_ERROR([no suitable apr found])
Modified: subversion/branches/ignore-mergeinfo/build/ac-macros/apr_memcache.m4
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/build/ac-macros/apr_memcache.m4?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/build/ac-macros/apr_memcache.m4 (original)
+++ subversion/branches/ignore-mergeinfo/build/ac-macros/apr_memcache.m4 Tue Aug 10 17:03:06 2010
@@ -1,3 +1,21 @@
+dnl ===================================================================
+dnl Licensed to the Apache Software Foundation (ASF) under one
+dnl or more contributor license agreements. See the NOTICE file
+dnl distributed with this work for additional information
+dnl regarding copyright ownership. The ASF licenses this file
+dnl to you under the Apache License, Version 2.0 (the
+dnl "License"); you may not use this file except in compliance
+dnl with the License. You may obtain a copy of the License at
+dnl
+dnl http://www.apache.org/licenses/LICENSE-2.0
+dnl
+dnl Unless required by applicable law or agreed to in writing,
+dnl software distributed under the License is distributed on an
+dnl "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+dnl KIND, either express or implied. See the License for the
+dnl specific language governing permissions and limitations
+dnl under the License.
+dnl ===================================================================
dnl
dnl SVN_LIB_APR_MEMCACHE
dnl
Modified: subversion/branches/ignore-mergeinfo/build/ac-macros/aprutil.m4
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/build/ac-macros/aprutil.m4?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/build/ac-macros/aprutil.m4 (original)
+++ subversion/branches/ignore-mergeinfo/build/ac-macros/aprutil.m4 Tue Aug 10 17:03:06 2010
@@ -1,3 +1,22 @@
+dnl ===================================================================
+dnl Licensed to the Apache Software Foundation (ASF) under one
+dnl or more contributor license agreements. See the NOTICE file
+dnl distributed with this work for additional information
+dnl regarding copyright ownership. The ASF licenses this file
+dnl to you under the Apache License, Version 2.0 (the
+dnl "License"); you may not use this file except in compliance
+dnl with the License. You may obtain a copy of the License at
+dnl
+dnl http://www.apache.org/licenses/LICENSE-2.0
+dnl
+dnl Unless required by applicable law or agreed to in writing,
+dnl software distributed under the License is distributed on an
+dnl "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+dnl KIND, either express or implied. See the License for the
+dnl specific language governing permissions and limitations
+dnl under the License.
+dnl ===================================================================
+dnl
dnl SVN_LIB_APRUTIL(wanted_regex, alt_wanted_regex)
dnl
dnl 'wanted_regex' and 'alt_wanted_regex are regular expressions
@@ -92,6 +111,7 @@ AC_DEFUN(SVN_LIB_APRUTIL,
SVN_APRUTIL_LIBS="`SVN_REMOVE_STANDARD_LIB_DIRS($SVN_APRUTIL_LIBS)`"
AC_SUBST(SVN_APRUTIL_INCLUDES)
+ AC_SUBST(SVN_APRUTIL_CONFIG, ["$apu_config"])
AC_SUBST(SVN_APRUTIL_LIBS)
AC_SUBST(SVN_APRUTIL_PREFIX)
@@ -115,7 +135,7 @@ AC_DEFUN(SVN_DOWNLOAD_APRUTIL,
echo "get it with SVN and put it in a subdirectory of this source:"
echo ""
echo " svn co \\"
- echo " http://svn.apache.org/repos/asf/apr/apr-util/branches/1.2.x \\"
+ echo " http://svn.apache.org/repos/asf/apr/apr-util/branches/1.3.x \\"
echo " apr-util"
echo ""
echo "Run that right here in the top level of the Subversion tree."
Modified: subversion/branches/ignore-mergeinfo/build/ac-macros/berkeley-db.m4
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/build/ac-macros/berkeley-db.m4?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/build/ac-macros/berkeley-db.m4 (original)
+++ subversion/branches/ignore-mergeinfo/build/ac-macros/berkeley-db.m4 Tue Aug 10 17:03:06 2010
@@ -1,3 +1,22 @@
+dnl ===================================================================
+dnl Licensed to the Apache Software Foundation (ASF) under one
+dnl or more contributor license agreements. See the NOTICE file
+dnl distributed with this work for additional information
+dnl regarding copyright ownership. The ASF licenses this file
+dnl to you under the Apache License, Version 2.0 (the
+dnl "License"); you may not use this file except in compliance
+dnl with the License. You may obtain a copy of the License at
+dnl
+dnl http://www.apache.org/licenses/LICENSE-2.0
+dnl
+dnl Unless required by applicable law or agreed to in writing,
+dnl software distributed under the License is distributed on an
+dnl "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+dnl KIND, either express or implied. See the License for the
+dnl specific language governing permissions and limitations
+dnl under the License.
+dnl ===================================================================
+dnl
dnl SVN_LIB_BERKELEY_DB(major, minor, patch)
dnl
dnl Compare if the Berkeley DB specified by user or provided by APR-UTIL
Modified: subversion/branches/ignore-mergeinfo/build/ac-macros/ctypesgen.m4
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/build/ac-macros/ctypesgen.m4?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/build/ac-macros/ctypesgen.m4 (original)
+++ subversion/branches/ignore-mergeinfo/build/ac-macros/ctypesgen.m4 Tue Aug 10 17:03:06 2010
@@ -1,3 +1,21 @@
+dnl ===================================================================
+dnl Licensed to the Apache Software Foundation (ASF) under one
+dnl or more contributor license agreements. See the NOTICE file
+dnl distributed with this work for additional information
+dnl regarding copyright ownership. The ASF licenses this file
+dnl to you under the Apache License, Version 2.0 (the
+dnl "License"); you may not use this file except in compliance
+dnl with the License. You may obtain a copy of the License at
+dnl
+dnl http://www.apache.org/licenses/LICENSE-2.0
+dnl
+dnl Unless required by applicable law or agreed to in writing,
+dnl software distributed under the License is distributed on an
+dnl "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+dnl KIND, either express or implied. See the License for the
+dnl specific language governing permissions and limitations
+dnl under the License.
+dnl ===================================================================
dnl
dnl ctypesgen.m4: Locates ctypesgen for building/installing ctypes-python.
dnl
Modified: subversion/branches/ignore-mergeinfo/build/ac-macros/find_apr.m4
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/build/ac-macros/find_apr.m4?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/build/ac-macros/find_apr.m4 (original)
+++ subversion/branches/ignore-mergeinfo/build/ac-macros/find_apr.m4 Tue Aug 10 17:03:06 2010
@@ -1,3 +1,21 @@
+dnl ===================================================================
+dnl Licensed to the Apache Software Foundation (ASF) under one
+dnl or more contributor license agreements. See the NOTICE file
+dnl distributed with this work for additional information
+dnl regarding copyright ownership. The ASF licenses this file
+dnl to you under the Apache License, Version 2.0 (the
+dnl "License"); you may not use this file except in compliance
+dnl with the License. You may obtain a copy of the License at
+dnl
+dnl http://www.apache.org/licenses/LICENSE-2.0
+dnl
+dnl Unless required by applicable law or agreed to in writing,
+dnl software distributed under the License is distributed on an
+dnl "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+dnl KIND, either express or implied. See the License for the
+dnl specific language governing permissions and limitations
+dnl under the License.
+dnl ===================================================================
dnl
dnl find_apr.m4 : locate the APR include files and libraries
dnl
Modified: subversion/branches/ignore-mergeinfo/build/ac-macros/find_apu.m4
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/build/ac-macros/find_apu.m4?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/build/ac-macros/find_apu.m4 (original)
+++ subversion/branches/ignore-mergeinfo/build/ac-macros/find_apu.m4 Tue Aug 10 17:03:06 2010
@@ -1,3 +1,21 @@
+dnl ===================================================================
+dnl Licensed to the Apache Software Foundation (ASF) under one
+dnl or more contributor license agreements. See the NOTICE file
+dnl distributed with this work for additional information
+dnl regarding copyright ownership. The ASF licenses this file
+dnl to you under the Apache License, Version 2.0 (the
+dnl "License"); you may not use this file except in compliance
+dnl with the License. You may obtain a copy of the License at
+dnl
+dnl http://www.apache.org/licenses/LICENSE-2.0
+dnl
+dnl Unless required by applicable law or agreed to in writing,
+dnl software distributed under the License is distributed on an
+dnl "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+dnl KIND, either express or implied. See the License for the
+dnl specific language governing permissions and limitations
+dnl under the License.
+dnl ===================================================================
dnl
dnl find_apu.m4 : locate the APR-util (APU) include files and libraries
dnl
Modified: subversion/branches/ignore-mergeinfo/build/ac-macros/gssapi.m4
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/build/ac-macros/gssapi.m4?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/build/ac-macros/gssapi.m4 (original)
+++ subversion/branches/ignore-mergeinfo/build/ac-macros/gssapi.m4 Tue Aug 10 17:03:06 2010
@@ -1,3 +1,21 @@
+dnl ===================================================================
+dnl Licensed to the Apache Software Foundation (ASF) under one
+dnl or more contributor license agreements. See the NOTICE file
+dnl distributed with this work for additional information
+dnl regarding copyright ownership. The ASF licenses this file
+dnl to you under the Apache License, Version 2.0 (the
+dnl "License"); you may not use this file except in compliance
+dnl with the License. You may obtain a copy of the License at
+dnl
+dnl http://www.apache.org/licenses/LICENSE-2.0
+dnl
+dnl Unless required by applicable law or agreed to in writing,
+dnl software distributed under the License is distributed on an
+dnl "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+dnl KIND, either express or implied. See the License for the
+dnl specific language governing permissions and limitations
+dnl under the License.
+dnl ===================================================================
dnl
dnl SVN_LIB_GSSAPI
dnl
Modified: subversion/branches/ignore-mergeinfo/build/ac-macros/java.m4
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/build/ac-macros/java.m4?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/build/ac-macros/java.m4 (original)
+++ subversion/branches/ignore-mergeinfo/build/ac-macros/java.m4 Tue Aug 10 17:03:06 2010
@@ -1,3 +1,21 @@
+dnl ===================================================================
+dnl Licensed to the Apache Software Foundation (ASF) under one
+dnl or more contributor license agreements. See the NOTICE file
+dnl distributed with this work for additional information
+dnl regarding copyright ownership. The ASF licenses this file
+dnl to you under the Apache License, Version 2.0 (the
+dnl "License"); you may not use this file except in compliance
+dnl with the License. You may obtain a copy of the License at
+dnl
+dnl http://www.apache.org/licenses/LICENSE-2.0
+dnl
+dnl Unless required by applicable law or agreed to in writing,
+dnl software distributed under the License is distributed on an
+dnl "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+dnl KIND, either express or implied. See the License for the
+dnl specific language governing permissions and limitations
+dnl under the License.
+dnl ===================================================================
dnl
dnl java.m4: Locates the JDK and its include files and libraries.
dnl
Modified: subversion/branches/ignore-mergeinfo/build/ac-macros/kwallet.m4
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/build/ac-macros/kwallet.m4?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/build/ac-macros/kwallet.m4 (original)
+++ subversion/branches/ignore-mergeinfo/build/ac-macros/kwallet.m4 Tue Aug 10 17:03:06 2010
@@ -1,3 +1,21 @@
+dnl ===================================================================
+dnl Licensed to the Apache Software Foundation (ASF) under one
+dnl or more contributor license agreements. See the NOTICE file
+dnl distributed with this work for additional information
+dnl regarding copyright ownership. The ASF licenses this file
+dnl to you under the Apache License, Version 2.0 (the
+dnl "License"); you may not use this file except in compliance
+dnl with the License. You may obtain a copy of the License at
+dnl
+dnl http://www.apache.org/licenses/LICENSE-2.0
+dnl
+dnl Unless required by applicable law or agreed to in writing,
+dnl software distributed under the License is distributed on an
+dnl "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+dnl KIND, either express or implied. See the License for the
+dnl specific language governing permissions and limitations
+dnl under the License.
+dnl ===================================================================
dnl
dnl SVN_LIB_KWALLET
dnl
Modified: subversion/branches/ignore-mergeinfo/build/ac-macros/neon.m4
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/build/ac-macros/neon.m4?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/build/ac-macros/neon.m4 (original)
+++ subversion/branches/ignore-mergeinfo/build/ac-macros/neon.m4 Tue Aug 10 17:03:06 2010
@@ -1,3 +1,22 @@
+dnl ===================================================================
+dnl Licensed to the Apache Software Foundation (ASF) under one
+dnl or more contributor license agreements. See the NOTICE file
+dnl distributed with this work for additional information
+dnl regarding copyright ownership. The ASF licenses this file
+dnl to you under the Apache License, Version 2.0 (the
+dnl "License"); you may not use this file except in compliance
+dnl with the License. You may obtain a copy of the License at
+dnl
+dnl http://www.apache.org/licenses/LICENSE-2.0
+dnl
+dnl Unless required by applicable law or agreed to in writing,
+dnl software distributed under the License is distributed on an
+dnl "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+dnl KIND, either express or implied. See the License for the
+dnl specific language governing permissions and limitations
+dnl under the License.
+dnl ===================================================================
+dnl
dnl SVN_LIB_NEON(allowed_list_of_regex, recommended_ver, url)
dnl
dnl Search for a suitable version of neon. allowed_list_of_regex is a
Modified: subversion/branches/ignore-mergeinfo/build/ac-macros/sasl.m4
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/build/ac-macros/sasl.m4?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/build/ac-macros/sasl.m4 (original)
+++ subversion/branches/ignore-mergeinfo/build/ac-macros/sasl.m4 Tue Aug 10 17:03:06 2010
@@ -1,3 +1,21 @@
+dnl ===================================================================
+dnl Licensed to the Apache Software Foundation (ASF) under one
+dnl or more contributor license agreements. See the NOTICE file
+dnl distributed with this work for additional information
+dnl regarding copyright ownership. The ASF licenses this file
+dnl to you under the Apache License, Version 2.0 (the
+dnl "License"); you may not use this file except in compliance
+dnl with the License. You may obtain a copy of the License at
+dnl
+dnl http://www.apache.org/licenses/LICENSE-2.0
+dnl
+dnl Unless required by applicable law or agreed to in writing,
+dnl software distributed under the License is distributed on an
+dnl "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+dnl KIND, either express or implied. See the License for the
+dnl specific language governing permissions and limitations
+dnl under the License.
+dnl ===================================================================
dnl
dnl SVN_LIB_SASL
dnl
Modified: subversion/branches/ignore-mergeinfo/build/ac-macros/serf.m4
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/build/ac-macros/serf.m4?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/build/ac-macros/serf.m4 (original)
+++ subversion/branches/ignore-mergeinfo/build/ac-macros/serf.m4 Tue Aug 10 17:03:06 2010
@@ -1,3 +1,21 @@
+dnl ===================================================================
+dnl Licensed to the Apache Software Foundation (ASF) under one
+dnl or more contributor license agreements. See the NOTICE file
+dnl distributed with this work for additional information
+dnl regarding copyright ownership. The ASF licenses this file
+dnl to you under the Apache License, Version 2.0 (the
+dnl "License"); you may not use this file except in compliance
+dnl with the License. You may obtain a copy of the License at
+dnl
+dnl http://www.apache.org/licenses/LICENSE-2.0
+dnl
+dnl Unless required by applicable law or agreed to in writing,
+dnl software distributed under the License is distributed on an
+dnl "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+dnl KIND, either express or implied. See the License for the
+dnl specific language governing permissions and limitations
+dnl under the License.
+dnl ===================================================================
dnl
dnl SVN_LIB_SERF
dnl
Modified: subversion/branches/ignore-mergeinfo/build/ac-macros/sqlite.m4
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/build/ac-macros/sqlite.m4?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/build/ac-macros/sqlite.m4 (original)
+++ subversion/branches/ignore-mergeinfo/build/ac-macros/sqlite.m4 Tue Aug 10 17:03:06 2010
@@ -1,3 +1,22 @@
+dnl ===================================================================
+dnl Licensed to the Apache Software Foundation (ASF) under one
+dnl or more contributor license agreements. See the NOTICE file
+dnl distributed with this work for additional information
+dnl regarding copyright ownership. The ASF licenses this file
+dnl to you under the Apache License, Version 2.0 (the
+dnl "License"); you may not use this file except in compliance
+dnl with the License. You may obtain a copy of the License at
+dnl
+dnl http://www.apache.org/licenses/LICENSE-2.0
+dnl
+dnl Unless required by applicable law or agreed to in writing,
+dnl software distributed under the License is distributed on an
+dnl "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+dnl KIND, either express or implied. See the License for the
+dnl specific language governing permissions and limitations
+dnl under the License.
+dnl ===================================================================
+dnl
dnl SVN_LIB_SQLITE(minimum_ver, recommended_ver, url)
dnl
dnl Search for a suitable version of sqlite. minimum_ver is a
Modified: subversion/branches/ignore-mergeinfo/build/ac-macros/svn-macros.m4
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/build/ac-macros/svn-macros.m4?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/build/ac-macros/svn-macros.m4 (original)
+++ subversion/branches/ignore-mergeinfo/build/ac-macros/svn-macros.m4 Tue Aug 10 17:03:06 2010
@@ -1,3 +1,22 @@
+dnl ===================================================================
+dnl Licensed to the Apache Software Foundation (ASF) under one
+dnl or more contributor license agreements. See the NOTICE file
+dnl distributed with this work for additional information
+dnl regarding copyright ownership. The ASF licenses this file
+dnl to you under the Apache License, Version 2.0 (the
+dnl "License"); you may not use this file except in compliance
+dnl with the License. You may obtain a copy of the License at
+dnl
+dnl http://www.apache.org/licenses/LICENSE-2.0
+dnl
+dnl Unless required by applicable law or agreed to in writing,
+dnl software distributed under the License is distributed on an
+dnl "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+dnl KIND, either express or implied. See the License for the
+dnl specific language governing permissions and limitations
+dnl under the License.
+dnl ===================================================================
+dnl
# Miscellaneous additional macros for Subversion's own use.
# SVN_CONFIG_NICE(FILENAME)
Modified: subversion/branches/ignore-mergeinfo/build/ac-macros/swig.m4
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/build/ac-macros/swig.m4?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/build/ac-macros/swig.m4 (original)
+++ subversion/branches/ignore-mergeinfo/build/ac-macros/swig.m4 Tue Aug 10 17:03:06 2010
@@ -1,3 +1,22 @@
+dnl ===================================================================
+dnl Licensed to the Apache Software Foundation (ASF) under one
+dnl or more contributor license agreements. See the NOTICE file
+dnl distributed with this work for additional information
+dnl regarding copyright ownership. The ASF licenses this file
+dnl to you under the Apache License, Version 2.0 (the
+dnl "License"); you may not use this file except in compliance
+dnl with the License. You may obtain a copy of the License at
+dnl
+dnl http://www.apache.org/licenses/LICENSE-2.0
+dnl
+dnl Unless required by applicable law or agreed to in writing,
+dnl software distributed under the License is distributed on an
+dnl "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+dnl KIND, either express or implied. See the License for the
+dnl specific language governing permissions and limitations
+dnl under the License.
+dnl ===================================================================
+dnl
dnl check to see if SWIG is current enough.
dnl
dnl if it is, then check to see if we have the correct version of python.
Modified: subversion/branches/ignore-mergeinfo/build/ac-macros/zlib.m4
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/build/ac-macros/zlib.m4?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/build/ac-macros/zlib.m4 (original)
+++ subversion/branches/ignore-mergeinfo/build/ac-macros/zlib.m4 Tue Aug 10 17:03:06 2010
@@ -1,3 +1,21 @@
+dnl ===================================================================
+dnl Licensed to the Apache Software Foundation (ASF) under one
+dnl or more contributor license agreements. See the NOTICE file
+dnl distributed with this work for additional information
+dnl regarding copyright ownership. The ASF licenses this file
+dnl to you under the Apache License, Version 2.0 (the
+dnl "License"); you may not use this file except in compliance
+dnl with the License. You may obtain a copy of the License at
+dnl
+dnl http://www.apache.org/licenses/LICENSE-2.0
+dnl
+dnl Unless required by applicable law or agreed to in writing,
+dnl software distributed under the License is distributed on an
+dnl "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+dnl KIND, either express or implied. See the License for the
+dnl specific language governing permissions and limitations
+dnl under the License.
+dnl ===================================================================
dnl
dnl SVN_LIB_Z
dnl
Modified: subversion/branches/ignore-mergeinfo/build/buildcheck.sh
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/build/buildcheck.sh?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/build/buildcheck.sh (original)
+++ subversion/branches/ignore-mergeinfo/build/buildcheck.sh Tue Aug 10 17:03:06 2010
@@ -1,5 +1,24 @@
#! /bin/sh
#
+#
+# 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.
+#
+#
# buildcheck.sh: Inspects the build setup to make detection and
# correction of problems an easier process.
Modified: subversion/branches/ignore-mergeinfo/build/find_python.sh
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/build/find_python.sh?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/build/find_python.sh (original)
+++ subversion/branches/ignore-mergeinfo/build/find_python.sh Tue Aug 10 17:03:06 2010
@@ -1,4 +1,24 @@
#!/bin/sh
+#
+#
+# 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.
+#
+#
# Required version of Python
# Python 2.0 = 0x2000000
Modified: subversion/branches/ignore-mergeinfo/build/generator/build_locale.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/build/generator/build_locale.ezt?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/build/generator/build_locale.ezt (original)
+++ subversion/branches/ignore-mergeinfo/build/generator/build_locale.ezt Tue Aug 10 17:03:06 2010
@@ -1,3 +1,21 @@
+@rem Licensed to the Apache Software Foundation (ASF) under one
+@rem or more contributor license agreements. See the NOTICE file
+@rem distributed with this work for additional information
+@rem regarding copyright ownership. The ASF licenses this file
+@rem to you under the Apache License, Version 2.0 (the
+@rem "License"); you may not use this file except in compliance
+@rem with the License. You may obtain a copy of the License at
+@rem
+@rem http://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing,
+@rem software distributed under the License is distributed on an
+@rem "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@rem KIND, either express or implied. See the License for the
+@rem specific language governing permissions and limitations
+@rem under the License.
+
+
@echo off
@rem **************************************************************************
cd ..\..\subversion\po
Modified: subversion/branches/ignore-mergeinfo/build/generator/extractor.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/build/generator/extractor.py?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/build/generator/extractor.py (original)
+++ subversion/branches/ignore-mergeinfo/build/generator/extractor.py Tue Aug 10 17:03:06 2010
@@ -3,10 +3,10 @@
# extractor.py: extract function names from declarations in header files
#
# ====================================================================
-# Licensed to the Subversion Corporation (SVN Corp.) under one
+# 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 SVN Corp. licenses this file
+# 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
Modified: subversion/branches/ignore-mergeinfo/build/generator/ezt.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/build/generator/ezt.py?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/build/generator/ezt.py (original)
+++ subversion/branches/ignore-mergeinfo/build/generator/ezt.py Tue Aug 10 17:03:06 2010
@@ -1,4 +1,24 @@
#!/usr/bin/env python
+#
+#
+# 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.
+#
+#
"""ezt.py -- easy templating
ezt templates are simply text files in whatever format you so desire
@@ -221,15 +241,21 @@ Directives
# http://code.google.com/p/ezt/
#
-import re
-from types import StringType, IntType, FloatType, LongType
-import os
-import urllib
-try:
- import cStringIO
-except ImportError:
- import StringIO
- cStringIO = StringIO
+import os, re, sys
+
+if sys.version_info[0] >= 3:
+ # Python >=3.0
+ long = int
+ unicode = str
+ from io import StringIO
+ from urllib.parse import quote_plus as urllib_parse_quote_plus
+else:
+ # Python <3.0
+ from urllib import quote_plus as urllib_parse_quote_plus
+ try:
+ from cStringIO import StringIO
+ except ImportError:
+ from StringIO import StringIO
#
# Formatting types
@@ -305,7 +331,7 @@ class Template:
base_printer=_parse_format(base_format))
def generate(self, fp, data):
- if hasattr(data, '__getitem__') or callable(getattr(data, 'keys', None)):
+ if hasattr(data, '__getitem__') or hasattr(getattr(data, 'keys', None), '__call__'):
# a dictionary-like object was passed. convert it to an
# attribute-based object.
class _data_ob:
@@ -473,13 +499,14 @@ class Template:
to the file object 'fp' and functions are called.
"""
for step in program:
- if isinstance(step, StringType):
+ if isinstance(step, str):
fp.write(step)
else:
method, method_args, filename, line_number = step
method(method_args, fp, ctx, filename, line_number)
- def _cmd_print(self, (transforms, valref), fp, ctx, filename, line_number):
+ def _cmd_print(self, transforms_valref, fp, ctx, filename, line_number):
+ (transforms, valref) = transforms_valref
value = _get_value(valref, ctx, filename, line_number)
# if the value has a 'read' attribute, then it is a stream: copy it
if hasattr(value, 'read'):
@@ -495,8 +522,9 @@ class Template:
value = t(value)
fp.write(value)
- def _cmd_subst(self, (transforms, valref, args), fp, ctx, filename,
+ def _cmd_subst(self, transforms_valref_args, fp, ctx, filename,
line_number):
+ (transforms, valref, args) = transforms_valref_args
fmt = _get_value(valref, ctx, filename, line_number)
parts = _re_subst.split(fmt)
for i in range(len(parts)):
@@ -511,16 +539,18 @@ class Template:
piece = t(piece)
fp.write(piece)
- def _cmd_include(self, (valref, reader, printer), fp, ctx, filename,
+ def _cmd_include(self, valref_reader_printer, fp, ctx, filename,
line_number):
+ (valref, reader, printer) = valref_reader_printer
fname = _get_value(valref, ctx, filename, line_number)
### note: we don't have the set of for_names to pass into this parse.
### I don't think there is anything to do but document it
self._execute(self._parse(reader.read_other(fname), base_printer=printer),
fp, ctx)
- def _cmd_insertfile(self, (valref, reader, printer), fp, ctx, filename,
+ def _cmd_insertfile(self, valref_reader_printer, fp, ctx, filename,
line_number):
+ (valref, reader, printer) = valref_reader_printer
fname = _get_value(valref, ctx, filename, line_number)
fp.write(reader.read_other(fname).text)
@@ -571,7 +601,7 @@ class Template:
((valref,), unused, section) = args
list = _get_value(valref, ctx, filename, line_number)
refname = valref[0]
- if isinstance(list, StringType):
+ if isinstance(list, str):
raise NeedSequenceError(refname, filename, line_number)
ctx.for_index[refname] = idx = [ list, 0 ]
for item in list:
@@ -581,7 +611,7 @@ class Template:
def _cmd_define(self, args, fp, ctx, filename, line_number):
((name,), unused, section) = args
- valfp = cStringIO.StringIO()
+ valfp = StringIO()
if section is not None:
self._execute(section, valfp, ctx)
ctx.defines[name] = valfp.getvalue()
@@ -641,23 +671,24 @@ def _prepare_ref(refname, for_names, fil
return refname, start, rest
-def _get_value((refname, start, rest), ctx, filename, line_number):
- """(refname, start, rest) -> a prepared `value reference' (see above).
+def _get_value(refname_start_rest, ctx, filename, line_number):
+ """refname_start_rest -> a prepared `value reference' (see above).
ctx -> an execution context instance.
Does a name space lookup within the template name space. Active
for blocks take precedence over data dictionary members with the
same name.
"""
+ (refname, start, rest) = refname_start_rest
if rest is None:
# it was a string constant
return start
# get the starting object
- if ctx.for_index.has_key(start):
+ if start in ctx.for_index:
list, idx = ctx.for_index[start]
ob = list[idx]
- elif ctx.defines.has_key(start):
+ elif start in ctx.defines:
ob = ctx.defines[start]
elif hasattr(ctx.data, start):
ob = getattr(ctx.data, start)
@@ -672,7 +703,7 @@ def _get_value((refname, start, rest), c
raise UnknownReference(refname, filename, line_number)
# make sure we return a string instead of some various Python types
- if isinstance(ob, (IntType, FloatType, LongType)):
+ if isinstance(ob, (int, long, float)):
return str(ob)
if ob is None:
return ''
@@ -692,9 +723,14 @@ REPLACE_JS_MAP = (
)
# Various unicode whitespace
-REPLACE_JS_UNICODE_MAP = (
- (u'\u0085', r'\u0085'), (u'\u2028', r'\u2028'), (u'\u2029', r'\u2029'),
-)
+if sys.version_info[0] >= 3:
+ # Python >=3.0
+ REPLACE_JS_UNICODE_MAP = (
+ ('\u0085', r'\u0085'), ('\u2028', r'\u2028'), ('\u2029', r'\u2029')
+ )
+else:
+ # Python <3.0
+ REPLACE_JS_UNICODE_MAP = eval("((u'\u0085', r'\u0085'), (u'\u2028', r'\u2028'), (u'\u2029', r'\u2029'))")
# Why not cgi.escape? It doesn't do single quotes which are occasionally
# used to contain HTML attributes and event handler definitions (unfortunately)
@@ -719,7 +755,7 @@ def _url_escape(s):
### UTF-8 encoded first.
if isinstance(s, unicode):
s = s.encode('utf8')
- return urllib.quote_plus(s)
+ return urllib_parse_quote_plus(s)
FORMATTERS = {
FORMAT_RAW: None,
@@ -753,6 +789,9 @@ class _FileReader(Reader):
"""Reads templates from the filesystem."""
def __init__(self, fname):
self.text = open(fname, 'rb').read()
+ if sys.version_info[0] >= 3:
+ # Python >=3.0
+ self.text = self.text.decode()
self._dir = os.path.dirname(fname)
self.fname = fname
def read_other(self, relative):
Modified: subversion/branches/ignore-mergeinfo/build/generator/gen_base.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/build/generator/gen_base.py?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/build/generator/gen_base.py (original)
+++ subversion/branches/ignore-mergeinfo/build/generator/gen_base.py Tue Aug 10 17:03:06 2010
@@ -1,4 +1,24 @@
#
+#
+# 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.
+#
+#
+#
# gen_base.py -- infrastructure for generating makefiles, dependencies, etc.
#
@@ -951,7 +971,7 @@ class IncludeDependencyInfo:
self._domain["apr.swg"][0]: '%',
fname: '%' }
for h in self._deps[fname].keys():
- if (_is_public_include(h)
+ if (_is_public_include(h)
or h == os.path.join('subversion', 'include', 'private',
'svn_debug.h')):
hdrs[_swig_include_wrapper(h)] = '%'
Modified: subversion/branches/ignore-mergeinfo/build/generator/gen_make.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/build/generator/gen_make.py?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/build/generator/gen_make.py (original)
+++ subversion/branches/ignore-mergeinfo/build/generator/gen_make.py Tue Aug 10 17:03:06 2010
@@ -1,4 +1,24 @@
#
+#
+# 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.
+#
+#
+#
# gen_make.py -- generate makefiles and dependencies
#
@@ -136,6 +156,9 @@ class Generator(gen_base.GeneratorBase):
and not target.external_lib \
and target.filename[-3:] != '.la':
cfiles.append(target.filename)
+ for script in self.scripts:
+ if script.endswith('.py'):
+ cfiles.append(script + 'c')
data.cfiles = sorted(cfiles)
# here are all the SQL files and their generated headers. the Makefile
Modified: subversion/branches/ignore-mergeinfo/build/generator/gen_msvc_dsp.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/build/generator/gen_msvc_dsp.py?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/build/generator/gen_msvc_dsp.py (original)
+++ subversion/branches/ignore-mergeinfo/build/generator/gen_msvc_dsp.py Tue Aug 10 17:03:06 2010
@@ -1,4 +1,24 @@
#
+#
+# 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.
+#
+#
+#
# gen_dsp.py -- generate Microsoft Visual C++ 6 projects
#
Modified: subversion/branches/ignore-mergeinfo/build/generator/gen_vcnet_vcproj.py
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/build/generator/gen_vcnet_vcproj.py?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/build/generator/gen_vcnet_vcproj.py (original)
+++ subversion/branches/ignore-mergeinfo/build/generator/gen_vcnet_vcproj.py Tue Aug 10 17:03:06 2010
@@ -1,15 +1,28 @@
#
+#
+# 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.
+#
+#
+#
# gen_vcnet.py -- generate Microsoft Visual C++.NET projects
#
import os
-try:
- # Python >=2.5
- from hashlib import md5 as hashlib_md5
-except ImportError:
- # Python <2.5
- from md5 import md5 as hashlib_md5
-
import gen_base
import gen_win
import ezt
@@ -37,23 +50,28 @@ class Generator(gen_win.WinGeneratorBase
return vcproj
- def write_project(self, target, fname):
- "Write a Project (.vcproj)"
+ def write_project(self, target, fname, depends):
+ "Write a Project (.vcproj/.vcxproj)"
if isinstance(target, gen_base.TargetProject):
- config_type=10
+ config_type='Utility'
+ target_type=10
elif isinstance(target, gen_base.TargetExe):
- #EXE
- config_type=1
+ config_type='Application'
+ target_type=1
elif isinstance(target, gen_base.TargetJava):
- config_type=10
+ config_type='Utility'
+ target_type=10
elif isinstance(target, gen_base.TargetLib):
if target.msvc_static:
- config_type=4
+ config_type='StaticLibrary'
+ target_type=4
else:
- config_type=2
+ config_type='DynamicLibrary'
+ target_type=2
elif isinstance(target, gen_base.TargetI18N):
- config_type=4
+ config_type='Makefile'
+ target_type=4
else:
raise gen_base.GenError("Cannot create project for %s" % target.name)
@@ -61,23 +79,33 @@ class Generator(gen_win.WinGeneratorBase
target.output_pdb = self.get_output_pdb(target)
target.output_dir = self.get_output_dir(target)
target.intermediate_dir = self.get_intermediate_dir(target)
+ basename = os.path.basename(target.output_name)
+ target.output_ext = basename[basename.rfind('.'):]
+ target.output_name_without_ext = basename[:basename.rfind('.')]
configs = self.get_configs(target)
sources = self.get_proj_sources(False, target)
+ if self.vcproj_extension == '.vcxproj':
+ for src in sources:
+ if src.custom_build is not None:
+ src.custom_build = src.custom_build.replace('$(InputPath)', '%(FullPath)')
+
data = {
'target' : target,
- 'target_type' : config_type,
-# 'target_number' : targval,
+ 'target_type' : target_type,
+ 'project_guid' : target.project_guid,
'rootpath' : self.rootpath,
'platforms' : self.platforms,
+ 'config_type' : config_type,
'configs' : configs,
'includes' : self.get_win_includes(target),
'sources' : sources,
'default_platform' : self.platforms[0],
'default_config' : configs[0].name,
'def_file' : self.get_def_file(target),
+ 'depends' : depends,
'is_exe' : ezt.boolean(isinstance(target, gen_base.TargetExe)),
'is_external' : ezt.boolean((isinstance(target, gen_base.TargetProject)
or isinstance(target, gen_base.TargetI18N))
@@ -86,40 +114,14 @@ class Generator(gen_win.WinGeneratorBase
gen_base.TargetProject)),
'instrument_apr_pools' : self.instrument_apr_pools,
'instrument_purify_quantify' : self.instrument_purify_quantify,
- 'version' : self.vsnet_proj_ver,
+ 'version' : self.vcproj_version,
}
- self.write_with_template(fname, 'vcnet_vcproj.ezt', data)
-
- def makeguid(self, data):
- "Generate a windows style GUID"
- ### blah. this function can generate invalid GUIDs. leave it for now,
- ### but we need to fix it. we can wrap the apr UUID functions, or
- ### implement this from scratch using the algorithms described in
- ### http://www.webdav.org/specs/draft-leach-uuids-guids-01.txt
-
- myhash = hashlib_md5(data).hexdigest()
-
- guid = ("{%s-%s-%s-%s-%s}" % (myhash[0:8], myhash[8:12],
- myhash[12:16], myhash[16:20],
- myhash[20:32])).upper()
- return guid
-
- def getguid(self, path):
- "Try to get a project's guid from its project file"
- try:
- proj = open(path)
- line = proj.readline()
- while len(line) > 0:
- l = line.lower()
- pos = l.find('projectguid="{')
- if pos >= 0:
- guid = line[pos+13:pos+13+38]
- return guid
- line = proj.readline()
- proj.close()
- except IOError:
- return None
+ if self.vcproj_extension == '.vcproj':
+ self.write_with_template(fname, 'templates/vcnet_vcproj.ezt', data)
+ else:
+ self.write_with_template(fname, 'templates/vcnet_vcxproj.ezt', data)
+ self.write_with_template(fname + '.filters', 'templates/vcnet_vcxproj_filters.ezt', data)
def write(self):
"Write a Solution (.sln)"
@@ -133,21 +135,27 @@ class Generator(gen_win.WinGeneratorBase
sql=[]
for hdrfile, sqlfile in sorted(self.graph.get_deps(gen_base.DT_SQLHDR),
key=lambda t: t[0]):
- sql.append(_eztdata(header=hdrfile.replace('/', '\\'),
+ sql.append(_eztdata(header=hdrfile.replace('/', '\\'),
source=sqlfile[0].replace('/', '\\'),
svn_python=sys.executable))
# apr doesn't supply vcproj files, the user must convert them
# manually before loading the generated solution
- self.move_proj_file(os.path.join('build', 'win32'), 'svn_config.vcproj',
+ self.move_proj_file(os.path.join('build', 'win32'),
+ 'svn_config' + self.vcproj_extension,
(
('sql', sql),
+ ('project_guid', self.makeguid('__CONFIG__')),
)
)
- self.move_proj_file(os.path.join('build', 'win32'), 'svn_locale.vcproj')
- self.write_zlib_project_file('zlib.vcproj')
- self.write_neon_project_file('neon.vcproj')
- self.write_serf_project_file('serf.vcproj')
+ self.move_proj_file(os.path.join('build', 'win32'),
+ 'svn_locale' + self.vcproj_extension,
+ (
+ ('project_guid', self.makeguid('svn_locale')),
+ ))
+ self.write_zlib_project_file('zlib' + self.vcproj_extension)
+ self.write_neon_project_file('neon' + self.vcproj_extension)
+ self.write_serf_project_file('serf' + self.vcproj_extension)
install_targets = self.get_install_targets()
@@ -155,41 +163,30 @@ class Generator(gen_win.WinGeneratorBase
guids = { }
- # VC.NET uses GUIDs to refer to projects. Get them up front
+ # Visual Studio uses GUIDs to refer to projects. Get them up front
# because we need them already assigned on the dependencies for
# each target we work with.
for target in install_targets:
- # These aren't working yet
- if isinstance(target, gen_base.TargetProject) and target.cmd:
- continue
# If there is a GUID in an external project, then use it
# rather than generating our own that won't match and will
# cause dependency failures.
- guid = None
- proj_path = self.get_external_project(target, 'vcproj')
+ proj_path = self.get_external_project(target, self.vcproj_extension[1:])
if proj_path is not None:
- guid = self.getguid(proj_path)
- if guid is None:
- guid = self.makeguid(target.name)
- guids[target.name] = guid
+ target.project_guid = self.makeguid(target.name)
+ guids[target.name] = target.project_guid
self.gen_proj_names(install_targets)
- # Traverse the targets and generate the project files
for target in install_targets:
- name = target.name
- # These aren't working yet
- if isinstance(target, gen_base.TargetProject) and target.cmd:
- continue
-
- fname = self.get_external_project(target, 'vcproj')
+ fname = self.get_external_project(target, self.vcproj_extension[1:])
if fname is None:
- fname = os.path.join(self.projfilesdir,
- "%s_vcnet.vcproj" % target.proj_name)
- self.write_project(target, fname)
+ fname = os.path.join(self.projfilesdir, "%s%s" %
+ (target.proj_name, self.vcproj_extension))
+ target.fname = fname
- if '-' in fname:
- fname = '"%s"' % fname
+ # Traverse the targets and generate the project files
+ for target in install_targets:
+ name = target.name
depends = [ ]
if not isinstance(target, gen_base.TargetI18N):
@@ -197,10 +194,20 @@ class Generator(gen_win.WinGeneratorBase
deplist = [ ]
for i in range(len(depends)):
+ if depends[i].fname.startswith(self.projfilesdir):
+ path = depends[i].fname[len(self.projfilesdir) + 1:]
+ else:
+ path = '..\\..\\..\\' + depends[i].fname
deplist.append(gen_win.ProjectItem(guid=guids[depends[i].name],
index=i,
+ path=path,
))
+ fname = self.get_external_project(target, self.vcproj_extension[1:])
+ if fname is None:
+ fname = target.fname
+ self.write_project(target, fname, deplist)
+
groupname = ''
if target.name.startswith('__'):
@@ -237,12 +244,6 @@ class Generator(gen_win.WinGeneratorBase
group=groupname,
))
- # the path name in the .sln template is already enclosed with ""
- # therefore, remove them from the path itself
- for target in targets:
- target.path = target.path.rstrip('"')
- target.path = target.path.lstrip('"')
-
targets.sort(key = lambda x: x.name)
configs = [ ]
@@ -253,15 +254,23 @@ class Generator(gen_win.WinGeneratorBase
# sort the values for output stability.
guidvals = sorted(guids.values())
+ # Before VS2010 dependencies are managed at the solution level
+ if self.vcproj_extension == '.vcproj':
+ dependency_location = 'solution'
+ else:
+ dependency_location = 'project'
+
data = {
- 'version': self.vsnet_version,
+ 'version': self.sln_version,
+ 'vs_version' : self.vs_version,
+ 'dependency_location' : dependency_location,
'targets' : targets,
'configs' : configs,
'platforms' : self.platforms,
'guids' : guidvals,
}
- if self.vsnet_version == '10.00' or self.vsnet_version == '9.00':
- self.write_with_template('subversion_vcnet.sln', 'vc2005_sln.ezt', data)
+ if self.vs_version == '2002' or self.vs_version == '2003':
+ self.write_with_template('subversion_vcnet.sln', 'templates/vcnet_vc7_sln.ezt', data)
else:
- self.write_with_template('subversion_vcnet.sln', 'vcnet_sln.ezt', data)
+ self.write_with_template('subversion_vcnet.sln', 'templates/vcnet_sln.ezt', data)