diff options
Diffstat (limited to 'security/nss/automation/taskcluster/windows/build_gyp.sh')
| -rw-r--r-- | security/nss/automation/taskcluster/windows/build_gyp.sh | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/security/nss/automation/taskcluster/windows/build_gyp.sh b/security/nss/automation/taskcluster/windows/build_gyp.sh index cc829ca99a..c0f38f948f 100644 --- a/security/nss/automation/taskcluster/windows/build_gyp.sh +++ b/security/nss/automation/taskcluster/windows/build_gyp.sh @@ -2,33 +2,37 @@ set -v -e -x -# Set up the toolchain. -if [[ "$@" == *"-m32"* ]]; then - source $(dirname $0)/setup32.sh -else - source $(dirname $0)/setup64.sh -fi +# Parse for the -t option. +m=x64 +for i in "$@"; do + case "$i" in + -t|--target) m= ;; + --target=*) m="${i#*=}" ;; + *) [[ -z "$m" ]] && m="$i" ;; + esac +done +[[ "$m" == "ia32" ]] && m=x86 +source "$(dirname "$0")/setup.sh" # Install GYP. -cd gyp +pushd gyp python -m virtualenv test-env test-env/Scripts/python setup.py install test-env/Scripts/python -m pip install --upgrade pip test-env/Scripts/pip install --upgrade setuptools -cd .. - -export GYP_MSVS_OVERRIDE_PATH="${VSPATH}" -export GYP_MSVS_VERSION="2015" -export GYP="${PWD}/gyp/test-env/Scripts/gyp" - # Fool GYP. touch "${VSPATH}/VC/vcvarsall.bat" +export GYP_MSVS_OVERRIDE_PATH="${VSPATH}" +export GYP_MSVS_VERSION=2015 +popd + +export PATH="${PATH}:${PWD}/ninja/bin:${PWD}/gyp/test-env/Scripts" # Clone NSPR. hg_clone https://hg.mozilla.org/projects/nspr nspr default # Build with gyp. -GYP=${GYP} ./nss/build.sh -g -v "$@" +./nss/build.sh -g -v "$@" # Package. 7z a public/build/dist.7z dist |