Update of /cvsroot/docbook/cvstools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8772
Modified Files:
Tag: build
docbook-build
Log Message:
TMP directory wasn't working; fixed. now just do "make distrib"
(distro-specific distrib depends should be stated as prereqs in
each distro master makefile (using DISTRIB_DEPENDS). Also,
DOCBOOK_CVS -- fail if it is not set
Index: docbook-build
===================================================================
RCS file: /cvsroot/docbook/cvstools/Attic/docbook-build,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -U2 -r1.1.2.1 -r1.1.2.2
--- docbook-build 13 Dec 2004 02:43:10 -0000 1.1.2.1
+++ docbook-build 6 Apr 2005 05:22:53 -0000 1.1.2.2
@@ -8,9 +8,9 @@
if [ -z "$CLASSPATH" ]; then
cat <<- EOF
-$0: error: CLASSPATH not set. Stopping.
+`basename $0`: error: CLASSPATH not set. Stopping.
-Before invoking the $0 script, you must set the Java CLASSPATH environment
-variable in the environment from which the script runs, and it must contain
-absolute pathnames for the following:
+Before invoking `basename $0`, you must set the Java CLASSPATH
+environment variable in the environment from which the script
+runs, and it must contain absolute pathnames for the following:
- Saxon or Xalan2 jar file or classes
@@ -22,4 +22,19 @@
fi
+# fail if no DOCBOOK_CVS set
+if [ -z "$DOCBOOK_CVS" ]; then
+ cat <<- EOF
+`basename $0`: error: DOCBOOK_CVS not set. Stopping.
+
+Before invoking `basename $0`, you must set the DOCBOOK_CVS
+environment variable in the environment from which the script
+runs. The value of DOCBOOK_CVS should be the absolute path to the
+base of a DocBook Project CVS working directory that contains the
+various DocBook Project modules; that is, such that the modules
+can be found in \$DOCBOOK_CVS/xsl, \$DOCBOOK_CVS/website, etc.
+EOF
+ exit 1
+fi
+
umask 002
# set up some defaults
@@ -28,5 +43,7 @@
SITEHOST=docbook.sourceforge.net
RELEASEVERSION=snapshot
-TMP=/tmp
+if [ -z "$TMP" ]; then
+ TMP=/tmp
+fi
# default timeout waiting for lock file to clear is 1200 seconds (20 mins)
LOCK_TIMEOUT=1200
@@ -100,5 +117,5 @@
b ) BUILDDIR=$OPTARG ;;
l ) LOGDIR=$OPTARG ;;
- t ) DBKTMP=$OPTARG ;;
+ t ) TMP=$OPTARG ;;
v ) RELEASEVERSION=$OPTARG ;;
u ) SITEUSER=$OPTARG
@@ -222,16 +239,10 @@
echo
- echo "Building $DISTRO stylesheets..."
- echo
-
+ # if this module has a "common" dir, it means it's probably
+ # relying on the "gentext" stuff, so make "gentext" first
if [ -d $DISTRO/common ]; then
- make $DISTRO-files -C gentext
- fi
- make -C $DISTRO || exit 1
- if [ -d $DISTRO/demo ]; then
- make -C $DISTRO/demo || exit 1
- fi
- if [ -d $DISTRO/tests ]; then
- make -C $DISTRO/tests || exit 1
+ echo "Making gentext..."
+ echo
+ make -C gentext $DISTRO-files
fi
@@ -274,5 +285,5 @@
if [ "$UPLOAD" = "yes" ]; then
- make ZIPVER=$RELEASEVERSION zip -C $DISTRO || exit 1
+ make zip -C $DISTRO ZIPVER=$RELEASEVERSION TMP=$TMP || exit 1
cat <<- EOF > $TMP/line.tmp
|