Merge branch 'IceCat' into 'master'
Update Icecat to 45.6.0 See merge request !1928
This commit is contained in:
commit
cc3f1b3d40
|
@ -154,8 +154,50 @@ Build:45.5.1,450511
|
||||||
./mach package
|
./mach package
|
||||||
ndk=r10e
|
ndk=r10e
|
||||||
|
|
||||||
|
Build:45.6.0,450600
|
||||||
|
commit=FIREFOX_45_6_0esr_RELEASE
|
||||||
|
output=obj-android/dist/gecko-unsigned-unaligned.apk
|
||||||
|
srclibs=MozLocales@a4998ff4,IceCat@6d2fc359
|
||||||
|
prebuild=export I_PREFER_A_SUBOPTIMAL_MERCURIAL_EXPERIENCE=1 && \
|
||||||
|
bash $$IceCat$$/makeicecat -- --no-tarball --skip-l10n --no-debian --with-sourcedir=$PWD && \
|
||||||
|
bash $$MozLocales$$/prebuild-icecat.sh && \
|
||||||
|
fxarch=`echo $$VERCODE$$ | cut -c 5 | sed -e 's/0/arm-linux-androideabi/g' -e 's/1/i386-linux-androideabi/g'` && \
|
||||||
|
echo "ac_add_options --with-android-ndk=$$NDK$$" >> .mozconfig && \
|
||||||
|
echo "ac_add_options --with-android-sdk=$$SDK$$" >> .mozconfig && \
|
||||||
|
echo "ac_add_options --target=${fxarch}" >> .mozconfig && \
|
||||||
|
echo "mk_add_options 'export ANDROID_VERSION_CODE=$$VERCODE$$'" >> .mozconfig
|
||||||
|
scanignore=mobile/android/base/java/org/mozilla/gecko/javaaddons
|
||||||
|
build=export I_PREFER_A_SUBOPTIMAL_MERCURIAL_EXPERIENCE=1 && \
|
||||||
|
./mach build && \
|
||||||
|
pushd obj-android/mobile/android/locales && \
|
||||||
|
for loc in $(cat ../../../../used-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
|
||||||
|
ndk=r10e
|
||||||
|
|
||||||
|
Build:45.6.0,450610
|
||||||
|
commit=FIREFOX_45_6_0esr_RELEASE
|
||||||
|
output=obj-android/dist/gecko-unsigned-unaligned.apk
|
||||||
|
srclibs=MozLocales@a4998ff4,IceCat@6d2fc359
|
||||||
|
prebuild=export I_PREFER_A_SUBOPTIMAL_MERCURIAL_EXPERIENCE=1 && \
|
||||||
|
bash $$IceCat$$/makeicecat -- --no-tarball --skip-l10n --no-debian --with-sourcedir=$PWD && \
|
||||||
|
bash $$MozLocales$$/prebuild-icecat.sh && \
|
||||||
|
fxarch=`echo $$VERCODE$$ | cut -c 5 | sed -e 's/0/arm-linux-androideabi/g' -e 's/1/i386-linux-androideabi/g'` && \
|
||||||
|
echo "ac_add_options --with-android-ndk=$$NDK$$" >> .mozconfig && \
|
||||||
|
echo "ac_add_options --with-android-sdk=$$SDK$$" >> .mozconfig && \
|
||||||
|
echo "ac_add_options --target=${fxarch}" >> .mozconfig && \
|
||||||
|
echo "mk_add_options 'export ANDROID_VERSION_CODE=$$VERCODE$$'" >> .mozconfig
|
||||||
|
scanignore=mobile/android/base/java/org/mozilla/gecko/javaaddons
|
||||||
|
build=export I_PREFER_A_SUBOPTIMAL_MERCURIAL_EXPERIENCE=1 && \
|
||||||
|
./mach build && \
|
||||||
|
pushd obj-android/mobile/android/locales && \
|
||||||
|
for loc in $(cat ../../../../used-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
|
||||||
|
ndk=r10e
|
||||||
|
|
||||||
Archive Policy:4 versions
|
Archive Policy:4 versions
|
||||||
Auto Update Mode:None
|
Auto Update Mode:None
|
||||||
Update Check Mode:None
|
Update Check Mode:None
|
||||||
Current Version:45.5.1
|
Current Version:45.6.0
|
||||||
Current Version Code:450511
|
Current Version Code:450610
|
||||||
|
|
Loading…
Reference in a new issue