From e70711f14b889932ca1dcd11e2338279398e1331 Mon Sep 17 00:00:00 2001 From: Eli Barzilay Date: Sat, 28 Sep 2013 15:33:01 -0400 Subject: [PATCH] Revise the build-web script to build stuff in a local "output" directory. --- new-racket-web/.gitignore | 2 ++ new-racket-web/build-web | 14 +++++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/new-racket-web/.gitignore b/new-racket-web/.gitignore index 6cef476bab..70deccefe8 100644 --- a/new-racket-web/.gitignore +++ b/new-racket-web/.gitignore @@ -42,3 +42,5 @@ dwsync.xml .svn .CVS .idea + +output diff --git a/new-racket-web/build-web b/new-racket-web/build-web index 4f5103aecb..402ea49e6b 100755 --- a/new-racket-web/build-web +++ b/new-racket-web/build-web @@ -3,15 +3,18 @@ PLTHOME="/home/scheme/plt" WEBSRC="collects/meta/web" # relative to PLTHOME SRCDIR="$HOME/src/plt/$WEBSRC" # empty => use code in PLTHOME -SRCDIR="$HOME/src/plt/$WEBSRC" # empty => use code in PLTHOME DIFFTO="/tmp/w" # empty => no diffing WEBDIR="/home/scheme/web" export GIT_DIR="$HOME/src/plt/.git" # for tag info EXTRA="$HOME/work/iplt/web/all.rkt" export KNOWN_MIRRORS_FILE="/home/scheme/known-mirror-urls" # to poll mirrors -# Build straight from ~/src/plt, or from ~plt <<<<<<<<<<<<<<<<<< -PLTHOME="$HOME/src/plt"; SRCDIR="" +# Build from here, to here +HERE="$(cd $(dirname "$0"); pwd)" +SRCDIR="$HERE/web" +WEBDIR="$HERE/output" +PLTHOME="$HOME/src/plt" +WEBSRC="pkgs/plt-services/meta/web" # PLTHOME="/home/scheme/plt"; SRCDIR="" # clear @@ -23,13 +26,14 @@ if [ "x$SRCDIR" != "x" ]; then echo "" fi cleanup() { - if [ "x$SRCDIR" != "x" ]; then + if [ -d "$PLTHOME/$WEBSRC.orig" ] && [ "x$SRCDIR" != "x" ]; then echo -n "Restoring web sources" rm -rf "$PLTHOME/$WEBSRC" mv "$PLTHOME/$WEBSRC.orig" "$PLTHOME/$WEBSRC" echo "" fi } +trap cleanup 0 3 9 15 EXE="$PLTHOME/bin/racket" if [ ! -x "$EXE" ]; then EXE="$PLTHOME/racket/bin/racket"; fi @@ -38,7 +42,7 @@ if [ ! -x "$EXE" ]; then fi "$EXE" -l meta/web/build -- \ - --local --dist --extra "$EXTRA" --force --output "$WEBDIR" "$@" \ + --local --extra "$EXTRA" --force --output "$WEBDIR" "$@" \ || { cleanup; exit 1; } symlinks2files() {