Author: rinrab
Date: Thu Sep 26 17:09:27 2024
New Revision: 1920962
URL: http://svn.apache.org/viewvc?rev=1920962&view=rev
Log:
On the 'windows-shared-ra-modules' branch: Sync with trunk@1920961.
Added:
subversion/branches/windows-shared-ra-modules/subversion/tests/cmdline/svneditor.sh
- copied unchanged from r1920961,
subversion/trunk/subversion/tests/cmdline/svneditor.sh
Removed:
subversion/branches/windows-shared-ra-modules/subversion/tests/cmdline/svneditor.sh.in
Modified:
subversion/branches/windows-shared-ra-modules/ (props changed)
subversion/branches/windows-shared-ra-modules/INSTALL
subversion/branches/windows-shared-ra-modules/configure.ac
subversion/branches/windows-shared-ra-modules/subversion/bindings/swig/python/tests/repository.py
subversion/branches/windows-shared-ra-modules/subversion/tests/cmdline/
(props changed)
subversion/branches/windows-shared-ra-modules/tools/dev/unix-build/Makefile.svn
Propchange: subversion/branches/windows-shared-ra-modules/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1920930-1920961
Modified: subversion/branches/windows-shared-ra-modules/INSTALL
URL:
http://svn.apache.org/viewvc/subversion/branches/windows-shared-ra-modules/INSTALL?rev=1920962&r1=1920961&r2=1920962&view=diff
==============================================================================
--- subversion/branches/windows-shared-ra-modules/INSTALL (original)
+++ subversion/branches/windows-shared-ra-modules/INSTALL Thu Sep 26 17:09:27
2024
@@ -447,14 +447,6 @@ I. INTRODUCTION
the detection to succeed, the dynamic linker must be able to find
the libraries at configure time.
- If you are on the Windows platform and want to build Subversion,
- a precompiled version of the Berkeley DB library is available for
- download at the Subversion web site "Documents & files" area:
-
-
http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=688
-
- Look in the "Releases > Windows > Windows BDB" section.
-
10. Cyrus SASL library (OPTIONAL)
@@ -892,7 +884,7 @@ II. INSTALLATION
are available from
http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/downloads/index-082944.html
(Version 4.4.20 or in specific cases some higher version recommended)
- For more information see Section I.C.7.
+ For more information see Section I.C.9.
* [Optional] Openssl can be obtained from https://www.openssl.org/source/
* [Optional] NASM can be obtained from http://www.nasm.us/
* [Optional] A modified version of GNU libintl, called
@@ -910,7 +902,7 @@ II. INSTALLATION
The Apache Serf library supports secure connections with OpenSSL
and on-the-wire compression with zlib. If you want to use the
secure connections feature, you should pass the option
- "--with-openssl" to the gen-make.py script. See Section I.C.6 for
+ "--with-openssl" to the gen-make.py script. See Section I.C.7 for
more details.
E.3 Preparation
@@ -1313,7 +1305,7 @@ III. BUILDING A SUBVERSION SERVER
line. Make sure this is the same db as the one Subversion uses.
This note assumes you have installed Berkeley DB 4.2.52
at its default locations. For more info about the db requirement,
- see section I.C.7.
+ see section I.C.9.
You may also want to include other modules in your build. Add
--enable-ssl to turn on SSL support, and --enable-deflate to turn on
Modified: subversion/branches/windows-shared-ra-modules/configure.ac
URL:
http://svn.apache.org/viewvc/subversion/branches/windows-shared-ra-modules/configure.ac?rev=1920962&r1=1920961&r2=1920962&view=diff
==============================================================================
--- subversion/branches/windows-shared-ra-modules/configure.ac (original)
+++ subversion/branches/windows-shared-ra-modules/configure.ac Thu Sep 26
17:09:27 2024
@@ -1764,7 +1764,6 @@ done
SVN_CONFIG_SCRIPT(tools/backup/hot-backup.py)
SVN_CONFIG_SCRIPT(tools/hook-scripts/commit-access-control.pl)
-SVN_CONFIG_SCRIPT(subversion/tests/cmdline/svneditor.sh)
SVN_CONFIG_SCRIPT(subversion/bindings/swig/perl/native/Makefile.PL)
if test -e packages/solaris/pkginfo.in; then
SVN_CONFIG_SCRIPT(packages/solaris/pkginfo)
Modified:
subversion/branches/windows-shared-ra-modules/subversion/bindings/swig/python/tests/repository.py
URL:
http://svn.apache.org/viewvc/subversion/branches/windows-shared-ra-modules/subversion/bindings/swig/python/tests/repository.py?rev=1920962&r1=1920961&r2=1920962&view=diff
==============================================================================
---
subversion/branches/windows-shared-ra-modules/subversion/bindings/swig/python/tests/repository.py
(original)
+++
subversion/branches/windows-shared-ra-modules/subversion/bindings/swig/python/tests/repository.py
Thu Sep 26 17:09:27 2024
@@ -138,7 +138,7 @@ class BatonCollector(repos.ChangeCollect
class BatonCollectorErrorOnClose(BatonCollector):
"""Same as BatonCollector, but raises an Exception when close the
- file/dir specfied by error_path"""
+ file/dir specified by error_path"""
def __init__(self, fs_ptr, root, pool=None, notify_cb=None, error_path=b''):
BatonCollector.__init__(self, fs_ptr, root, pool, notify_cb)
self.error_path = error_path
@@ -444,8 +444,8 @@ class SubversionRepositoryTestCase(unitt
self.assertRaises(SubversionException, repos.replay, root, e_ptr, e_baton)
batons = editor.batons
# As svn_repos_replay calls neither close_edit callback nor abort_edit
- # if an error has occured during processing, references of Python objects
- # in decendant batons may live until e_baton is deleted.
+ # if an error has occurred during processing, references of Python objects
+ # in descendant batons may live until e_baton is deleted.
del e_baton
for baton in batons:
self.assertEqual(sys.getrefcount(baton[2]), 2,
Propchange:
subversion/branches/windows-shared-ra-modules/subversion/tests/cmdline/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Sep 26 17:09:27 2024
@@ -11,4 +11,3 @@ atomic-ra-revprop-change
.libs
.davautocheck.sh.stop
lock-helper
-svneditor.sh
Modified:
subversion/branches/windows-shared-ra-modules/tools/dev/unix-build/Makefile.svn
URL:
http://svn.apache.org/viewvc/subversion/branches/windows-shared-ra-modules/tools/dev/unix-build/Makefile.svn?rev=1920962&r1=1920961&r2=1920962&view=diff
==============================================================================
---
subversion/branches/windows-shared-ra-modules/tools/dev/unix-build/Makefile.svn
(original)
+++
subversion/branches/windows-shared-ra-modules/tools/dev/unix-build/Makefile.svn
Thu Sep 26 17:09:27 2024
@@ -103,7 +103,7 @@ OBJDIR = $(PWD)/objdir
BDB_MAJOR_VER = 4.7
BDB_VER = $(BDB_MAJOR_VER).25
-APR_VER = 1.7.0
+APR_VER = 1.7.5
APR_ICONV_VER = 1.2.1
GNU_ICONV_VER = 1.15
APR_UTIL_VER = 1.6.1
@@ -116,7 +116,7 @@ SQLITE_VER = 3390400
LIBMAGIC_VER = 5.30
RUBY_VER = 2.7.4
BZ2_VER = 1.0.6
-PYTHON_VER = 3.10.8
+PYTHON_VER = 3.11.10
PYTHON2_VER = 2.7.13
PY3C_VER = 1.1
JUNIT_VER = 4.10
@@ -154,7 +154,7 @@ SHA256_${SQLITE_DIST} = f31d445b48e67e28
SHA256_${LIBMAGIC_DIST} =
694c2432e5240187524c9e7cf1ec6acc77b47a0e19554d34c14773e43dbbf214
SHA256_${RUBY_DIST} =
3043099089608859fc8cce7f9fdccaa1f53a462457e3838ec3b25a7d609fbc5b
SHA256_${BZ2_DIST} =
a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd
-SHA256_${PYTHON_DIST} =
f400c3fb394b8bef1292f6dc1292c5fadc3533039a5bc0c3e885f3e16738029a
+SHA256_${PYTHON_DIST} =
92f2faf242681bfa406d53a51e17d42c5373affe23a130cd9697e132ef574706
SHA256_${PYTHON2_DIST} =
a4f05a0720ce0fd92626f0278b6b433eee9a6173ddf2bced7957dfb599a5ece1
SHA256_${PY3C_DIST} =
c7ffc22bc92dded0ca859db53ef3a0b466f89a9f8aad29359c9fe4ff18ebdd20
SHA256_${JUNIT_DIST} =
36a747ca1e0b86f6ea88055b8723bb87030d627766da6288bf077afdeeb0f75a
@@ -1331,9 +1331,25 @@ $(PYTHON_OBJDIR)/openbsd-march.diff:
echo >>$@.tmp ' [MULTIARCH=$$($$CC --print-multiarch 2>/dev/null)]'
mv -f $@.tmp $@
+$(PYTHON_OBJDIR)/openbsd-make.diff:
+ mkdir -p $(dir $@)
+ echo >$@.tmp 'Index: Makefile.pre.in'
+ echo >>$@.tmp '--- Makefile.pre.in.orig'
+ echo >>$@.tmp '+++ Makefile.pre.in'
+ echo >>$@.tmp '@@ -534,8 +534,6 @@ LIBMPDEC_OBJS= \'
+ echo >>$@.tmp '
Modules/_decimal/libmpdec/numbertheory.o \'
+ echo >>$@.tmp ' Modules/_decimal/libmpdec/sixstep.o \'
+ echo >>$@.tmp ' Modules/_decimal/libmpdec/transpose.o'
+ echo >>$@.tmp '- # _decimal does not use signaling API'
+ echo >>$@.tmp '- # Modules/_decimal/libmpdec/mpsignal.o'
+ echo >>$@.tmp ' '
+ echo >>$@.tmp ' LIBMPDEC_HEADERS= \'
+ echo >>$@.tmp '
$(srcdir)/Modules/_decimal/libmpdec/basearith.h \'
+ mv -f $@.tmp $@
+
# retrieve python
#
-$(PYTHON_OBJDIR)/.retrieved: $(DISTDIR)/$(PYTHON_DIST)
$(PYTHON_OBJDIR)/openbsd-march.diff
+$(PYTHON_OBJDIR)/.retrieved: $(DISTDIR)/$(PYTHON_DIST)
$(PYTHON_OBJDIR)/openbsd-march.diff $(PYTHON_OBJDIR)/openbsd-make.diff
$(call do_check_sha256,$(PYTHON_DIST))
[ -d $(PYTHON_OBJDIR) ] || mkdir -p $(PYTHON_OBJDIR)
tar -C $(SRCDIR) -zxf $(DISTDIR)/$(PYTHON_DIST)
@@ -1348,6 +1364,7 @@ $(PYTHON_OBJDIR)/.retrieved: $(DISTDIR)/
mv $(PYTHON_SRCDIR)/setup.py.patched $(PYTHON_SRCDIR)/setup.py
chmod +x $(PYTHON_SRCDIR)/setup.py
cd $(PYTHON_SRCDIR) && patch -p0 < $(PYTHON_OBJDIR)/openbsd-march.diff
+ cd $(PYTHON_SRCDIR) && patch -p0 < $(PYTHON_OBJDIR)/openbsd-make.diff
touch $@
# configure python
@@ -1715,6 +1732,7 @@ LIBMAGIC_FLAG=--with-libmagic=$(PREFIX)/
NEON_FLAG=--with-neon="$(PREFIX)/neon"
JAVAHL_CHECK_TARGET=check-javahl
SWIG_OLD_FLAG=--with-swig=$(PREFIX)/swig-old/bin/swig
+PYTHON_BIN_PATH=$(PREFIX)/python2/bin
else ifeq ($(BRANCH_MAJOR),1.6)
BDB_FLAG=db.h:$(PREFIX)/bdb/include:$(PREFIX)/bdb/lib:db-$(BDB_MAJOR_VER)
SERF_LDFLAG=-Wl,-rpath,$(PREFIX)/serf/lib -Wl,-rpath,$(PREFIX)/bdb/lib
@@ -1725,6 +1743,7 @@ W_NO_SYSTEM_HEADERS=-Wno-system-headers
NEON_FLAG=--with-neon="$(PREFIX)/neon"
JAVAHL_CHECK_TARGET=check-javahl
SWIG_OLD_FLAG=--with-swig=$(PREFIX)/swig-old/bin/swig
+PYTHON_BIN_PATH=$(PREFIX)/python2/bin
else ifeq ($(BRANCH_MAJOR), $(filter 1.8 1.9, $(BRANCH_MAJOR)))
BDB_FLAG=db.h:$(PREFIX)/bdb/include:$(PREFIX)/bdb/lib:db-$(BDB_MAJOR_VER)
# serf >= 1.3.0 is built with scons and no longer sets up rpath linker flags,
@@ -1736,6 +1755,7 @@ MOD_DONTDOTHAT=modules/svn-$(WC)/mod_don
LIBMAGIC_FLAG=--with-libmagic=$(PREFIX)/libmagic
JAVAHL_CHECK_TARGET=check-all-javahl
SWIG_OLD_FLAG=--with-swig=$(PREFIX)/swig-old/bin/swig
+PYTHON_BIN_PATH=$(PREFIX)/python2/bin
else ifeq ($(BRANCH_MAJOR), $(filter 1.10 1.11, 1.12, 1.13 $(BRANCH_MAJOR)))
BDB_FLAG=db.h:$(PREFIX)/bdb/include:$(PREFIX)/bdb/lib:db-$(BDB_MAJOR_VER)
# serf >= 1.3.0 is built with scons and no longer sets up rpath linker flags,
@@ -1750,6 +1770,7 @@ JAVAHL_CHECK_TARGET=check-all-javahl
LZ4_FLAG=--with-lz4=$(PREFIX)/lz4
UTF8PROC_FLAG=--with-utf8proc=internal
SWIG_OLD_FLAG=--with-swig=$(PREFIX)/swig-old/bin/swig
+PYTHON_BIN_PATH=$(PREFIX)/python2/bin
else # 1.14, trunk
BDB_FLAG=db.h:$(PREFIX)/bdb/include:$(PREFIX)/bdb/lib:db-$(BDB_MAJOR_VER)
# serf >= 1.3.0 is built with scons and no longer sets up rpath linker flags,
@@ -1763,6 +1784,7 @@ LIBMAGIC_FLAG=--with-libmagic=$(PREFIX)/
JAVAHL_CHECK_TARGET=check-all-javahl
LZ4_FLAG=--with-lz4=$(PREFIX)/lz4
UTF8PROC_FLAG=--with-utf8proc=internal
+PYTHON_BIN_PATH=$(PREFIX)/python/bin
endif
ifeq ($(ENABLE_JAVA_BINDINGS),yes)
@@ -1834,6 +1856,7 @@ $(SVN_OBJDIR)/.configured: $(SVN_OBJDIR)
$(LZ4_FLAG) \
$(UTF8PROC_FLAG) \
$(SWIG_OLD_FLAG) \
+ --with-swig-python=$(PYTHON_BIN_PATH)/python \
$(SVN_STATIC_FLAG) \
$(DISABLE_NEON_VERSION_CHECK)
touch $@
@@ -2411,7 +2434,8 @@ svn-check-swig-pl:
svn-check-swig-py:
-(cd $(svn_builddir) && \
env LD_LIBRARY_PATH=$(LD_LIBRARY_PATH) \
- env MAKEFLAGS= make check-swig-py 2>&1) | \
+ PATH=$(PYTHON_BIN_PATH):$$PATH \
+ MAKEFLAGS= make check-swig-py 2>&1) | \
tee $(svn_builddir)/tests.log.bindings.py
# We add the svn prefix to PATH here because the ruby tests
