[Python-checkins] r55022 - python/branches/release25-maint/Misc/build.sh (original) (raw)
neal.norwitz python-checkins at python.org
Mon Apr 30 01:56:23 CEST 2007
- Previous message: [Python-checkins] r55021 - python/trunk/Misc/build.sh
- Next message: [Python-checkins] r55023 - peps/trunk/pep-0328.txt peps/trunk/pep-3100.txt
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: neal.norwitz Date: Mon Apr 30 01:56:19 2007 New Revision: 55022
Modified: python/branches/release25-maint/Misc/build.sh Log: Update with the version that has been running for a while. Most of the changes are to support multiple versions (ie, trunk and 2.5). Also check for conflicts in the .tex file when a release is cut.
Modified: python/branches/release25-maint/Misc/build.sh
--- python/branches/release25-maint/Misc/build.sh (original) +++ python/branches/release25-maint/Misc/build.sh Mon Apr 30 01:56:19 2007 @@ -47,11 +47,12 @@ FAILURE_SUBJECT="Python Regression Test Failures" #FAILURE_MAILTO="YOUR_ACCOUNT at gmail.com" FAILURE_MAILTO="python-checkins at python.org" +#FAILURE_CC="optional--uncomment and set to desired address"
REMOTE_SYSTEM="neal at dinsdale.python.org" -REMOTE_DIR="/data/ftp.python.org/pub/docs.python.org/dev/" +REMOTE_DIR="/data/ftp.python.org/pub/docs.python.org/dev/2.5" RESULT_FILE="$DIR/build/index.html" -INSTALL_DIR="/tmp/python-test/local" +INSTALL_DIR="/tmp/python-test-2.5/local" RSYNC_OPTS="-aC -e ssh"
Always run the installed version of Python.
@@ -66,7 +67,7 @@
Note: test_XXX (none currently) really leak, but are disabled
so we don't send spam. Any test which really leaks should only
be listed here if there are also test cases under Lib/test/leakers.
-LEAKY_TESTS="test_(XXX)" # Currently no tests should report spurious leaks. +LEAKY_TESTS="test_(cmd_line|socket)"
Skip these tests altogether when looking for leaks. These tests
do not need to be stored above in LEAKY_TESTS too.
@@ -76,7 +77,7 @@ LEAKY_SKIPS="-x test_compiler test_logging"
Change this flag to "yes" for old releases to only update/build the docs.
-BUILD_DISABLED="no" +BUILD_DISABLED="yes"
utility functions
current_time() { @@ -91,7 +92,12 @@
mail_on_failure() { if [ "$NUM_FAILURES" != "0" ]; then
mutt -s "$FAILURE_SUBJECT <span class="katex"><span class="katex-mathml"><math xmlns="http://www.w3.org/1998/Math/MathML"><semantics><mrow><mn>1</mn><mo stretchy="false">(</mo></mrow><annotation encoding="application/x-tex">1 (</annotation></semantics></math></span><span class="katex-html" aria-hidden="true"><span class="base"><span class="strut" style="height:1em;vertical-align:-0.25em;"></span><span class="mord">1</span><span class="mopen">(</span></span></span></span>NUM_FAILURES)" <span class="katex"><span class="katex-mathml"><math xmlns="http://www.w3.org/1998/Math/MathML"><semantics><mrow><mi>F</mi><mi>A</mi><mi>I</mi><mi>L</mi><mi>U</mi><mi>R</mi><msub><mi>E</mi><mi>M</mi></msub><mi>A</mi><mi>I</mi><mi>L</mi><mi>T</mi><mi>O</mi><mo><</mo></mrow><annotation encoding="application/x-tex">FAILURE_MAILTO < </annotation></semantics></math></span><span class="katex-html" aria-hidden="true"><span class="base"><span class="strut" style="height:0.8333em;vertical-align:-0.15em;"></span><span class="mord mathnormal" style="margin-right:0.13889em;">F</span><span class="mord mathnormal">A</span><span class="mord mathnormal" style="margin-right:0.07847em;">I</span><span class="mord mathnormal" style="margin-right:0.10903em;">LU</span><span class="mord mathnormal" style="margin-right:0.00773em;">R</span><span class="mord"><span class="mord mathnormal" style="margin-right:0.05764em;">E</span><span class="msupsub"><span class="vlist-t vlist-t2"><span class="vlist-r"><span class="vlist" style="height:0.3283em;"><span style="top:-2.55em;margin-left:-0.0576em;margin-right:0.05em;"><span class="pstrut" style="height:2.7em;"></span><span class="sizing reset-size6 size3 mtight"><span class="mord mathnormal mtight" style="margin-right:0.10903em;">M</span></span></span></span><span class="vlist-s"></span></span><span class="vlist-r"><span class="vlist" style="height:0.15em;"><span></span></span></span></span></span></span><span class="mord mathnormal">A</span><span class="mord mathnormal" style="margin-right:0.07847em;">I</span><span class="mord mathnormal">L</span><span class="mord mathnormal" style="margin-right:0.02778em;">TO</span><span class="mspace" style="margin-right:0.2778em;"></span><span class="mrel"><</span></span></span></span>2
dest=$FAILURE_MAILTO
# FAILURE_CC is optional.
if [ "$FAILURE_CC" != "" ]; then
dest="$dest -c $FAILURE_CC"
fi
fi }mutt -s "$FAILURE_SUBJECT <span class="katex"><span class="katex-mathml"><math xmlns="http://www.w3.org/1998/Math/MathML"><semantics><mrow><mn>1</mn><mo stretchy="false">(</mo></mrow><annotation encoding="application/x-tex">1 (</annotation></semantics></math></span><span class="katex-html" aria-hidden="true"><span class="base"><span class="strut" style="height:1em;vertical-align:-0.25em;"></span><span class="mord">1</span><span class="mopen">(</span></span></span></span>NUM_FAILURES)" <span class="katex"><span class="katex-mathml"><math xmlns="http://www.w3.org/1998/Math/MathML"><semantics><mrow><mi>d</mi><mi>e</mi><mi>s</mi><mi>t</mi><mo><</mo></mrow><annotation encoding="application/x-tex">dest < </annotation></semantics></math></span><span class="katex-html" aria-hidden="true"><span class="base"><span class="strut" style="height:0.7335em;vertical-align:-0.0391em;"></span><span class="mord mathnormal">d</span><span class="mord mathnormal">es</span><span class="mord mathnormal">t</span><span class="mspace" style="margin-right:0.2778em;"></span><span class="mrel"><</span></span></span></span>2
@@ -208,8 +214,19 @@
cd $DIR/Doc
F="make-doc.out"
start=current_time
-make >& ../build/$F
-err=$?
+# Doc/commontex/boilerplate.tex is expected to always have an outstanding
+# modification for the date. When a release is cut, a conflict occurs.
+# This allows us to detect this problem and not try to build the docs
+# which will definitely fail with a conflict.
+CONFLICTED_FILE=commontex/boilerplate.tex
+conflict_count=grep -c "<<<" $CONFLICTED_FILE
+if [ $conflict_count != 0 ]; then
- echo "Conflict detected in CONFLICTEDFILE.Docbuildskipped.">../build/CONFLICTED_FILE. Doc build skipped." > ../build/CONFLICTEDFILE.Docbuildskipped.">../build/F
- err=1
+else
- make >& ../build/$F
- err=$?
+fi update_status "Making doc" "$F" $start if [ $err != 0 ]; then NUM_FAILURES=1
- Previous message: [Python-checkins] r55021 - python/trunk/Misc/build.sh
- Next message: [Python-checkins] r55023 - peps/trunk/pep-0328.txt peps/trunk/pep-3100.txt
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]