Fennec F-Droid: enable 53.0.2

Fennec 53 and later requires rustc which is missing on the build system
(see fdroidserver#271). Download prebuilt rust and rust-std from the
official server during building.
This commit is contained in:
relan 2017-05-19 15:42:23 +03:00
parent 574d286a23
commit 1acd078684

View file

@ -3367,9 +3367,8 @@ Build:52.0.2,520210
mv obj-${fxarch}/dist/fennec-*-unsigned-unaligned.apk fdroid/fennec-unsigned.apk mv obj-${fxarch}/dist/fennec-*-unsigned-unaligned.apk fdroid/fennec-unsigned.apk
ndk=r12b ndk=r12b
Build:53.0,530000 Build:53.0.2,530200
disable=requires rustc-1.13+ commit=FENNEC_53_0_2_RELEASE
commit=FENNEC_53_0_RELEASE
output=fdroid/fennec-unsigned.apk output=fdroid/fennec-unsigned.apk
srclibs=MozLocales@30b165a10e13854fcd80403da0cb6233b2629c77 srclibs=MozLocales@30b165a10e13854fcd80403da0cb6233b2629c77
prebuild=mkdir fdroid && \ prebuild=mkdir fdroid && \
@ -3392,7 +3391,10 @@ Build:53.0,530000
popd popd
scanignore=mobile/android/base/java/org/mozilla/gecko/javaaddons/JavaAddonManager.java,mobile/android/base/java/org/mozilla/gecko/javaaddons/JavaAddonManagerV1.java scanignore=mobile/android/base/java/org/mozilla/gecko/javaaddons/JavaAddonManager.java,mobile/android/base/java/org/mozilla/gecko/javaaddons/JavaAddonManagerV1.java
build=export I_PREFER_A_SUBOPTIMAL_MERCURIAL_EXPERIENCE=1 && \ build=export I_PREFER_A_SUBOPTIMAL_MERCURIAL_EXPERIENCE=1 && \
./mach build && \ mkdir rust && \
curl https://static.rust-lang.org/dist/rust-1.16.0-`uname -m`-unknown-linux-gnu.tar.gz | tar -x -z -C rust --strip-components 2 && \
curl https://static.rust-lang.org/dist/rust-std-1.16.0-armv7-linux-androideabi.tar.gz | tar -x -z -C rust --strip-components 2 && \
PATH=$PATH:$PWD/rust/bin ./mach build && \
fxarch=`grep "ac_add_options --target=" .mozconfig | cut -d '=' -f2` && \ fxarch=`grep "ac_add_options --target=" .mozconfig | cut -d '=' -f2` && \
pushd obj-${fxarch}/mobile/android/locales && \ pushd obj-${fxarch}/mobile/android/locales && \
for loc in $(cat ../../../../mobile/android/locales/maemo-locales); do LOCALE_MERGEDIR=$PWD/merge-$loc make merge-$loc || exit 1; LOCALE_MERGEDIR=$PWD/merge-$loc make chrome-$loc || exit 1; done && \ for loc in $(cat ../../../../mobile/android/locales/maemo-locales); do LOCALE_MERGEDIR=$PWD/merge-$loc make merge-$loc || exit 1; LOCALE_MERGEDIR=$PWD/merge-$loc make chrome-$loc || exit 1; done && \
@ -3401,9 +3403,8 @@ Build:53.0,530000
mv obj-${fxarch}/dist/fennec-*-unsigned-unaligned.apk fdroid/fennec-unsigned.apk mv obj-${fxarch}/dist/fennec-*-unsigned-unaligned.apk fdroid/fennec-unsigned.apk
ndk=r12b ndk=r12b
Build:53.0,530010 Build:53.0.2,530210
disable=requires rustc-1.13+ commit=FENNEC_53_0_2_RELEASE
commit=FENNEC_53_0_RELEASE
output=fdroid/fennec-unsigned.apk output=fdroid/fennec-unsigned.apk
srclibs=MozLocales@30b165a10e13854fcd80403da0cb6233b2629c77 srclibs=MozLocales@30b165a10e13854fcd80403da0cb6233b2629c77
prebuild=mkdir fdroid && \ prebuild=mkdir fdroid && \
@ -3426,7 +3427,10 @@ Build:53.0,530010
popd popd
scanignore=mobile/android/base/java/org/mozilla/gecko/javaaddons/JavaAddonManager.java,mobile/android/base/java/org/mozilla/gecko/javaaddons/JavaAddonManagerV1.java scanignore=mobile/android/base/java/org/mozilla/gecko/javaaddons/JavaAddonManager.java,mobile/android/base/java/org/mozilla/gecko/javaaddons/JavaAddonManagerV1.java
build=export I_PREFER_A_SUBOPTIMAL_MERCURIAL_EXPERIENCE=1 && \ build=export I_PREFER_A_SUBOPTIMAL_MERCURIAL_EXPERIENCE=1 && \
./mach build && \ mkdir rust && \
curl https://static.rust-lang.org/dist/rust-1.16.0-`uname -m`-unknown-linux-gnu.tar.gz | tar -x -z -C rust --strip-components 2 && \
curl https://static.rust-lang.org/dist/rust-std-1.16.0-i686-linux-android.tar.gz | tar -x -z -C rust --strip-components 2 && \
PATH=$PATH:$PWD/rust/bin ./mach build && \
fxarch=`grep "ac_add_options --target=" .mozconfig | cut -d '=' -f2` && \ fxarch=`grep "ac_add_options --target=" .mozconfig | cut -d '=' -f2` && \
pushd obj-${fxarch}/mobile/android/locales && \ pushd obj-${fxarch}/mobile/android/locales && \
for loc in $(cat ../../../../mobile/android/locales/maemo-locales); do LOCALE_MERGEDIR=$PWD/merge-$loc make merge-$loc || exit 1; LOCALE_MERGEDIR=$PWD/merge-$loc make chrome-$loc || exit 1; done && \ for loc in $(cat ../../../../mobile/android/locales/maemo-locales); do LOCALE_MERGEDIR=$PWD/merge-$loc make merge-$loc || exit 1; LOCALE_MERGEDIR=$PWD/merge-$loc make chrome-$loc || exit 1; done && \