X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=make-src-dist.as;h=81d42eabe88bdb1cae48e0d94c71043fee7c85cc;hb=8e8f500a7d956de742daa3a7709ef815d6ce10b6;hp=3d3f225a04d4f04f70e2f3cebc39e3c38c415c4a;hpb=48f7e96652a19782e340a0c20eaa0bc984139073;p=pspp

diff --git a/make-src-dist.as b/make-src-dist.as
index 3d3f225a04..81d42eabe8 100644
--- a/make-src-dist.as
+++ b/make-src-dist.as
@@ -1,29 +1,34 @@
 # -* autoconf -*-
 
-BP_INIT([dist-pspp.log])
+BP_INIT
 
-BP_SET_VAR([COMMIT], [@PSPP_COMMIT@])
+BP_INIT_RESULTS([source])
+BP_INIT_LOG([source/LOG])
+
+BP_SET_VAR([BUILD_NUMBER], [@BUILD_NUMBER@])
+BP_SET_VAR([PSPP_REPO], [@PSPP_REPO@])
+BP_SET_VAR([PSPP_BRANCH], [@PSPP_BRANCH@])
+BP_SET_VAR([PSPP_COMMIT], [@PSPP_COMMIT@])
 BP_SET_VAR([GNULIB_COMMIT], [@GNULIB_COMMIT@])
-BP_SET_VAR([BRANCH], [@BRANCH@])
+BP_SET_VAR([GNULIB_REPO], [@GNULIB_REPO@])
 
 ABBREV_COMMIT=`expr "$COMMIT" : '\(......\)'`
-BP_SET_VAR([ABBREV_COMMIT])
 
 BP_START_STEP([Extracting Git sources])
-tar xzf pspp-$COMMIT.tar.gz
+BP_RUN([(cd repo && zcat pspp-$PSPP_COMMIT.tar.gz | tar xf -) >&AS_MESSAGE_LOG_FD 2>&1])
 
 BP_START_STEP([Extract repository version number])
-(cd pspp-$COMMIT && autoconf -t AC_INIT) > tmp$$
-IFS=: read FILE LINE macro PACKAGE REPO_VERSION BUG_REPORT TARNAME URL < tmp$$
+BP_RUN([(cd repo/pspp-$PSPP_COMMIT && autoconf -t AC_INIT) >tmp$$ 2>&AS_MESSAGE_LOG_FD])
+BP_RUN([IFS=: read FILE LINE macro PACKAGE REPO_VERSION BUG_REPORT TARNAME URL <tmp$$ >&AS_MESSAGE_LOG_FD 2>&1])
+BP_RUN([rm tmp$$ >&AS_MESSAGE_LOG_FD 2>&1])
 BP_SET_VAR([REPO_VERSION])
 
 BP_START_STEP([Checking Automake mode])
-if grep gnits pspp-$COMMIT/Makefile.am >/dev/null 2>&1; then
+if grep gnits repo/pspp-$PSPP_COMMIT/Makefile.am >/dev/null 2>&1; then
   AM_MODE=gnits
 else
   AM_MODE=gnu
 fi
-BP_SET_VAR([AM_MODE])
 
 BP_START_STEP([Generate build version number])
 case $AM_MODE-$REPO_VERSION in # (
@@ -40,54 +45,55 @@ esac
 BP_SET_VAR([VERSION])
 
 BP_START_STEP([Update version number in configure.ac])
-echo "AC_INIT([[$PACKAGE], [$VERSION], [$BUG_REPORT], [$TARNAME], [$URL]])" > tmp$$
+AS_ECHO(["AC_INIT([$PACKAGE], [$VERSION], [$BUG_REPORT], [$TARNAME], [$URL])]") > tmp$$
 sed -n "${LINE}r tmp$$
-$LINE!p" < pspp-$COMMIT/$FILE > pspp-$COMMIT/$FILE.new
-mv pspp-$COMMIT/$FILE.new pspp-$COMMIT/$FILE
+$LINE!p" < repo/pspp-$PSPP_COMMIT/$FILE > repo/pspp-$PSPP_COMMIT/$FILE.new
+mv repo/pspp-$PSPP_COMMIT/$FILE.new repo/pspp-$PSPP_COMMIT/$FILE
 
 BP_START_STEP([Updating NEWS])
 {
-  sed -n '/^Changes/q;p' pspp-$COMMIT/NEWS
+  sed -n '/^Changes/q;p' repo/pspp-$PSPP_COMMIT/NEWS
 cat <<_BP_EOF
 Changes from $REPO_VERSION to $VERSION:
 
- * Built from PSPP commit $COMMIT
-   in branch $BRANCH on host `hostname`.
+ * Built from PSPP commit $PSPP_COMMIT
+   in branch $PSPP_BRANCH from repository $PSPP_REPO.
 
- * Built from Gnulib commit $GNULIB_COMMIT.
+ * Built from Gnulib commit $GNULIB_COMMIT
+   from repository $GNULIB_REPO.
 
 _BP_EOF
-  sed -n '/^Changes/,$p' pspp-$COMMIT/NEWS
+  sed -n '/^Changes/,$p' repo/pspp-$PSPP_COMMIT/NEWS
 } > NEWS.new
-mv NEWS.new pspp-$COMMIT/NEWS
+mv NEWS.new repo/pspp-$PSPP_COMMIT/NEWS
 
 BP_START_STEP([Extract Gnulib source])
-BP_RUN([tar xzf gnulib-$GNULIB_COMMIT.tar.gz >&AS_MESSAGE_LOG_FD 2>&1])
+BP_RUN([(cd repo && zcat gnulib-$GNULIB_COMMIT.tar.gz | tar xf -) >&AS_MESSAGE_LOG_FD 2>&1])
 
 BP_START_STEP([Bootstrap (make -f Smake)])
-BP_RUN([(cd pspp-$COMMIT && make -f Smake GNULIB=../gnulib-$GNULIB_COMMIT) >&AS_MESSAGE_LOG_FD 2>&1])
+BP_RUN([(cd repo/pspp-$PSPP_COMMIT && make -f Smake GNULIB=../gnulib-$GNULIB_COMMIT) >&AS_MESSAGE_LOG_FD 2>&1])
 
 BP_START_STEP([Configure])
-AS_MKDIR_P([pspp-$COMMIT/_build])
-BP_RUN([(cd pspp-$COMMIT/_build && ../configure @CONFIGUREFLAGS@) >&AS_MESSAGE_LOG_FD 2>&1])
+mkdir repo/pspp-$PSPP_COMMIT/_dist
+BP_RUN([(cd repo/pspp-$PSPP_COMMIT/_dist && ../configure @CONFIGUREFLAGS@) >&AS_MESSAGE_LOG_FD 2>&1])
 
 BP_START_STEP([Make source tarball])
-BP_RUN([(cd pspp-$COMMIT/_build && make dist) >&AS_MESSAGE_LOG_FD 2>&1])
-BP_MOVE_OUTPUT([source distribution], [pspp-$COMMIT/_build/pspp-$VERSION.tar.gz])
+BP_RUN([(cd repo/pspp-$PSPP_COMMIT/_dist && make dist) >&AS_MESSAGE_LOG_FD 2>&1])
+BP_MOVE_OUTPUT([source distribution], [repo/pspp-$PSPP_COMMIT/_dist/pspp-$VERSION.tar.gz])
 
-potfile=pspp-$COMMIT/_build/po/pspp.pot
+potfile=repo/pspp-$PSPP_COMMIT/_dist/po/pspp.pot
 if test ! -e $potfile; then
-  potfile=pspp-$COMMIT/po/pspp.pot
+  potfile=repo/pspp-$PSPP_COMMIT/po/pspp.pot
 fi
 BP_COPY_OUTPUT([translation templates], [$potfile])
 
 BP_START_STEP([Build user manual])
-BP_RUN([(cd pspp-$COMMIT && cp _build/doc/*.texi doc/) >&AS_MESSAGE_LOG_FD 2>&1])
-BP_RUN([(cd pspp-$COMMIT && GENDOCS_TEMPLATE_DIR=.. ../gendocs.sh -s doc/pspp.texinfo -o results/user-manual --email bug-gnu-pspp@gnu.org pspp "GNU PSPP User Manual") >&AS_MESSAGE_LOG_FD 2>&1])
-BP_OUTPUT([User Manual], [user-manual])
+BP_RUN([(cd repo/pspp-$PSPP_COMMIT && cp _dist/doc/*.texi doc/) >&AS_MESSAGE_LOG_FD 2>&1])
+BP_RUN([(cd repo/pspp-$PSPP_COMMIT && GENDOCS_TEMPLATE_DIR=../../build-aux ../../build-aux/gendocs.sh -s doc/pspp.texinfo -o BP_RESULTS_DIR/user-manual --email bug-gnu-pspp@gnu.org pspp "GNU PSPP User Manual") >&AS_MESSAGE_LOG_FD 2>&1])
+BP_OUTPUT([User Manual], [repo/user-manual])
 
 BP_START_STEP([Build developers guide])
-BP_RUN([(cd pspp-$COMMIT && GENDOCS_TEMPLATE_DIR=.. ../gendocs.sh -s doc/pspp-dev.texinfo -o results/dev-guide --email bug-gnu-pspp@gnu.org pspp-dev "GNU PSPP Developers Guide") >&AS_MESSAGE_LOG_FD 2>&1])
-BP_OUTPUT([Developers Guide], [dev-guide])
+BP_RUN([(cd repo/pspp-$PSPP_COMMIT && GENDOCS_TEMPLATE_DIR=../../build-aux ../../build-aux/gendocs.sh -s doc/pspp-dev.texinfo -o BP_RESULTS_DIR/dev-guide --email bug-gnu-pspp@gnu.org pspp-dev "GNU PSPP Developers Guide") >&AS_MESSAGE_LOG_FD 2>&1])
+BP_OUTPUT([Developers Guide], [repo/dev-guide])
 
 BP_FINISH