Merge branch 'fennec-55.0' into 'master'

Fennec F-Droid: Prepare for 55.0

See merge request !2441
This commit is contained in:
relan 2017-08-09 05:02:22 +00:00
commit f8a09a7cdf

View file

@ -3583,6 +3583,108 @@ Build:54.0.1,540110
mv obj-${fxarch}/dist/fennec-*-unsigned-unaligned.apk fdroid/fennec-unsigned.apk
ndk=r12b
Build:55.0,550000
commit=FENNEC_55_0_RELEASE
output=fdroid/fennec-unsigned.apk
srclibs=MozLocales@f9db105d36b5496792f4b0a126a008b1ae108472
prebuild=mkdir fdroid && \
l10ndir=`readlink -f $$MozLocales$$` && \
bash $$MozLocales$$/prebuild.sh && \
echo "ac_add_options --target=arm-linux-androideabi" >> .mozconfig && \
echo "ac_add_options --with-android-min-sdk=15" >> .mozconfig && \
echo "ac_add_options --with-android-ndk=\"$$NDK$$\"" >> .mozconfig && \
echo "ac_add_options --with-android-sdk=\"$$SDK$$\"" >> .mozconfig && \
echo "ac_add_options --enable-application=mobile/android" >> .mozconfig && \
echo "ac_add_options --with-branding=mobile/android/branding/unofficial" >> .mozconfig && \
echo "ac_add_options --with-l10n-base=${l10ndir}" >> .mozconfig && \
echo "mk_add_options 'export L10NBASEDIR=${l10ndir}'" >> .mozconfig && \
echo "mk_add_options 'export MOZ_CHROME_MULTILOCALE=$(tr '\n' ' ' < mobile/android/locales/maemo-locales)'" >> .mozconfig && \
pushd mobile/android/branding/unofficial/ && \
sed -i -e '/ANDROID_PACKAGE_NAME/d' -e '/MOZ_APP_DISPLAYNAME/d' configure.sh && \
echo 'ANDROID_PACKAGE_NAME=org.mozilla.fennec_fdroid' >> configure.sh && \
echo 'MOZ_APP_DISPLAYNAME="Fennec F-Droid"' >> configure.sh && \
echo 'MOZ_APP_ANDROID_VERSION_CODE=$$VERCODE$$' >> configure.sh && \
popd
build=export I_PREFER_A_SUBOPTIMAL_MERCURIAL_EXPERIENCE=1 && \
mkdir rust && \
curl https://static.rust-lang.org/dist/rust-1.19.0-`uname -m`-unknown-linux-gnu.tar.xz | tar -x -J -C rust --strip-components 2 && \
curl https://static.rust-lang.org/dist/rust-std-1.19.0-armv7-linux-androideabi.tar.xz | tar -x -J -C rust --strip-components 2 && \
PATH=$PATH:$PWD/rust/bin ./mach build && \
pushd obj-arm-linux-androideabi/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 && \
popd && \
./mach package && \
mv obj-arm-linux-androideabi/dist/fennec-*-unsigned-unaligned.apk fdroid/fennec-unsigned.apk
ndk=r12b
Build:55.0,550010
commit=FENNEC_55_0_RELEASE
output=fdroid/fennec-unsigned.apk
srclibs=MozLocales@f9db105d36b5496792f4b0a126a008b1ae108472
prebuild=mkdir fdroid && \
l10ndir=`readlink -f $$MozLocales$$` && \
bash $$MozLocales$$/prebuild.sh && \
echo "ac_add_options --target=i386-linux-androideabi" >> .mozconfig && \
echo "ac_add_options --with-android-min-sdk=15" >> .mozconfig && \
echo "ac_add_options --with-android-ndk=\"$$NDK$$\"" >> .mozconfig && \
echo "ac_add_options --with-android-sdk=\"$$SDK$$\"" >> .mozconfig && \
echo "ac_add_options --enable-application=mobile/android" >> .mozconfig && \
echo "ac_add_options --with-branding=mobile/android/branding/unofficial" >> .mozconfig && \
echo "ac_add_options --with-l10n-base=${l10ndir}" >> .mozconfig && \
echo "mk_add_options 'export L10NBASEDIR=${l10ndir}'" >> .mozconfig && \
echo "mk_add_options 'export MOZ_CHROME_MULTILOCALE=$(tr '\n' ' ' < mobile/android/locales/maemo-locales)'" >> .mozconfig && \
pushd mobile/android/branding/unofficial/ && \
sed -i -e '/ANDROID_PACKAGE_NAME/d' -e '/MOZ_APP_DISPLAYNAME/d' configure.sh && \
echo 'ANDROID_PACKAGE_NAME=org.mozilla.fennec_fdroid' >> configure.sh && \
echo 'MOZ_APP_DISPLAYNAME="Fennec F-Droid"' >> configure.sh && \
echo 'MOZ_APP_ANDROID_VERSION_CODE=$$VERCODE$$' >> configure.sh && \
popd
build=export I_PREFER_A_SUBOPTIMAL_MERCURIAL_EXPERIENCE=1 && \
mkdir rust && \
curl https://static.rust-lang.org/dist/rust-1.19.0-`uname -m`-unknown-linux-gnu.tar.xz | tar -x -J -C rust --strip-components 2 && \
curl https://static.rust-lang.org/dist/rust-std-1.19.0-i686-linux-android.tar.xz | tar -x -J -C rust --strip-components 2 && \
PATH=$PATH:$PWD/rust/bin ./mach build && \
pushd obj-i386-linux-androideabi/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 && \
popd && \
./mach package && \
mv obj-i386-linux-androideabi/dist/fennec-*-unsigned-unaligned.apk fdroid/fennec-unsigned.apk
ndk=r12b
Build:55.0,550020
commit=FENNEC_55_0_RELEASE
output=fdroid/fennec-unsigned.apk
srclibs=MozLocales@f9db105d36b5496792f4b0a126a008b1ae108472
prebuild=mkdir fdroid && \
l10ndir=`readlink -f $$MozLocales$$` && \
bash $$MozLocales$$/prebuild.sh && \
echo "ac_add_options --target=aarch64-linux-android" >> .mozconfig && \
echo "ac_add_options --with-android-min-sdk=21" >> .mozconfig && \
echo "ac_add_options --with-android-ndk=\"$$NDK$$\"" >> .mozconfig && \
echo "ac_add_options --with-android-sdk=\"$$SDK$$\"" >> .mozconfig && \
echo "ac_add_options --enable-application=mobile/android" >> .mozconfig && \
echo "ac_add_options --with-branding=mobile/android/branding/unofficial" >> .mozconfig && \
echo "ac_add_options --with-l10n-base=${l10ndir}" >> .mozconfig && \
echo "mk_add_options 'export L10NBASEDIR=${l10ndir}'" >> .mozconfig && \
echo "mk_add_options 'export MOZ_CHROME_MULTILOCALE=$(tr '\n' ' ' < mobile/android/locales/maemo-locales)'" >> .mozconfig && \
pushd mobile/android/branding/unofficial/ && \
sed -i -e '/ANDROID_PACKAGE_NAME/d' -e '/MOZ_APP_DISPLAYNAME/d' configure.sh && \
echo 'ANDROID_PACKAGE_NAME=org.mozilla.fennec_fdroid' >> configure.sh && \
echo 'MOZ_APP_DISPLAYNAME="Fennec F-Droid"' >> configure.sh && \
echo 'MOZ_APP_ANDROID_VERSION_CODE=$$VERCODE$$' >> configure.sh && \
popd
build=export I_PREFER_A_SUBOPTIMAL_MERCURIAL_EXPERIENCE=1 && \
mkdir rust && \
curl https://static.rust-lang.org/dist/rust-1.19.0-`uname -m`-unknown-linux-gnu.tar.xz | tar -x -J -C rust --strip-components 2 && \
curl https://static.rust-lang.org/dist/rust-std-1.19.0-aarch64-linux-android.tar.xz | tar -x -J -C rust --strip-components 2 && \
PATH=$PATH:$PWD/rust/bin ./mach build && \
pushd obj-aarch64-linux-android/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 && \
popd && \
./mach package && \
mv obj-aarch64-linux-android/dist/fennec-*-unsigned-unaligned.apk fdroid/fennec-unsigned.apk
ndk=r12b
Maintainer Notes:
Updating/Versioning: