Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-12 12:55:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug 466946 - Sisyphus - JavaScript Tests - use autoconf to build Spidermonkey even if Makefile.ref exists.

Browse Source
This commit is contained in:
Bob Clary 2008-11-27 02:29:00 -08:00
parent 0549ead97f
commit f02cb5a576
3 changed files with 76 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
testing/sisyphus/bin/build.sh
View File

@ -109,25 +109,7 @@ case $product in
;;
js)
if [[ -e "$BUILDTREE/mozilla/js/src/Makefile.ref" ]]; then
# use the old-style Makefile.ref build environment for spidermonkey
if [[ $buildtype == "debug" ]]; then
export JSBUILDOPT=
else
export JSBUILDOPT=BUILD_OPT=1
fi
if ! $buildbash $bashlogin -c "cd $BUILDTREE/mozilla/js/src; make -f Makefile.ref ${JSBUILDOPT} clean" 2>&1; then
error "during js/src clean" $LINENO
fi
if ! $buildbash $bashlogin -c "cd $BUILDTREE/mozilla/js/src; make -f Makefile.ref ${JSBUILDOPT}" 2>&1; then
error "during js/src build" $LINENO
fi
else
if [[ -e "$BUILDTREE/mozilla/js/src/configure.in" ]]; then
# use the new fangled autoconf build environment for spidermonkey
@ -186,6 +168,28 @@ case $product in
error "during js/src install" $LINENO
fi
elif [[ -e "$BUILDTREE/mozilla/js/src/Makefile.ref" ]]; then
# use the old-style Makefile.ref build environment for spidermonkey
if [[ $buildtype == "debug" ]]; then
export JSBUILDOPT=
else
export JSBUILDOPT=BUILD_OPT=1
fi
if ! $buildbash $bashlogin -c "cd $BUILDTREE/mozilla/js/src; make -f Makefile.ref ${JSBUILDOPT} clean" 2>&1; then
error "during js/src clean" $LINENO
fi
if ! $buildbash $bashlogin -c "cd $BUILDTREE/mozilla/js/src; make -f Makefile.ref ${JSBUILDOPT}" 2>&1; then
error "during js/src build" $LINENO
fi
else
error "Neither Makefile.ref or autoconf builds available"
fi
;;
esac

50
testing/sisyphus/bin/clean.sh
View File

@ -42,7 +42,6 @@ source $TEST_DIR/bin/set-build-env.sh $@
case $product in
firefox|thunderbird|fennec)
# cd $BUILDTREE/mozilla
if ! $buildbash $bashlogin -c "cd $BUILDTREE/mozilla; make -f client.mk clean" 2>&1; then
error "during client.mk clean" $LINENO
@ -50,14 +49,49 @@ case $product in
;;
js)
# cd $BUILDTREE/mozilla/js/src/editline
if ! $buildbash $bashlogin -c "cd $BUILDTREE/mozilla/js/src/editline; make -f Makefile.ref clean" 2>&1; then
error "during editline clean" $LINENO
fi
if [[ -e "$BUILDTREE/mozilla/js/src/configure.in" ]]; then
# use the new fangled autoconf build environment for spidermonkey
# cd ..
if ! $buildbash $bashlogin -c "cd $BUILDTREE/mozilla/js/src; make -f Makefile.ref clean" 2>&1; then
error "during SpiderMonkey clean" $LINENO
# recreate the OBJ directories to match the old naming standards
TEST_JSDIR=${TEST_JSDIR:-$TEST_DIR/tests/mozilla.org/js}
source $TEST_JSDIR/config.sh
mkdir -p "$BUILDTREE/mozilla/js/src/$JS_OBJDIR"
if [[ ! -e "$BUILDTREE/mozilla/js/src/configure" ]]; then
if findprogram autoconf-2.13; then
AUTOCONF=autoconf-2.13
elif findprogram autoconf213; then
AUTOCONF=autoconf213
else
error "autoconf 2.13 not detected"
fi
cd "$BUILDTREE/mozilla/js/src"
eval "$AUTOCONF"
fi
cd "$BUILDTREE/mozilla/js/src/$JS_OBJDIR"
if [[ -e "Makefile" ]]; then
if ! $buildbash $bashlogin -c "cd $BUILDTREE/mozilla/js/src/$JS_OBJDIR; make clean" 2>&1; then
error "during js/src clean" $LINENO
fi
fi
elif [[ -e "$BUILDTREE/mozilla/js/src/Makefile.ref" ]]; then
if ! $buildbash $bashlogin -c "cd $BUILDTREE/mozilla/js/src/editline; make -f Makefile.ref clean" 2>&1; then
error "during editline clean" $LINENO
fi
if ! $buildbash $bashlogin -c "cd $BUILDTREE/mozilla/js/src; make -f Makefile.ref clean" 2>&1; then
error "during SpiderMonkey clean" $LINENO
fi
else
error "Neither Makefile.ref or autoconf builds available"
fi
;;
esac

13
testing/sisyphus/bin/clobber.sh
View File

@ -52,7 +52,13 @@ case $product in
js)
if [[ -e "$BUILDTREE/mozilla/js/src/Makefile.ref" ]]; then
if [[ -e "$BUILDTREE/mozilla/js/src/configure.in" ]]; then
rm -f $BUILDTREE/mozilla/js/src/configure
rm -fR $BUILDTREE/mozilla/js/src/*_*.OBJ
elif [[ -e "$BUILDTREE/mozilla/js/src/Makefile.ref" ]]; then
if ! $buildbash $bashlogin -c "cd $BUILDTREE/mozilla/js/src/editline; make -f Makefile.ref clobber" 2>&1; then
error "during editline clobber" $LINENO
fi
@ -62,8 +68,11 @@ case $product in
echo "Forcing clobber" $LINENO
rm -fR $BUILDTREE/mozilla/js/src/*_*.OBJ
fi
else
rm -fR $BUILDTREE/mozilla/js/src/*_*.OBJ
error "Neither Makefile.ref or autoconf builds available"
fi
;;
esac