Author: svn-role Date: Thu Jan 28 04:00:12 2021 New Revision: 1885963 URL: http://svn.apache.org/viewvc?rev=1885963&view=rev Log: Merge r1875726 from trunk:
* r1875726 Error out if generating SWIG-related files fails in autogen.sh --release Justification: release.py didn't catch this error when 1.14.0-rc1 release was created Votes: +1: stsp, jamessan, hartmannathan Modified: subversion/branches/1.10.x/ (props changed) subversion/branches/1.10.x/STATUS subversion/branches/1.10.x/autogen.sh Propchange: subversion/branches/1.10.x/ ------------------------------------------------------------------------------ Merged /subversion/trunk:r1875726 Modified: subversion/branches/1.10.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1885963&r1=1885962&r2=1885963&view=diff ============================================================================== --- subversion/branches/1.10.x/STATUS (original) +++ subversion/branches/1.10.x/STATUS Thu Jan 28 04:00:12 2021 @@ -49,13 +49,6 @@ Veto-blocked changes: Approved changes: ================= - * r1875726 - Error out if generating SWIG-related files fails in autogen.sh --release - Justification: - release.py didn't catch this error when 1.14.0-rc1 release was created - Votes: - +1: stsp, jamessan, hartmannathan - * r1880192 Fix issue #4862 "Merge: the resulting mergeinfo is non-deterministic". Justification: Modified: subversion/branches/1.10.x/autogen.sh URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/autogen.sh?rev=1885963&r1=1885962&r2=1885963&view=diff ============================================================================== --- subversion/branches/1.10.x/autogen.sh (original) +++ subversion/branches/1.10.x/autogen.sh Thu Jan 28 04:00:12 2021 @@ -176,7 +176,7 @@ if test -n "$RELEASE_MODE"; then "$PYTHON" ./gen-make.py build.conf || gen_failed=1 # Build the SWIG-related files - make -f autogen-standalone.mk autogen-swig + make -f autogen-standalone.mk autogen-swig || gen_failed=1 # Remove the .swig_checked file rm -f .swig_checked