зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1426785 - Allow more `mach artifact toolchain` calls to not use a tooltool manifest. r=gps
We're about to remove some tooltool manifests, so we need those calls to work properly when TOOLTOOL_MANIFEST is not set. --HG-- extra : rebase_source : 38ca0e3b894097ed3667901b05af79062a6c82c2
This commit is contained in:
Родитель
089e3a8dc2
Коммит
399ebca32e
|
@ -53,7 +53,7 @@ export MOZ_OBJDIR="$WORKSPACE/obj-analyzed"
|
||||||
mkdir -p "$MOZ_OBJDIR"
|
mkdir -p "$MOZ_OBJDIR"
|
||||||
|
|
||||||
if [ -n "$DO_TOOLTOOL" ]; then
|
if [ -n "$DO_TOOLTOOL" ]; then
|
||||||
( cd $TOOLTOOL_DIR; $GECKO_DIR/mach artifact toolchain -v --tooltool-url https://tooltool.mozilla-releng.net/ --tooltool-manifest $GECKO_DIR/$TOOLTOOL_MANIFEST --cache-dir $TOOLTOOL_CACHE${MOZ_TOOLCHAINS:+ ${MOZ_TOOLCHAINS}} )
|
( cd $TOOLTOOL_DIR; $GECKO_DIR/mach artifact toolchain -v${TOOLTOOL_MANIFEST:+ --tooltool-url https://tooltool.mozilla-releng.net/ --tooltool-manifest $GECKO_DIR/$TOOLTOOL_MANIFEST} --cache-dir $TOOLTOOL_CACHE${MOZ_TOOLCHAINS:+ ${MOZ_TOOLCHAINS}} )
|
||||||
fi
|
fi
|
||||||
|
|
||||||
export NO_MERCURIAL_SETUP_CHECK=1
|
export NO_MERCURIAL_SETUP_CHECK=1
|
||||||
|
|
|
@ -56,7 +56,7 @@ BROWSER_PLATFORM=$PLATFORM_OS$BITS
|
||||||
: ${TOOLTOOL_CHECKOUT:=$WORK}
|
: ${TOOLTOOL_CHECKOUT:=$WORK}
|
||||||
export TOOLTOOL_CHECKOUT
|
export TOOLTOOL_CHECKOUT
|
||||||
|
|
||||||
(cd $TOOLTOOL_CHECKOUT && ${SRCDIR}/mach artifact toolchain -v $TOOLTOOL_AUTH_FLAGS --tooltool-url $TOOLTOOL_SERVER --tooltool-manifest $SRCDIR/$TOOLTOOL_MANIFEST ${TOOLTOOL_CACHE:+ --cache-dir $TOOLTOOL_CACHE}${MOZ_TOOLCHAINS:+ ${MOZ_TOOLCHAINS}})
|
(cd $TOOLTOOL_CHECKOUT && ${SRCDIR}/mach artifact toolchain${TOOLTOOL_MANIFEST:+ -v $TOOLTOOL_AUTH_FLAGS --tooltool-url $TOOLTOOL_SERVER --tooltool-manifest $SRCDIR/$TOOLTOOL_MANIFEST}${TOOLTOOL_CACHE:+ --cache-dir $TOOLTOOL_CACHE}${MOZ_TOOLCHAINS:+ ${MOZ_TOOLCHAINS}})
|
||||||
|
|
||||||
# Add all the tooltool binaries to our $PATH.
|
# Add all the tooltool binaries to our $PATH.
|
||||||
for bin in $TOOLTOOL_CHECKOUT/*/bin $TOOLTOOL_CHECKOUT/VC/bin/Hostx64/x86; do
|
for bin in $TOOLTOOL_CHECKOUT/*/bin $TOOLTOOL_CHECKOUT/VC/bin/Hostx64/x86; do
|
||||||
|
|
Загрузка…
Ссылка в новой задаче