diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2018-02-02 11:02:50 -0500 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2018-02-02 11:02:50 -0500 |
| commit | 75b10a7b6b37f071943021811dc3fc0cf265f035 (patch) | |
| tree | 5891c5f72916e1354a39d59439c3466a3f506902 /mobile/android | |
| parent | eb03d673884f809109a0b3c73c94bb1cb1fa5857 (diff) | |
| download | uxp-75b10a7b6b37f071943021811dc3fc0cf265f035.tar.gz | |
End FIREFOX_VERSION and use preprocessed values in bundled install.rdf files
Diffstat (limited to 'mobile/android')
| -rw-r--r-- | mobile/android/config/version.txt | 1 | ||||
| -rw-r--r-- | mobile/android/config/version_display.txt | 1 | ||||
| -rw-r--r-- | mobile/android/confvars.sh | 4 | ||||
| -rw-r--r-- | mobile/android/extensions/flyweb/install.rdf.in | 6 | ||||
| -rw-r--r-- | mobile/android/extensions/flyweb/moz.build | 3 |
5 files changed, 10 insertions, 5 deletions
diff --git a/mobile/android/config/version.txt b/mobile/android/config/version.txt new file mode 100644 index 0000000000..4e9247c694 --- /dev/null +++ b/mobile/android/config/version.txt @@ -0,0 +1 @@ +52.6.0 diff --git a/mobile/android/config/version_display.txt b/mobile/android/config/version_display.txt new file mode 100644 index 0000000000..4e9247c694 --- /dev/null +++ b/mobile/android/config/version_display.txt @@ -0,0 +1 @@ +52.6.0 diff --git a/mobile/android/confvars.sh b/mobile/android/confvars.sh index b4215ca89a..f2c7ec1133 100644 --- a/mobile/android/confvars.sh +++ b/mobile/android/confvars.sh @@ -5,8 +5,8 @@ MOZ_APP_BASENAME=Fennec MOZ_APP_VENDOR=Mozilla -MOZ_APP_VERSION=$FIREFOX_VERSION -MOZ_APP_VERSION_DISPLAY=$FIREFOX_VERSION_DISPLAY +MOZ_APP_VERSION=`cat ${_topsrcdir}/$MOZ_BUILD_APP/config/version.txt` +MOZ_APP_VERSION_DISPLAY=`cat ${_topsrcdir}/$MOZ_BUILD_APP/config/version_display.txt` MOZ_APP_UA_NAME=Firefox MOZ_BRANDING_DIRECTORY=mobile/android/branding/unofficial diff --git a/mobile/android/extensions/flyweb/install.rdf.in b/mobile/android/extensions/flyweb/install.rdf.in index 76430412cc..dfa7a4262f 100644 --- a/mobile/android/extensions/flyweb/install.rdf.in +++ b/mobile/android/extensions/flyweb/install.rdf.in @@ -18,9 +18,9 @@ with minimum and maximum supported versions. --> <em:targetApplication> <Description> - <em:id>{aa3c5121-dab2-40e2-81ca-7ea25febc110}</em:id> - <em:minVersion>@FIREFOX_VERSION@</em:minVersion> - <em:maxVersion>@FIREFOX_VERSION@</em:maxVersion> + <em:id>@MOZ_APP_ID@</em:id> + <em:minVersion>@MOZ_APP_VERSION@</em:minVersion> + <em:maxVersion>@MOZ_APP_VERSION@</em:maxVersion> </Description> </em:targetApplication> diff --git a/mobile/android/extensions/flyweb/moz.build b/mobile/android/extensions/flyweb/moz.build index f453297e56..975e109e5b 100644 --- a/mobile/android/extensions/flyweb/moz.build +++ b/mobile/android/extensions/flyweb/moz.build @@ -4,6 +4,9 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. +DEFINES['MOZ_APP_VERSION'] = CONFIG['MOZ_APP_VERSION'] +DEFINES['MOZ_APP_ID'] = CONFIG['MOZ_APP_ID'] + FINAL_TARGET_FILES.features['flyweb@mozilla.org'] += [ 'bootstrap.js' ] |