mozilla
/
releases-comm-central
зеркало из https://github.com/mozilla/releases-comm-central.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 760117 - Port Bug 751695 - Make our builders pick the correct mozconfig on Windows based on whether they're on a 32-bit or a 64-bit platform. r=jhopkins

This commit is contained in:
Mark Banner 2012-06-01 18:27:58 +01:00
Родитель 34def6f111
Коммит b1f348e1b4
4 изменённых файлов: 28 добавлений и 3 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

13
build/win32/mozconfig.vs2010-win64 Normal file
Просмотреть файл

@ -0,0 +1,13 @@
export INCLUDE=/c/tools/msvs10/vc/include:/c/tools/msvs10/vc/atlmfc/include:/c/tools/sdks/v7.0/include:/c/tools/sdks/v7.0/include/atl:/c/tools/sdks/dx10/include
export LIBPATH=/c/tools/msvs10/vc/lib:/c/tools/msvs10/vc/atlmfc/lib
export LIB=/c/tools/msvs10/vc/lib:/c/tools/msvs10/vc/atlmfc/lib:/c/tools/sdks/v7.0/lib:/c/tools/sdks/dx10/lib
export WIN32_REDIST_DIR=/c/tools/msvs10/VC/redist/x86/Microsoft.VC100.CRT
export MOZ_TOOLS=C:/mozilla-build/moztools
export PATH="/c/tools/msvs10/Common7/IDE:/c/tools/msvs10/VC/BIN:/c/tools/msvs10/Common7/Tools:/c/tools/msvs10/VC/VCPackages:/c/mozilla-build/moztools:/c/Tools/sdks/v7.0/bin:${PATH}"
mk_add_options "export LIB=$LIB"
mk_add_options "export LIBPATH=$LIBPATH"
mk_add_options "export PATH=$PATH"
mk_add_options "export INCLUDE=$INCLUDE"
mk_add_options "export WIN32_REDIST_DIR=$WIN32_REDIST_DIR"
mk_add_options "export MOZ_TOOLS=$MOZ_TOOLS"

6
mail/config/mozconfigs/win32/debug
Просмотреть файл

@ -9,7 +9,11 @@ export MOZILLA_OFFICIAL=1
# For NSS symbols # For NSS symbols
export MOZ_DEBUG_SYMBOLS=1 export MOZ_DEBUG_SYMBOLS=1
. $topsrcdir/build/win32/mozconfig.vs2010 if test "$PROCESSOR_ARCHITECTURE" = "AMD64" -o "$PROCESSOR_ARCHITEW6432" = "AMD64"; then
. $topsrcdir/build/win32/mozconfig.vs2010-win64
else
. $topsrcdir/build/win32/mozconfig.vs2010
fi
# Run client.py # Run client.py
mk_add_options CLIENT_PY_ARGS="--hg-options='--time' --hgtool=../tools/buildfarm/utils/hgtool.py --skip-chatzilla --skip-comm --skip-inspector --skip-venkman --tinderbox-print" mk_add_options CLIENT_PY_ARGS="--hg-options='--time' --hgtool=../tools/buildfarm/utils/hgtool.py --skip-chatzilla --skip-comm --skip-inspector --skip-venkman --tinderbox-print"

6
mail/config/mozconfigs/win32/nightly
Просмотреть файл

@ -10,7 +10,11 @@ export MOZ_DEBUG_SYMBOLS=1
# Needed to enable breakpad in application.ini # Needed to enable breakpad in application.ini
export MOZILLA_OFFICIAL=1 export MOZILLA_OFFICIAL=1
. $topsrcdir/build/win32/mozconfig.vs2010 if test "$PROCESSOR_ARCHITECTURE" = "AMD64" -o "$PROCESSOR_ARCHITEW6432" = "AMD64"; then
. $topsrcdir/build/win32/mozconfig.vs2010-win64
else
. $topsrcdir/build/win32/mozconfig.vs2010
fi
# For known full-clobber builds on Windows (like nightlies/try), # For known full-clobber builds on Windows (like nightlies/try),
# this speeds things up. IS_NIGHTLY is set by the build automation. # this speeds things up. IS_NIGHTLY is set by the build automation.

6
mail/config/mozconfigs/win32/release
Просмотреть файл

@ -10,7 +10,11 @@ export MOZ_DEBUG_SYMBOLS=1
# Needed to enable breakpad in application.ini # Needed to enable breakpad in application.ini
export MOZILLA_OFFICIAL=1 export MOZILLA_OFFICIAL=1
. $topsrcdir/build/win32/mozconfig.vs2010 if test "$PROCESSOR_ARCHITECTURE" = "AMD64" -o "$PROCESSOR_ARCHITEW6432" = "AMD64"; then
. $topsrcdir/build/win32/mozconfig.vs2010-win64
else
. $topsrcdir/build/win32/mozconfig.vs2010
fi
# Run client.py # Run client.py
mk_add_options CLIENT_PY_ARGS="--hg-options='--time' --hgtool=../tools/buildfarm/utils/hgtool.py --skip-chatzilla --skip-comm --skip-inspector --skip-venkman --tinderbox-print --comm-rev=${COMM_REV} --mozilla-rev=${MOZILLA_REV}" mk_add_options CLIENT_PY_ARGS="--hg-options='--time' --hgtool=../tools/buildfarm/utils/hgtool.py --skip-chatzilla --skip-comm --skip-inspector --skip-venkman --tinderbox-print --comm-rev=${COMM_REV} --mozilla-rev=${MOZILLA_REV}"