Author: svn-role Date: Wed Apr 8 04:00:17 2020 New Revision: 1876260 URL: http://svn.apache.org/viewvc?rev=1876260&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, hartmannathan, jamessan Modified: subversion/branches/1.14.x/ (props changed) subversion/branches/1.14.x/STATUS subversion/branches/1.14.x/autogen.sh Propchange: subversion/branches/1.14.x/ ------------------------------------------------------------------------------ Merged /subversion/trunk:r1875726 Modified: subversion/branches/1.14.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1876260&r1=1876259&r2=1876260&view=diff ============================================================================== --- subversion/branches/1.14.x/STATUS (original) +++ subversion/branches/1.14.x/STATUS Wed Apr 8 04:00:17 2020 @@ -21,13 +21,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, hartmannathan, jamessan - * r1875742, r1875762 Fix autogen.sh SWIG python bindings generation in --release mode. Justification: Modified: subversion/branches/1.14.x/autogen.sh URL: http://svn.apache.org/viewvc/subversion/branches/1.14.x/autogen.sh?rev=1876260&r1=1876259&r2=1876260&view=diff ============================================================================== --- subversion/branches/1.14.x/autogen.sh (original) +++ subversion/branches/1.14.x/autogen.sh Wed Apr 8 04:00:17 2020 @@ -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