Bug 1187222 - Support building GTK3 in suite/ (mozconfig change) - mozconfig hack to test the confusion r=bustage (post-land-review) a=ewong in a CLOSED TREE
authorEdmund Wong <ewong@pw-wspx.org>
Fri, 31 Jul 2015 12:11:33 +0800
changeset 23010 44f529e7dbc9f0db28ee9ed1d38b7768714a843e
parent 23009 513c9c62bfe6812dcea07f8be53b9f6b04ea75e2
child 23011 42a6fe2d8736d65360553c81888406b24a23e227
push idunknown
push userunknown
push dateunknown
reviewersbustage, ewong
bugs1187222
Bug 1187222 - Support building GTK3 in suite/ (mozconfig change) - mozconfig hack to test the confusion r=bustage (post-land-review) a=ewong in a CLOSED TREE
suite/config/mozconfigs/linux32/debug
suite/config/mozconfigs/linux32/nightly
suite/config/mozconfigs/linux64/nightly
--- a/suite/config/mozconfigs/linux32/debug
+++ b/suite/config/mozconfigs/linux32/debug
@@ -1,9 +1,14 @@
 no_tooltool=1
+if [ $topsrcdir == *"mozilla"* ]; then
+  oldtopsrcdir=$topsrcdir
+  topsrcdir=$(dirname $topsrcdir)
+fi
+
 . "$topsrcdir/build/unix/mozconfig.linux32"
 
 ac_add_options --enable-application=suite
 
 ac_add_options --enable-debug
 
 ac_add_options --enable-tests
 
@@ -21,8 +26,13 @@ export MOZILLA_OFFICIAL=1
 #Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
 
 . "$topsrcdir/suite/config/mozconfigs/mozconfig.linux.common"
 
 export PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig:/usr/share/pkgconfig
 . "$topsrcdir/build/unix/mozconfig.gtk"
 
+if [ ! -z "$oldtopsrcdir" ]; then
+  topsrcdir=$oldtopsrcdir
+  oldtopsrcdir=""
+fi
+
--- a/suite/config/mozconfigs/linux32/nightly
+++ b/suite/config/mozconfigs/linux32/nightly
@@ -1,9 +1,14 @@
 no_tooltool=1
+if [ $topsrcdir == *"mozilla"* ]; then
+  oldtopsrcdir=$topsrcdir
+  topsrcdir=$(dirname $topsrcdir)
+fi
+
 . "$topsrcdir/build/unix/mozconfig.linux32"
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-optimize
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 ac_add_options --disable-debug
 ac_add_options --enable-tests
@@ -28,8 +33,12 @@ export MOZILLA_OFFICIAL=1
 #Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
 
 . "$topsrcdir/suite/config/mozconfigs/mozconfig.linux.common"
 
 export PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig:/usr/share/pkgconfig
 . "$topsrcdir/build/unix/mozconfig.gtk"
 
+if [ ! -z "$oldtopsrcdir" ]; then
+  topsrcdir=$oldtopsrcdir
+  oldtopsrcdir=""
+fi
--- a/suite/config/mozconfigs/linux64/nightly
+++ b/suite/config/mozconfigs/linux64/nightly
@@ -1,9 +1,14 @@
 no_tooltool=1
+if [ $topsrcdir == *"mozilla"* ]; then
+  oldtopsrcdir=$topsrcdir
+  topsrcdir=$(dirname $topsrcdir)
+fi
+
 . "$topsrcdir/build/unix/mozconfig.linux"
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-optimize
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 ac_add_options --disable-debug
 ac_add_options --enable-tests
@@ -29,8 +34,12 @@ export MOZILLA_OFFICIAL=1
 #Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
 
 . "$topsrcdir/suite/config/mozconfigs/mozconfig.linux.common"
 
 export PKG_CONFIG_LIBDIR=/usr/lib64/pkgconfig:/usr/share/pkgconfig
 . "$topsrcdir/build/unix/mozconfig.gtk"
 
+if [ ! -z "$oldtopsrcdir" ]; then
+  topsrcdir=$oldtopsrcdir
+  oldtopsrcdir=""
+fi