From cb38d3c2c1d1acb59395663b132e8d9c0916b081 Mon Sep 17 00:00:00 2001 From: Mark Banner Date: Mon, 23 Apr 2012 14:08:11 +0100 Subject: [PATCH] Bug 747860 - Put vs2010 configurations into a common directory - move them to under build/ where the other compiler type mozconfigs are. r=ted --HG-- rename : browser/config/mozconfigs/win32/vs2010-mozconfig => build/win32/mozconfig.vs2010 rename : browser/config/mozconfigs/win64/vs2010-mozconfig => build/win64/mozconfig.vs2010 --- browser/config/mozconfigs/win32/debug | 2 +- browser/config/mozconfigs/win32/l10n-mozconfig | 2 +- browser/config/mozconfigs/win32/nightly | 2 +- browser/config/mozconfigs/win32/release | 2 +- browser/config/mozconfigs/win64/debug | 2 +- browser/config/mozconfigs/win64/nightly | 2 +- .../win32/vs2010-mozconfig => build/win32/mozconfig.vs2010 | 0 .../win64/vs2010-mozconfig => build/win64/mozconfig.vs2010 | 0 8 files changed, 6 insertions(+), 6 deletions(-) rename browser/config/mozconfigs/win32/vs2010-mozconfig => build/win32/mozconfig.vs2010 (100%) rename browser/config/mozconfigs/win64/vs2010-mozconfig => build/win64/mozconfig.vs2010 (100%) diff --git a/browser/config/mozconfigs/win32/debug b/browser/config/mozconfigs/win32/debug index 8fd9d74a4b7..4f6676db27d 100644 --- a/browser/config/mozconfigs/win32/debug +++ b/browser/config/mozconfigs/win32/debug @@ -7,7 +7,7 @@ export MOZILLA_OFFICIAL=1 mk_add_options MOZ_MAKE_FLAGS=-j1 -. $topsrcdir/browser/config/mozconfigs/win32/vs2010-mozconfig +. $topsrcdir/build/win32/mozconfig.vs2010 # Package js shell. export MOZ_PACKAGE_JSSHELL=1 diff --git a/browser/config/mozconfigs/win32/l10n-mozconfig b/browser/config/mozconfigs/win32/l10n-mozconfig index 28c83ebb29c..41575360d98 100644 --- a/browser/config/mozconfigs/win32/l10n-mozconfig +++ b/browser/config/mozconfigs/win32/l10n-mozconfig @@ -3,4 +3,4 @@ ac_add_options --enable-update-packaging ac_add_options --enable-official-branding ac_add_options --with-l10n-base=../../l10n-central -. $topsrcdir/browser/config/mozconfigs/win32/vs2010-mozconfig +. $topsrcdir/build/win32/mozconfig.vs2010 diff --git a/browser/config/mozconfigs/win32/nightly b/browser/config/mozconfigs/win32/nightly index a345e1c492a..f4bbb3b1c7e 100644 --- a/browser/config/mozconfigs/win32/nightly +++ b/browser/config/mozconfigs/win32/nightly @@ -16,7 +16,7 @@ export MOZ_TELEMETRY_REPORTING=1 mk_add_options MOZ_MAKE_FLAGS=-j1 -. $topsrcdir/browser/config/mozconfigs/win32/vs2010-mozconfig +. $topsrcdir/build/win32/mozconfig.vs2010 # Package js shell. export MOZ_PACKAGE_JSSHELL=1 diff --git a/browser/config/mozconfigs/win32/release b/browser/config/mozconfigs/win32/release index 67e2fd468c0..61091d62c1f 100644 --- a/browser/config/mozconfigs/win32/release +++ b/browser/config/mozconfigs/win32/release @@ -12,7 +12,7 @@ export MOZILLA_OFFICIAL=1 export MOZ_TELEMETRY_REPORTING=1 -. $topsrcdir/browser/config/mozconfigs/win32/vs2010-mozconfig +. $topsrcdir/build/win32/mozconfig.vs2010 # Package js shell. export MOZ_PACKAGE_JSSHELL=1 diff --git a/browser/config/mozconfigs/win64/debug b/browser/config/mozconfigs/win64/debug index 3836edf09ea..416499e03c0 100644 --- a/browser/config/mozconfigs/win64/debug +++ b/browser/config/mozconfigs/win64/debug @@ -13,4 +13,4 @@ mk_add_options MOZ_MAKE_FLAGS=-j1 # Package js shell. export MOZ_PACKAGE_JSSHELL=1 -. $topsrcdir/browser/config/mozconfigs/win64/vs2010-mozconfig +. $topsrcdir/build/win64/mozconfig.vs2010 diff --git a/browser/config/mozconfigs/win64/nightly b/browser/config/mozconfigs/win64/nightly index 4cd888f17c1..b4456d82b79 100644 --- a/browser/config/mozconfigs/win64/nightly +++ b/browser/config/mozconfigs/win64/nightly @@ -22,4 +22,4 @@ mk_add_options MOZ_MAKE_FLAGS=-j1 # Package js shell. export MOZ_PACKAGE_JSSHELL=1 -. $topsrcdir/browser/config/mozconfigs/win64/vs2010-mozconfig +. $topsrcdir/build/win64/mozconfig.vs2010 diff --git a/browser/config/mozconfigs/win32/vs2010-mozconfig b/build/win32/mozconfig.vs2010 similarity index 100% rename from browser/config/mozconfigs/win32/vs2010-mozconfig rename to build/win32/mozconfig.vs2010 diff --git a/browser/config/mozconfigs/win64/vs2010-mozconfig b/build/win64/mozconfig.vs2010 similarity index 100% rename from browser/config/mozconfigs/win64/vs2010-mozconfig rename to build/win64/mozconfig.vs2010