summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/buildscripts/buildall.sh20
-rw-r--r--data/buildscripts/mozconfig-mac6
-rw-r--r--data/buildscripts/mozconfig-windows7
-rw-r--r--data/buildscripts/toolchain-android.sh4
-rw-r--r--data/buildscripts/toolchain-mac.sh18
-rw-r--r--data/buildscripts/toolchain-windows.sh5
6 files changed, 37 insertions, 23 deletions
diff --git a/data/buildscripts/buildall.sh b/data/buildscripts/buildall.sh
index a4bb372..9485384 100644
--- a/data/buildscripts/buildall.sh
+++ b/data/buildscripts/buildall.sh
@@ -32,18 +32,18 @@ EOF
env -i TERM=screen eatmydata sudo HOME=/home/ruben BUILDDIST=$2 ARCH=$3 pbuilder execute $SRCDIR/run.sh
}
-#buildpackage windows belenos amd64 |tee windows.log 2>&1
-#buildpackage mac belenos amd64 |tee mac.log 2>&1
-#buildpackage gnulinux belenos i386 |tee gnulinux-i386.log 2>&1
-#mv $SRCDIR/obj-gnulinux $SRCDIR/obj-gnulinux-i386
-#buildpackage gnulinux belenos amd64 |tee gnulinux-amd64.log 2>&1
-#mv $SRCDIR/obj-gnulinux $SRCDIR/obj-gnulinux-amd64
+buildpackage windows belenos amd64 |tee windows.log 2>&1
+buildpackage mac belenos amd64 |tee mac.log 2>&1
+buildpackage gnulinux belenos i386 |tee gnulinux-i386.log 2>&1
+mv $SRCDIR/obj-gnulinux $SRCDIR/obj-gnulinux-i386
+buildpackage gnulinux belenos amd64 |tee gnulinux-amd64.log 2>&1
+mv $SRCDIR/obj-gnulinux $SRCDIR/obj-gnulinux-amd64
buildpackage android belenos i386 |tee android.log 2>&1
rm binaries -rf
mkdir binaries/langpacks -p
-#cp $1/obj-windows/dist/icecat*.zip binaries
-#cp $1/obj-mac/dist/icecat/icecat*.dmg binaries
-#cp $1/obj-gnulinux*/dist/icecat*.bz2 binaries
+cp $1/obj-windows/dist/icecat*.zip binaries
+cp $1/obj-mac/dist/icecat/icecat*.dmg binaries
+cp $1/obj-gnulinux*/dist/icecat*.bz2 binaries
cp $1/obj-android/dist/icecat*.apk binaries
-#cp $1/obj-gnulinux-amd64/dist/linux-x86_64/xpi/* binaries/langpacks
+cp $1/obj-gnulinux-amd64/dist/linux-x86_64/xpi/* binaries/langpacks
diff --git a/data/buildscripts/mozconfig-mac b/data/buildscripts/mozconfig-mac
index 2fbe366..7e02b81 100644
--- a/data/buildscripts/mozconfig-mac
+++ b/data/buildscripts/mozconfig-mac
@@ -1,8 +1,8 @@
export CROSS_COMPILE=1
-SYSROOTDIR=/usr/lib/apple/SDKs/MacOSX10.6.sdk
+SYSROOTDIR=/usr/lib/apple/SDKs/MacOSX10.7.sdk
ROOTDIR="/usr/local/bin"
-FLAGS="-arch i386 -isysroot $SYSROOTDIR"
+FLAGS="-arch x86_64 -isysroot $SYSROOTDIR"
# Ideally we use the patch provided in
# https://bugzilla.mozilla.org/show_bug.cgi?id=933071 to get rid of our path
@@ -29,7 +29,7 @@ mk_add_options MOZ_APP_DISPLAYNAME="IceCat"
mk_add_options MOZILLA_OFFICIAL=1
mk_add_options BUILD_OFFICIAL=1
-ac_add_options --target=i386-apple-darwin10
+ac_add_options --target=x86_64-apple-darwin10
ac_add_options --enable-application=browser
ac_add_options --enable-strip
ac_add_options --enable-official-branding
diff --git a/data/buildscripts/mozconfig-windows b/data/buildscripts/mozconfig-windows
index 1b50a57..7c5887b 100644
--- a/data/buildscripts/mozconfig-windows
+++ b/data/buildscripts/mozconfig-windows
@@ -6,3 +6,10 @@ mk_add_options MOZ_OBJDIR=./obj-windows
ac_add_options --disable-webrtc
ac_add_options --without-intl-api
+
+ac_add_options --disable-crashreporter
+ac_add_options --disable-maintenance-service
+
+# We can't build the sandbox code with mingw-w64:
+#https://bugzilla.mozilla.org/show_bug.cgi?id=1042426
+ac_add_options --disable-sandbox
diff --git a/data/buildscripts/toolchain-android.sh b/data/buildscripts/toolchain-android.sh
index aca5957..59a3456 100644
--- a/data/buildscripts/toolchain-android.sh
+++ b/data/buildscripts/toolchain-android.sh
@@ -21,13 +21,13 @@ wget http://dl.google.com/android/android-sdk_r24.3.3-linux.tgz
tar -xzf android-sdk_r24.3.3-linux.tgz
while true; do echo y; sleep 1; done |./android-sdk-linux/tools/android update sdk -u
-while true; do echo y; sleep 1; done |./android-sdk-linux/tools/android update adb
+#while true; do echo y; sleep 1; done |./android-sdk-linux/tools/android update adb
echo export PATH=$PATH:$PWD/android-sdk-linux/tools:$PWD/android-sdk-linux/build-tools:$PWD/android-sdk-linux/platform-tools
export PATH=$PATH:$PWD/android-sdk-linux/tools:$PWD/android-sdk-linux/build-tools:$PWD/android-sdk-linux/platform-tools
ln -s $PWD/android-sdk-linux/build_tools $PWD/android-sdk-linux/build-tools
-pkill adb || true
+pkill -9 adb || true
echo DONE
diff --git a/data/buildscripts/toolchain-mac.sh b/data/buildscripts/toolchain-mac.sh
index 422bb2c..04f5e6f 100644
--- a/data/buildscripts/toolchain-mac.sh
+++ b/data/buildscripts/toolchain-mac.sh
@@ -12,8 +12,12 @@ rm -rf $WD
mkdir $WD
cd $WD
#wget http://ppa.launchpad.net/flosoft/cross-apple/ubuntu/pool/main/a/apple-uni-sdk-10.6/apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb
-wget http://ppa.launchpad.net/flosoft/cross-apple/ubuntu/pool/main/a/apple-uni-sdk-10.6/apple-uni-sdk-10.6_20110407-0.flosoft1_amd64.deb
-dpkg -i *.deb
+#wget http://ppa.launchpad.net/flosoft/cross-apple/ubuntu/pool/main/a/apple-uni-sdk-10.6/apple-uni-sdk-10.6_20110407-0.flosoft1_amd64.deb
+wget https://people.torproject.org/~mikeperry/mirrors/sources/MacOSX10.7.sdk.tar.gz
+tar -xzvf MacOSX10.7.sdk.tar.gz
+mkdir -p /usr/lib/apple/SDKs
+mv MacOSX10.7.sdk /usr/lib/apple/SDKs
+#dpkg -i *.deb
wget https://mingw-and-ndk.googlecode.com/files/multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz
unp multiarch-darwin*
@@ -29,11 +33,11 @@ unp x86_64-apple-darwin10.tar.xz
cp x-tools/x86_64-apple-darwin10/* /usr/local/ -a
# FIXME: path hacks:
mkdir -p /System/Library/ || true
-ln -fs /usr/lib/apple/SDKs/MacOSX10.6.sdk /usr/lib/apple/SDKs/MacOSX10.5.sdk
-ln -fs /usr/lib/apple/SDKs/MacOSX10.6.sdk /usr/lib/apple/SDKs/MacOSX10.5.sdk
-ln -fs /usr/lib/apple/SDKs/MacOSX10.6.sdk/System/Library/Frameworks/ /System/Library/
-ln -fs /usr/lib/apple/SDKs/MacOSX10.6.sdk/System/Library/PrivateFrameworks/ /System/Library/
-ln -fs /usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/libstdc++.6.dylib /usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/libstdc++.dylib
+ln -fs /usr/lib/apple/SDKs/MacOSX10.7.sdk /usr/lib/apple/SDKs/MacOSX10.5.sdk
+ln -fs /usr/lib/apple/SDKs/MacOSX10.7.sdk /usr/lib/apple/SDKs/MacOSX10.5.sdk
+ln -fs /usr/lib/apple/SDKs/MacOSX10.7.sdk/System/Library/Frameworks/ /System/Library/
+ln -fs /usr/lib/apple/SDKs/MacOSX10.7.sdk/System/Library/PrivateFrameworks/ /System/Library/
+ln -fs /usr/lib/apple/SDKs/MacOSX10.7.sdk/usr/lib/libstdc++.6.dylib /usr/lib/apple/SDKs/MacOSX10.7.sdk/usr/lib/libstdc++.dylib
git clone https://git.torproject.org/builders/tor-browser-bundle.git
git clone https://github.com/vasi/libdmg-hfsplus.git
diff --git a/data/buildscripts/toolchain-windows.sh b/data/buildscripts/toolchain-windows.sh
index 18073a0..4faddfb 100644
--- a/data/buildscripts/toolchain-windows.sh
+++ b/data/buildscripts/toolchain-windows.sh
@@ -15,7 +15,10 @@ wget http://gcc.fyxm.net/releases/gcc-4.9.1/gcc-4.9.1.tar.bz2
tar -jxf gcc-4.9.1.tar.bz2
git clone git://git.code.sf.net/p/mingw-w64/mingw-w64
cd mingw-w64
-git checkout 469ed5d227202b373409c8a3b4c1358be39b9983
+#git checkout 5db531
+#git checkout 7268caece9b4cb33ff698306e51140b11d7656b0
+#git checkout master
+git checkout a883b47a45ff74ced41dfbd9f748d5c2c61f3c01
cd ..
git clone https://git.torproject.org/builders/tor-browser-bundle.git
PATCHES=$WD/tor-browser-bundle/gitian/patches
home website