Fennec FDroid: Use VC from build field

This commit is contained in:
Boris Kraut 2015-05-10 18:28:27 +02:00
parent aeb60bb94d
commit aec2afd6ba

View file

@ -774,7 +774,6 @@ Build:38.0,380000
sed -i -e '/tests/d' toolkit/mozapps/update/moz.build
scanignore=mobile/android/base/JavaAddonManager.java
prebuild=mkdir fdroid && \
vercode=380000 && \
fxarch=arm-linux-androideabi && \
l10ndir=`readlink -f $$MozLocales$$` && \
sed -i -e 's/android:debuggable="true"//g' mobile/android/base/AndroidManifest.xml.in && \
@ -792,7 +791,7 @@ Build:38.0,380000
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 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 && \
@ -846,7 +845,6 @@ Build:38.0,380010
sed -i -e '/tests/d' toolkit/mozapps/update/moz.build
scanignore=mobile/android/base/JavaAddonManager.java
prebuild=mkdir fdroid && \
vercode=380010 && \
fxarch=i386-linux-androideabi && \
l10ndir=`readlink -f $$MozLocales$$` && \
sed -i -e 's/android:debuggable="true"//g' mobile/android/base/AndroidManifest.xml.in && \
@ -864,7 +862,7 @@ Build:38.0,380010
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 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 && \