summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorFred Drake <fdrake@acm.org>2004-11-13 17:45:39 (GMT)
committerFred Drake <fdrake@acm.org>2004-11-13 17:45:39 (GMT)
commit1681b622515e2c174d59e79746579e71339adc04 (patch)
treed2f74e1220f1b1573180ed191402eb854da057f3 /Doc
parentbbc0d4409c4edc43d9f9b38bff089fd63f43734a (diff)
downloadcpython-1681b622515e2c174d59e79746579e71339adc04.zip
cpython-1681b622515e2c174d59e79746579e71339adc04.tar.gz
cpython-1681b622515e2c174d59e79746579e71339adc04.tar.bz2
add another way to specify an alternate name for the documentation set,
so that this is harder to forget to do for development of new styles
Diffstat (limited to 'Doc')
-rwxr-xr-xDoc/.cvsignore1
-rwxr-xr-xDoc/tools/push-docs.sh12
2 files changed, 12 insertions, 1 deletions
diff --git a/Doc/.cvsignore b/Doc/.cvsignore
index b5159d8..8f8d035 100755
--- a/Doc/.cvsignore
+++ b/Doc/.cvsignore
@@ -3,3 +3,4 @@
*.zip
*.tar
pkglist.html
+.doctype
diff --git a/Doc/tools/push-docs.sh b/Doc/tools/push-docs.sh
index 6dd74e2..28a4b31 100755
--- a/Doc/tools/push-docs.sh
+++ b/Doc/tools/push-docs.sh
@@ -26,6 +26,7 @@ else
DOCTYPE="devel"
fi
+DOCTYPE_SPECIFIED=false
EXPLANATION=''
ANNOUNCE=true
@@ -55,6 +56,7 @@ while [ "$#" -gt 0 ] ; do
;;
-t)
DOCTYPE="$2"
+ DOCTYPE_SPECIFIED=true
shift 2
;;
-F)
@@ -99,9 +101,17 @@ else
exit 2
fi
+# switch to .../Doc/
cd ..
-# now in .../Doc/
+# If $DOCTYPE was not specified explicitly, look for .doctype in
+# .../Doc/ and use the content of that file if present.
+if $DOCTYPE_SPECIFIED ; then
+ :
+elif [ -f .doctype ] ; then
+ DOCTYPE="`cat .doctype`"
+fi
+
make --no-print-directory ${PKGTYPE}html || exit $?
PACKAGE="html-$VERSION.$PKGEXT"
scp "$PACKAGE" tools/update-docs.sh $TARGET/ || exit $?