Update download and install workflow

This commit is contained in:
Susan Potter 2012-02-20 23:27:13 -06:00
parent 476d0a1781
commit f36af9e205
2 changed files with 16 additions and 17 deletions

View file

@ -4,7 +4,6 @@
set -e set -e
source $(dirname $0)/../scripts/functions source $(dirname $0)/../scripts/functions
env
BUILD_DIR=$1 BUILD_DIR=$1
echo "Info: BUILD_DIR=$BUILD_DIR" echo "Info: BUILD_DIR=$BUILD_DIR"
@ -13,23 +12,29 @@ echo "Info: CACHE_DIR=$CACHE_DIR"
## CHECK BUILDPACK_GHC_BASE_URL is set ## CHECK BUILDPACK_GHC_BASE_URL is set
if [ "$BUILDPACK_GHC_BASE_URL" != "" ]; then if [ "$BUILDPACK_GHC_BASE_URL" != "" ]; then
arch=$(uname -m) local arch=$(uname -m)
ghcver=$GHC_BOOTSTRAP_VERSION local ghcver=$GHC_BOOTSTRAP_VERSION
if [ "$ghcver" == "" ]; then if [ "$ghcver" == "" ]; then
echo "Error: please set GHC_BOOTSTRAP_VERSION"; echo "Error: please set GHC_BOOTSTRAP_VERSION";
exit 1; exit 1;
fi; fi;
bsdir=$CACHE_DIR/bootstrap local bsdir=$CACHE_DIR/bootstrap
ghcurl="$BUILDPACK_GHC_BASE_URL/$ghcver/ghc-$ghcver-$arch-unknown-linux.tar.bz2" local ghcurl="$BUILDPACK_GHC_BASE_URL/$ghcver/ghc-$ghcver-$arch-unknown-linux.tar.bz2"
echo "Info: bootstrap directory: ${bsdir}"; echo "Info: bootstrap directory: ${bsdir}";
echo "Info: bootstrap URL: $ghcurl"; echo "Info: bootstrap URL: $ghcurl";
if [ -f "$bsdir.completed" ]; then if [ -f "$bsdir.downloaded" ]; then
echo "Info: already downloaded GHC bootstrap version ${ghcver}"; echo "Info: already downloaded GHC bootstrap version ${ghcver}";
else else
echo "Info: downloading GHC $ghcver form $ghcurl"; echo "Info: downloading GHC $ghcver form $ghcurl";
$(downloadAndExtract $bsdir $ghcurl); $(downloadAndExtract $bsdir $ghcurl);
touch $bsdir.downloaded;
fi;
if [ -f "$bsdir.compiled" ]; then
echo "Info: already compiled GHC bootstrap version ${ghcver}";
else
$(configureMakeInstall $bsdir/ghc-$ghcver $BUILD_DIR/bootstrap/ghc-$ghcver); $(configureMakeInstall $bsdir/ghc-$ghcver $BUILD_DIR/bootstrap/ghc-$ghcver);
touch $bsdir.completed touch $bsdir.compiled;
fi; fi;
else else
echo "Error: please set BUILDPACK_GHC_BASE_URL"; echo "Error: please set BUILDPACK_GHC_BASE_URL";

View file

@ -16,17 +16,11 @@ function downloadAndExtract() {
} }
function configureMakeInstall() { function configureMakeInstall() {
pushd $1 pushd $1;
echo -n "Info: configure --prefix=$2" echo -n "Info: ./configure --prefix=$2 && make && make install";
./configure --prefix=$2; ./configure --prefix=$2 && make && make install;
echo "[OK]"
echo -n "Info: make"
make
echo "[OK]"; echo "[OK]";
echo -n "Info: make install" popd;
make install
echo "[OK]"
popd
} }
function mkCompilerDir() { function mkCompilerDir() {