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 /browser | |
| parent | eb03d673884f809109a0b3c73c94bb1cb1fa5857 (diff) | |
| download | UXP-75b10a7b6b37f071943021811dc3fc0cf265f035.tar UXP-75b10a7b6b37f071943021811dc3fc0cf265f035.tar.gz UXP-75b10a7b6b37f071943021811dc3fc0cf265f035.tar.lz UXP-75b10a7b6b37f071943021811dc3fc0cf265f035.tar.xz UXP-75b10a7b6b37f071943021811dc3fc0cf265f035.zip | |
End FIREFOX_VERSION and use preprocessed values in bundled install.rdf files
Diffstat (limited to 'browser')
4 files changed, 10 insertions, 7 deletions
diff --git a/browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf.in b/browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf.in index 3e803af5b..a2cb9754d 100644 --- a/browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf.in +++ b/browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf.in @@ -11,15 +11,15 @@ <Description about="urn:mozilla:install-manifest"> <em:id>{972ce4c6-7e08-4474-a285-3208198ce6fd}</em:id> - <em:version>@FIREFOX_VERSION@</em:version> + <em:version>@MOZ_APP_VERSION@</em:version> <!-- Target Application this theme can install into, with minimum and maximum supported versions. --> <em:targetApplication> <Description> - <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</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/browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/moz.build b/browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/moz.build index 20a4c1cbe..f8c2a5c4b 100644 --- a/browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/moz.build +++ b/browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/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 = 'dist/bin/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}' FINAL_TARGET_PP_FILES += [ diff --git a/browser/confvars.sh b/browser/confvars.sh index dabd06ea7..1bc9d1ad0 100755 --- a/browser/confvars.sh +++ b/browser/confvars.sh @@ -32,8 +32,8 @@ fi # Enable building ./signmar and running libmar signature tests MOZ_ENABLE_SIGNMAR=1 -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_EXTENSIONS_DEFAULT=" gio" # MOZ_APP_DISPLAYNAME will be set by branding/configure.sh # MOZ_BRANDING_DIRECTORY is the default branding directory used when none is diff --git a/browser/installer/windows/moz.build b/browser/installer/windows/moz.build index b953b57a0..12e7831ed 100644 --- a/browser/installer/windows/moz.build +++ b/browser/installer/windows/moz.build @@ -4,7 +4,7 @@ # 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['APP_VERSION'] = CONFIG['FIREFOX_VERSION'] +DEFINES['APP_VERSION'] = CONFIG['MOZ_APP_VERSION'] DEFINES['MOZ_APP_NAME'] = CONFIG['MOZ_APP_NAME'] DEFINES['MOZ_APP_DISPLAYNAME'] = CONFIG['MOZ_APP_DISPLAYNAME'] |