Merge pull request #472 from stevenschlansker/mac-configs

Commit Mac configs

5 files changed, 49 insertions, 1 deletions

diff --git a/build/macosx/mozconfig.common b/build/macosx/mozconfig.common
index e258b0d02..191f8a3ae 100644
--- a/build/macosx/mozconfig.common
+++ b/build/macosx/mozconfig.common
@@ -24,4 +24,12 @@ if [ -z "$CXX" ]; then
     export CXX=clang++
 fi
 
+mk_add_options MOZ_CO_PROJECT=browser
+ac_add_options --enable-application=browser
+
 ac_add_options --with-ccache
+
+ac_add_options --disable-tests
+ac_add_options --disable-mochitests
+
+ac_add_options --disable-jemalloc
diff --git a/build/macosx/universal/jenkins-build.sh b/build/macosx/universal/jenkins-build.sh
new file mode 100644
index 000000000..fdab1d547
--- /dev/null
+++ b/build/macosx/universal/jenkins-build.sh
@@ -0,0 +1,18 @@
+# This script is invoked by Jenkins to execute
+# incremental builds and upload the produced *.dmg
+# files to the distribution mirror.
+
+# Since it is intended to be checked in and public, please
+# do not commit sensitive information e.g. server or port here.
+
+export PATH=$PATH:/usr/local/bin
+export MOZCONFIG=$(pwd)/build/macosx/universal/mozconfig.$FLAVOR
+
+rm -rf obj-*darwin*/dist
+
+./mach build
+./mach package
+
+pushd obj-*darwin*/dist
+scp -P ${PORT} palemoon-*.dmg ${DIST}/$(ls palemoon-*.dmg | sed "s/\.en-US/-${BUILD_NUMBER}-${FLAVOR}.en-US/")
+popd
diff --git a/build/macosx/universal/mozconfig b/build/macosx/universal/mozconfig.debug
index fbb287d1b..983a84de2 100644
--- a/build/macosx/universal/mozconfig
+++ b/build/macosx/universal/mozconfig.debug
@@ -2,6 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# Mac OS X build mozconfig, x86_64 only.
+# Mac OS X build mozconfig, x86_64 only, include debug symbols.
+
+#ac_add_options --enable-debug
+ac_add_options --enable-debug-symbols
+ac_add_options --disable-install-strip
+ac_add_options --disable-strip
 
 . $topsrcdir/build/macosx/universal/mozconfig.common
diff --git a/build/macosx/universal/mozconfig.gstreamer b/build/macosx/universal/mozconfig.gstreamer
new file mode 100644
index 000000000..163cdd2c8
--- /dev/null
+++ b/build/macosx/universal/mozconfig.gstreamer
@@ -0,0 +1,3 @@
+. build/macosx/universal/mozconfig.debug
+
+ac_add_options --enable-gstreamer=1.0
diff --git a/build/macosx/universal/mozconfig.release b/build/macosx/universal/mozconfig.release
new file mode 100644
index 000000000..4ccea186a
--- /dev/null
+++ b/build/macosx/universal/mozconfig.release
@@ -0,0 +1,14 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# Mac OS X build mozconfig, x86_64 only, release build.
+
+# Please note the restrictions on official branding when using this line.
+ac_add_options --enable-official-branding
+export MOZILLA_OFFICIAL=1
+
+ac_add_options --disable-debug
+ac_add_options --enable-strip
+
+. $topsrcdir/build/macosx/universal/mozconfig.common