Skip to content
This repository has been archived by the owner on Sep 15, 2021. It is now read-only.

Commit

Permalink
Bug 1106707 - Add in support for win32/win64 builds, r=bhearsum
Browse files Browse the repository at this point in the history
--platform allows specifying win32 vs win64
The Windows builders require mozmake, but are currently running MozillaBuild 1.5.1 (!) which does not contain it, so we need to fetch it from tooltool.

--HG--
extra : rebase_source : 7cd361cb5ddce3f4c2053cfe5570f3829fefb498
  • Loading branch information
hotsphink committed Dec 2, 2014
1 parent e5ab632 commit 33a6582
Showing 1 changed file with 26 additions and 0 deletions.
26 changes: 26 additions & 0 deletions scripts/spidermonkey_builds/spidermonkey.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,14 @@ while [ $# -gt 1 ]; do
hgtool_args+=(--bundle "$1")
shift
;;
--ttserver)
# Note that this script (and tooltool_wrapper.sh, and tooltool.py)
# only accepts a single tooltool server, so all but the last will
# be ignored.
shift
TT_SERVER="$1"
shift
;;
-r|--rev)
shift
hgtool_args+=(--clone-by-revision -r "$1")
Expand All @@ -41,6 +49,11 @@ while [ $# -gt 1 ]; do
shift
noclean=1
;;
--platform)
shift
platform="$1"
shift
;;
*)
echo "Invalid arguments" >&2
usage
Expand Down Expand Up @@ -96,6 +109,16 @@ if [ -z "$HG_REPO" ] || [ "$HG_REPO" = none ]; then
else
$PYTHON $SCRIPTS_DIR/buildfarm/utils/hgtool.py "${hgtool_args[@]}" $HG_REPO src || exit 2
SOURCE=src

# Pull down some standard tools that the build seems to have started
# requiring, eg mozmake on windows.
if [ "$OSTYPE" = "msys" ] && [ -n "$platform" ]; then
if [ -z "$TT_SERVER" ]; then
echo "Error: tooltool base url not set (use --ttserver command line option or TT_SERVER environment variable)" >&2
exit 1
fi
$SCRIPTS_DIR/scripts/tooltool/tooltool_wrapper.sh $SOURCE/browser/config/tooltool-manifests/$platform/releng.manifest $TT_SERVER setup.sh c:\mozilla-build\python27\python.exe C:/mozilla-build/tooltool.py
fi
fi

# The build script has been moved into the tree, but this script needs to keep
Expand All @@ -105,6 +128,9 @@ if [ -x "$SOURCE/js/src/devtools/automation/autospider.sh" ]; then
if [ -n "$noclean" ]; then
ARGS="$ARGS --dep"
fi
if [ -n "$platform" ]; then
ARGS="$ARGV --platform $platform"
fi
exec $SOURCE/js/src/devtools/automation/autospider.sh $ARGS "$VARIANT"
exit 1
fi
Expand Down

0 comments on commit 33a6582

Please sign in to comment.