bug 744008: Produce B2G builds for desktop operating systems - rename mozconfigs; adjust compiler. r=gal
authorBen Hearsum <bhearsum@mozilla.com>
Tue, 03 Jul 2012 09:32:35 -0400
changeset 98169 f38d6df93cadad51358934032240c00e14ab902b
parent 98168 f6827c0d913e84019da50aee80ff20c3af522a42
child 98170 edf132b767b0fc739e3b80b35e2870c051846936
child 98199 d17fc82f43eda6e4489668da940f9226807c97fc
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
reviewersgal
bugs744008
milestone16.0a1
bug 744008: Produce B2G builds for desktop operating systems - rename mozconfigs; adjust compiler. r=gal
b2g/config/mozconfigs/desktop/linux32/nightly
b2g/config/mozconfigs/desktop/linux64/nightly
b2g/config/mozconfigs/desktop/macosx64/nightly
b2g/config/mozconfigs/desktop/win32/nightly
b2g/config/mozconfigs/linux32/debug
b2g/config/mozconfigs/linux32/nightly
b2g/config/mozconfigs/linux32_gecko/nightly
b2g/config/mozconfigs/linux64_gecko/nightly
b2g/config/mozconfigs/macosx64_gecko/nightly
b2g/config/mozconfigs/win32_gecko/nightly
deleted file mode 100644
--- a/b2g/config/mozconfigs/linux32/debug
+++ /dev/null
@@ -1,23 +0,0 @@
-#GONK_TOOLCHAIN_VERSION=0
-#TOOLCHAIN_HOST=linux-x86
-#export GONK_PRODUCT=generic
-#gonk="/home/cjones/mozilla/gonk-toolchain-$GONK_TOOLCHAIN_VERSION"
-
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-b2g
-
-mk_add_options MOZ_MAKE_FLAGS="-j8"
-
-ac_add_options --enable-application=b2g
-
-ac_add_options --target=arm-android-eabi
-ac_add_options --with-gonk="$gonk"
-ac_add_options --with-gonk-toolchain-prefix="$gonk/prebuilt/$TOOLCHAIN_HOST/toolchain/arm-eabi-4.4.3/bin/arm-eabi-"
-ac_add_options --with-endian=little
-ac_add_options --disable-elf-hack
-ac_add_options --enable-debug-symbols
-ac_add_options --enable-profiling
-ac_add_options --with-ccache
-ac_add_options --enable-marionette
-
-# Enable dump() from JS.
-export CXXFLAGS=-DMOZ_ENABLE_JS_DUMP
deleted file mode 100644
--- a/b2g/config/mozconfigs/linux32/nightly
+++ /dev/null
@@ -1,23 +0,0 @@
-#GONK_TOOLCHAIN_VERSION=0
-#TOOLCHAIN_HOST=linux-x86
-#export GONK_PRODUCT=generic
-#gonk="/home/cjones/mozilla/gonk-toolchain-$GONK_TOOLCHAIN_VERSION"
-
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-b2g
-
-mk_add_options MOZ_MAKE_FLAGS="-j8"
-
-ac_add_options --enable-application=b2g
-
-ac_add_options --target=arm-android-eabi
-ac_add_options --with-gonk="$gonk"
-ac_add_options --with-gonk-toolchain-prefix="$gonk/prebuilt/$TOOLCHAIN_HOST/toolchain/arm-eabi-4.4.3/bin/arm-eabi-"
-ac_add_options --with-endian=little
-ac_add_options --disable-elf-hack
-ac_add_options --enable-debug-symbols
-ac_add_options --enable-profiling
-ac_add_options --with-ccache
-ac_add_options --enable-marionette
-
-# Enable dump() from JS.
-export CXXFLAGS=-DMOZ_ENABLE_JS_DUMP
rename from b2g/config/mozconfigs/desktop/linux32/nightly
rename to b2g/config/mozconfigs/linux32_gecko/nightly
--- a/b2g/config/mozconfigs/desktop/linux32/nightly
+++ b/b2g/config/mozconfigs/linux32_gecko/nightly
@@ -1,18 +1,16 @@
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 ac_add_options --enable-codesighs
 ac_add_options --enable-signmar
 
 # Nightlies only since this has a cost in performance
 #ac_add_options --enable-js-diagnostics
 
-. $topsrcdir/build/unix/mozconfig.linux
-
 # Avoid dependency on libstdc++ 4.5
 ac_add_options --enable-stdcxx-compat
 
 # This will overwrite the default of stripping everything and keep the symbol table.
 # This is useful for profiling and debugging and only increases the package size
 # by 2 MBs.
 STRIP_FLAGS="--strip-debug"
 
rename from b2g/config/mozconfigs/desktop/linux64/nightly
rename to b2g/config/mozconfigs/linux64_gecko/nightly
rename from b2g/config/mozconfigs/desktop/macosx64/nightly
rename to b2g/config/mozconfigs/macosx64_gecko/nightly
rename from b2g/config/mozconfigs/desktop/win32/nightly
rename to b2g/config/mozconfigs/win32_gecko/nightly