Skip to content

Commit

Permalink
Bug 1264499 - s/mozconfig.vs2013/mozconfig.vs2015/ where not yet upda…
Browse files Browse the repository at this point in the history 
…ted. - r=gps,sfink
  • Loading branch information
@kdashg
kdashg committed Apr 19, 2016
1 parent 7ddb4d5 commit 8728cc5
Show file tree
Hide file tree
Showing 21 changed files with 21 additions and 64 deletions.
6 changes: 1 addition & 5 deletions b2g/config/mozconfigs/win32_gecko/debug
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 1 addition & 5 deletions b2g/config/mozconfigs/win32_gecko/nightly
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 1 addition & 5 deletions b2g/graphene/config/horizon-mozconfigs/win32/debug
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 1 addition & 5 deletions b2g/graphene/config/horizon-mozconfigs/win32/nightly
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion b2g/graphene/config/horizon-mozconfigs/win64/debug
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion b2g/graphene/config/horizon-mozconfigs/win64/nightly
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 1 addition & 5 deletions b2g/graphene/config/mozconfigs/win32/debug
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 1 addition & 5 deletions b2g/graphene/config/mozconfigs/win32/nightly
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion b2g/graphene/config/mozconfigs/win64/debug
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion b2g/graphene/config/mozconfigs/win64/nightly
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion browser/config/mozconfigs/win32/common-opt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion browser/config/mozconfigs/win32/debug
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion browser/config/mozconfigs/win32/debug-static-analysis
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 1 addition & 5 deletions browser/config/mozconfigs/win32/l10n-mozconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 1 addition & 1 deletion browser/config/mozconfigs/win64/common-opt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion browser/config/mozconfigs/win64/debug
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion browser/config/mozconfigs/win64/l10n-mozconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 change: 1 addition & 0 deletions build/win32/mozconfig.vs-latest
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
. $topsrcdir/build/win32/mozconfig.vs2015-win64
13 changes: 0 additions & 13 deletions build/win32/mozconfig.vs2010
View file

This file was deleted.

1 change: 1 addition & 0 deletions build/win64/mozconfig.vs-latest
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
. $topsrcdir/build/win64/mozconfig.vs2015
8 changes: 2 additions & 6 deletions js/src/devtools/automation/winbuildenv.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 8728cc5

Please sign in to comment.