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

Bug 1264499 - s/mozconfig.vs2013/mozconfig.vs2015/ where not yet updated. - r=gps,sfink

Browse Source
This commit is contained in:
Jeff Gilbert 2016-04-19 11:51:24 -07:00
parent 7ddb4d5d7b
commit 8728cc55d6
21 changed files with 21 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
b2g/config/mozconfigs/win32_gecko/debug
View File

@ -14,11 +14,7 @@ export MOZILLA_OFFICIAL=1
export MOZ_TELEMETRY_REPORTING=1
if test "$PROCESSOR_ARCHITECTURE" = "AMD64" -o "$PROCESSOR_ARCHITEW6432" = "AMD64"; then
. $topsrcdir/build/win32/mozconfig.vs2013-win64
else
. $topsrcdir/build/win32/mozconfig.vs2013
fi
. $topsrcdir/build/win32/mozconfig.vs-latest
# B2G Options
ac_add_options --enable-application=b2g

6
b2g/config/mozconfigs/win32_gecko/nightly
View File

@ -14,11 +14,7 @@ export MOZILLA_OFFICIAL=1
export MOZ_TELEMETRY_REPORTING=1
if test "$PROCESSOR_ARCHITECTURE" = "AMD64" -o "$PROCESSOR_ARCHITEW6432" = "AMD64"; then
. $topsrcdir/build/win32/mozconfig.vs2013-win64
else
. $topsrcdir/build/win32/mozconfig.vs2013
fi
. $topsrcdir/build/win32/mozconfig.vs-latest
# B2G Options
ac_add_options --enable-application=b2g

6
b2g/graphene/config/horizon-mozconfigs/win32/debug
View File

@ -9,11 +9,7 @@ ac_add_options --enable-js-diagnostics
# Needed to enable breakpad in application.ini
export MOZILLA_OFFICIAL=1
if test "$PROCESSOR_ARCHITECTURE" = "AMD64" -o "$PROCESSOR_ARCHITEW6432" = "AMD64"; then
. $topsrcdir/build/win32/mozconfig.vs2013-win64
else
. $topsrcdir/build/win32/mozconfig.vs2013
fi
. $topsrcdir/build/win32/mozconfig.vs-latest
# graphene Options
ENABLE_MARIONETTE=1

6
b2g/graphene/config/horizon-mozconfigs/win32/nightly
View File

@ -11,11 +11,7 @@ ac_add_options --enable-js-diagnostics
# Needed to enable breakpad in application.ini
export MOZILLA_OFFICIAL=1
if test "$PROCESSOR_ARCHITECTURE" = "AMD64" -o "$PROCESSOR_ARCHITEW6432" = "AMD64"; then
. $topsrcdir/build/win32/mozconfig.vs2013-win64
else
. $topsrcdir/build/win32/mozconfig.vs2013
fi
. $topsrcdir/build/win32/mozconfig.vs-latest
# graphene Options
export CXXFLAGS=-DMOZ_ENABLE_JS_DUMP

2
b2g/graphene/config/horizon-mozconfigs/win64/debug
View File

@ -26,7 +26,7 @@ ac_add_options --enable-warnings-as-errors
# Package js shell.
export MOZ_PACKAGE_JSSHELL=1
. $topsrcdir/build/win64/mozconfig.vs2013
. $topsrcdir/build/win64/mozconfig.vs-latest
. "$topsrcdir/build/mozconfig.cache"

2
b2g/graphene/config/horizon-mozconfigs/win64/nightly
View File

@ -8,7 +8,7 @@ fi
ac_add_options --target=x86_64-pc-mingw32
ac_add_options --host=x86_64-pc-mingw32
. $topsrcdir/build/win64/mozconfig.vs2013
. $topsrcdir/build/win64/mozconfig.vs-latest
ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
ac_add_options --enable-update-packaging

6
b2g/graphene/config/mozconfigs/win32/debug
View File

@ -9,11 +9,7 @@ ac_add_options --enable-js-diagnostics
# Needed to enable breakpad in application.ini
export MOZILLA_OFFICIAL=1
if test "$PROCESSOR_ARCHITECTURE" = "AMD64" -o "$PROCESSOR_ARCHITEW6432" = "AMD64"; then
. $topsrcdir/build/win32/mozconfig.vs2013-win64
else
. $topsrcdir/build/win32/mozconfig.vs2013
fi
. $topsrcdir/build/win32/mozconfig.vs-latest
# graphene Options
ENABLE_MARIONETTE=1

6
b2g/graphene/config/mozconfigs/win32/nightly
View File

@ -11,11 +11,7 @@ ac_add_options --enable-js-diagnostics
# Needed to enable breakpad in application.ini
export MOZILLA_OFFICIAL=1
if test "$PROCESSOR_ARCHITECTURE" = "AMD64" -o "$PROCESSOR_ARCHITEW6432" = "AMD64"; then
. $topsrcdir/build/win32/mozconfig.vs2013-win64
else
. $topsrcdir/build/win32/mozconfig.vs2013
fi
. $topsrcdir/build/win32/mozconfig.vs-latest
# graphene Options
export CXXFLAGS=-DMOZ_ENABLE_JS_DUMP

2
b2g/graphene/config/mozconfigs/win64/debug
View File

@ -26,7 +26,7 @@ ac_add_options --enable-warnings-as-errors
# Package js shell.
export MOZ_PACKAGE_JSSHELL=1
. $topsrcdir/build/win64/mozconfig.vs2013
. $topsrcdir/build/win64/mozconfig.vs-latest
. "$topsrcdir/build/mozconfig.cache"

2
b2g/graphene/config/mozconfigs/win64/nightly
View File

@ -8,7 +8,7 @@ fi
ac_add_options --target=x86_64-pc-mingw32
ac_add_options --host=x86_64-pc-mingw32
. $topsrcdir/build/win64/mozconfig.vs2013
. $topsrcdir/build/win64/mozconfig.vs-latest
ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
ac_add_options --enable-update-packaging

2
browser/config/mozconfigs/win32/common-opt
View File

@ -27,7 +27,7 @@ export MOZILLA_OFFICIAL=1
export MOZ_TELEMETRY_REPORTING=1
. $topsrcdir/build/win32/mozconfig.vs2015-win64
. $topsrcdir/build/win32/mozconfig.vs-latest
# Treat warnings as errors (modulo ALLOW_COMPILER_WARNINGS).
ac_add_options --enable-warnings-as-errors

2
browser/config/mozconfigs/win32/debug
View File

@ -21,7 +21,7 @@ export MOZILLA_OFFICIAL=1
# Enable Telemetry
export MOZ_TELEMETRY_REPORTING=1
. $topsrcdir/build/win32/mozconfig.vs2015-win64
. $topsrcdir/build/win32/mozconfig.vs-latest
# Treat warnings as errors (modulo ALLOW_COMPILER_WARNINGS).
ac_add_options --enable-warnings-as-errors

2
browser/config/mozconfigs/win32/debug-static-analysis
View File

@ -10,7 +10,7 @@ ac_add_options --enable-dmd
ac_add_options --enable-clang-plugin
. $topsrcdir/build/win32/mozconfig.vs2013-win64
. $topsrcdir/build/win32/mozconfig.vs-latest
# Treat warnings as errors (modulo ALLOW_COMPILER_WARNINGS).
ac_add_options --enable-warnings-as-errors

6
browser/config/mozconfigs/win32/l10n-mozconfig
View File

@ -11,10 +11,6 @@ export MOZILLA_OFFICIAL=1
# Enable Telemetry
export MOZ_TELEMETRY_REPORTING=1
if test "$PROCESSOR_ARCHITECTURE" = "AMD64" -o "$PROCESSOR_ARCHITEW6432" = "AMD64"; then
. $topsrcdir/build/win32/mozconfig.vs2015-win64
else
. $topsrcdir/build/win32/mozconfig.vs2015
fi
. $topsrcdir/build/win32/mozconfig.vs-latest
. "$topsrcdir/build/mozconfig.common.override"

2
browser/config/mozconfigs/win64/common-opt
View File

@ -28,7 +28,7 @@ export MOZ_TELEMETRY_REPORTING=1
# Treat warnings as errors (modulo ALLOW_COMPILER_WARNINGS).
ac_add_options --enable-warnings-as-errors
. $topsrcdir/build/win64/mozconfig.vs2015
. $topsrcdir/build/win64/mozconfig.vs-latest
# Enable Adobe Primetime and Widevine CDMs on 64-bit Windows in Mozilla builds.
# Enabled here on the assumption that downstream vendors will not be using

2
browser/config/mozconfigs/win64/debug
View File

@ -31,7 +31,7 @@ export MOZ_PACKAGE_JSSHELL=1
ac_add_options --with-branding=browser/branding/nightly
. $topsrcdir/build/win64/mozconfig.vs2015
. $topsrcdir/build/win64/mozconfig.vs-latest
. "$topsrcdir/build/mozconfig.rust"

2
browser/config/mozconfigs/win64/l10n-mozconfig
View File

@ -12,6 +12,6 @@ export MOZILLA_OFFICIAL=1
# Enable Telemetry
export MOZ_TELEMETRY_REPORTING=1
. $topsrcdir/build/win64/mozconfig.vs2015
. $topsrcdir/build/win64/mozconfig.vs-latest
. "$topsrcdir/build/mozconfig.common.override"

1
build/win32/mozconfig.vs-latest Normal file
View File

@ -0,0 +1 @@
. $topsrcdir/build/win32/mozconfig.vs2015-win64

13
build/win32/mozconfig.vs2010
View File

@ -1,13 +0,0 @@
export INCLUDE=/d/msvs10/vc/include:/d/msvs10/vc/atlmfc/include:/d/sdks/v7.0/include:/d/sdks/v7.0/include/atl:/d/msvs8/VC/PlatformSDK/include:/d/sdks/dx10/include
export LIBPATH=/d/msvs10/vc/lib:/d/msvs10/vc/atlmfc/lib:/c/WINDOWS/Microsoft.NET/Framework/v2.0.50727
export LIB=/d/msvs10/vc/lib:/d/msvs10/vc/atlmfc/lib:/d/sdks/v7.0/lib:/d/msvs8/VC/PlatformSDK/lib:/d/msvs8/SDK/v2.0/lib:/d/mozilla-build/atlthunk_compat:/d/sdks/dx10/lib/x86
export PATH="/d/msvs10/VSTSDB/Deploy:/d/msvs10/Common7/IDE/:/d/msvs10/VC/BIN:/d/msvs10/Common7/Tools:/d/msvs10/VC/VCPackages:${PATH}"
export WIN32_REDIST_DIR=/d/msvs10/VC/redist/x86/Microsoft.VC100.CRT
. $topsrcdir/build/mozconfig.vs-common
mk_export_correct_style LIB
mk_export_correct_style LIBPATH
mk_export_correct_style PATH
mk_export_correct_style INCLUDE
mk_export_correct_style WIN32_REDIST_DIR

1
build/win64/mozconfig.vs-latest Normal file
View File

@ -0,0 +1 @@
. $topsrcdir/build/win64/mozconfig.vs2015

8
js/src/devtools/automation/winbuildenv.sh
View File

@ -19,14 +19,10 @@ export OLD_INCLUDE=$(IFS=';'; for d in $INCLUDE; do ( cd "$d" && echo -n $(pwd):
export OLD_LIB=$(IFS=';'; for d in $LIB; do ( cd "$d" && echo -n $(pwd): ); done)
export OLD_LIBPATH=$(IFS=';'; for d in $LIBPATH; do ( cd "$d" && echo -n $(pwd): ); done)
# The various browser/config/mozconfigs/win32/* files use these checks to pick
# the compiler.
if $USE_64BIT; then
. $topsrcdir/build/win64/mozconfig.vs2015
elif test "$PROCESSOR_ARCHITECTURE" = "AMD64" -o "$PROCESSOR_ARCHITEW6432" = "AMD64"; then
. $topsrcdir/build/win32/mozconfig.vs2015-win64
. $topsrcdir/build/win64/mozconfig.vs-latest
else
. $topsrcdir/build/win32/mozconfig.vs2015
. $topsrcdir/build/win32/mozconfig.vs-latest
fi
# PATH also needs to point to mozmake.exe, which can come from either