Bug 1256686 - System add-ons should have a more flexible maximum version for easier use with point releases. r=glandium, a=lizzard
authorMark Banner <standard8@mozilla.com>
Fri, 01 Jul 2016 16:54:18 +0100
changeset 333579 466fc08f77161a1ea93b59cddbc5a79146df42a1
parent 333578 e4b27dae353c933a01584dfeff27d547ef60f04e
child 333580 d142c49033c015f67272562b37dbe2912cfc7f14
push id6179
push usercbook@mozilla.com
push dateThu, 07 Jul 2016 04:54:37 +0000
treeherdermozilla-beta@466fc08f7716 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium, lizzard
bugs1256686
milestone48.0
Bug 1256686 - System add-ons should have a more flexible maximum version for easier use with point releases. r=glandium, a=lizzard
browser/extensions/e10srollout/install.rdf.in
browser/extensions/e10srollout/moz.build
browser/extensions/pocket/install.rdf.in
browser/extensions/pocket/moz.build
--- a/browser/extensions/e10srollout/install.rdf.in
+++ b/browser/extensions/e10srollout/install.rdf.in
@@ -14,18 +14,18 @@
     <em:type>2</em:type>
     <em:bootstrap>true</em:bootstrap>
 
     <!-- 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:minVersion>@MOZ_APP_VERSION@</em:minVersion>
+        <em:maxVersion>@MOZ_APP_MAXVERSION@</em:maxVersion>
       </Description>
     </em:targetApplication>
 
     <!-- Front End MetaData -->
     <em:name>Multi-process staged rollout</em:name>
     <em:description>Staged rollout of Firefox multi-process feature.</em:description>
   </Description>
 </RDF>
--- a/browser/extensions/e10srollout/moz.build
+++ b/browser/extensions/e10srollout/moz.build
@@ -1,13 +1,16 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # 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_MAXVERSION'] = CONFIG['MOZ_APP_MAXVERSION']
+
 FINAL_TARGET_FILES.features['e10srollout@mozilla.org'] += [
   'bootstrap.js'
 ]
 
 FINAL_TARGET_PP_FILES.features['e10srollout@mozilla.org'] += [
   'install.rdf.in'
 ]
--- a/browser/extensions/pocket/install.rdf.in
+++ b/browser/extensions/pocket/install.rdf.in
@@ -14,18 +14,18 @@
     <em:type>2</em:type>
     <em:bootstrap>true</em:bootstrap>
 
     <!-- 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:minVersion>@MOZ_APP_VERSION@</em:minVersion>
+        <em:maxVersion>@MOZ_APP_MAXVERSION@</em:maxVersion>
       </Description>
     </em:targetApplication>
 
     <!-- Front End MetaData -->
     <em:name>Pocket</em:name>
     <em:description>When you find something you want to view later, put it in Pocket.</em:description>
   </Description>
 </RDF>
--- a/browser/extensions/pocket/moz.build
+++ b/browser/extensions/pocket/moz.build
@@ -1,14 +1,17 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # 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_MAXVERSION'] = CONFIG['MOZ_APP_MAXVERSION']
+
 DIRS += ['locales']
 
 FINAL_TARGET_FILES.features['firefox@getpocket.com'] += [
   'bootstrap.js'
 ]
 
 FINAL_TARGET_PP_FILES.features['firefox@getpocket.com'] += [
   'install.rdf.in'