Merge branch 'fennec-fdroid-49.0.2' into 'master'

Fennec F-Droid: Prepare for 49.0.2

This is a copy of 49.0 recipe except this part (as suggested in Manizuca/fenneclocales!2):

    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

Now if `make merge-$loc` or `make chrome-$loc` fails the whole build will immediately fail.

See merge request !1774
This commit is contained in:
Boris Kraut 2016-10-23 19:03:32 +00:00
commit 0a024ae7dd

View file

@ -2783,6 +2783,72 @@ Build:49.0,490010
mv obj-${fxarch}/dist/fennec-*-unsigned-unaligned.apk fdroid/fennec-unsigned.apk
ndk=r10e
Build:49.0.2,490200
commit=FENNEC_49_0_2_RELEASE
output=fdroid/fennec-unsigned.apk
srclibs=MozLocales@cc417297fe493431e92989a48ab1207265e26b28
prebuild=mkdir fdroid && \
fxarch=`echo $$VERCODE$$ | cut -c 5 | sed -e 's/0/arm-linux-androideabi/g' -e 's/1/i386-linux-androideabi/g'` && \
l10ndir=`readlink -f $$MozLocales$$` && \
bash $$MozLocales$$/prebuild.sh && \
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 --target=${fxarch}" >> .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 ANDROID_VERSION_CODE=$$VERCODE$$'" >> .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 && \
popd
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 && \
./mach build && \
fxarch=`grep "ac_add_options --target=" .mozconfig | cut -d '=' -f2` && \
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 && \
popd && \
./mach package && \
mv obj-${fxarch}/dist/fennec-*-unsigned-unaligned.apk fdroid/fennec-unsigned.apk
ndk=r10e
Build:49.0.2,490210
commit=FENNEC_49_0_2_RELEASE
output=fdroid/fennec-unsigned.apk
srclibs=MozLocales@cc417297fe493431e92989a48ab1207265e26b28
prebuild=mkdir fdroid && \
fxarch=`echo $$VERCODE$$ | cut -c 5 | sed -e 's/0/arm-linux-androideabi/g' -e 's/1/i386-linux-androideabi/g'` && \
l10ndir=`readlink -f $$MozLocales$$` && \
bash $$MozLocales$$/prebuild.sh && \
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 --target=${fxarch}" >> .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 ANDROID_VERSION_CODE=$$VERCODE$$'" >> .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 && \
popd
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 && \
./mach build && \
fxarch=`grep "ac_add_options --target=" .mozconfig | cut -d '=' -f2` && \
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 && \
popd && \
./mach package && \
mv obj-${fxarch}/dist/fennec-*-unsigned-unaligned.apk fdroid/fennec-unsigned.apk
ndk=r10e
Maintainer Notes:
Issues: