factor out application compatibility min/max version strings into client.mk file so they stay consistent for both install and update manifests
authorMyk Melez <myk@mozilla.org>
Thu, 24 Sep 2009 10:42:01 -0700
changeset 1159 4c0cef7cf45d4b7f0417f091d84d95d13f3d5db6
parent 1158 0bd72b72e0fab2354305e7fef4967b84cf60d586
child 1160 fcf1d9fc1223a6e6fd33195acc259b7f7a6e9d60
push id746
push usermyk@mozilla.com
push dateThu, 24 Sep 2009 17:42:08 +0000
factor out application compatibility min/max version strings into client.mk file so they stay consistent for both install and update manifests
client/Makefile
client/client.mk
client/install.rdf.in
client/update.rdf.in
--- a/client/Makefile
+++ b/client/Makefile
@@ -160,17 +160,18 @@ else
   extension_dir = $(shell pwd)
 endif
 
 # A command to substitute @variables@ for their values in .in files.
 substitute := perl -p -e 's/@([^@]+)@/defined $$ENV{$$1} ? $$ENV{$$1} : $$&/ge'
 
 # The variables to substitute for their values in .in files.
 export package_version update_url_tag package_url revision_id chrome_path \
-       channel extension_id
+       channel extension_id \
+       fx_min_version fx_max_version tb_min_version tb_max_version
 
 
 ################################################################################
 # Make Targets
 
 .PHONY: $(dotin_files) substitute build package publish clean
 
 all: build
--- a/client/client.mk
+++ b/client/client.mk
@@ -50,8 +50,17 @@ name              := personas
 # version comparator (nsIVersionComparator) and the rest of the string is
 # a timestamp.
 version           := 1.3a1
 
 # These variables control publication of the extension to a remote website.
 site_url_base     := https://people.mozilla.com/~cbeard/personas/dist
 site_path_local   := dist
 site_path_remote  := people.mozilla.com:/home/cbeard/public_html/personas/dist
+
+# The minimum and maximum versions of Firefox and Thunderbird with which
+# the extension is compatible.  These are used in both the install and update
+# manifests.
+fx_min_version    := 3.0
+fx_max_version    := 3.6b1pre
+
+tb_min_version    := 3.0b1
+tb_max_version    := 3.0pre
--- a/client/install.rdf.in
+++ b/client/install.rdf.in
@@ -40,22 +40,22 @@
     <em:homepageURL>http://www.getpersonas.com/</em:homepageURL>
     <em:iconURL>chrome://personas/content/personas_32x32.png</em:iconURL>
     <em:optionsURL>chrome://personas/content/preferences.xul</em:optionsURL>
     @update_url_tag@
 
     <em:targetApplication> <!-- Firefox -->
       <Description>
         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
-        <em:minVersion>3.0</em:minVersion>
-        <em:maxVersion>3.6b1pre</em:maxVersion>
+        <em:minVersion>@fx_min_version@</em:minVersion>
+        <em:maxVersion>@fx_max_version@</em:maxVersion>
       </Description>
     </em:targetApplication>
 
     <em:targetApplication> <!-- Thunderbird -->
       <Description>
         <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
-        <em:minVersion>3.0b1</em:minVersion>
-        <em:maxVersion>3.0pre</em:maxVersion>
+        <em:minVersion>@tb_min_version@</em:minVersion>
+        <em:maxVersion>@tb_max_version@</em:maxVersion>
       </Description>
     </em:targetApplication>
   </Description>
 </RDF>
--- a/client/update.rdf.in
+++ b/client/update.rdf.in
@@ -6,26 +6,26 @@
   <em:updates>
     <Seq>
       <li>
 	<Description>
           <em:version>@package_version@</em:version>
           <em:targetApplication> <!-- Firefox -->
             <Description>
               <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
-              <em:minVersion>3.5</em:minVersion>
-              <em:maxVersion>3.6a2pre</em:maxVersion>
+	      <em:minVersion>@fx_min_version@</em:minVersion>
+	      <em:maxVersion>@fx_max_version@</em:maxVersion>
               <em:updateLink>@package_url@</em:updateLink>
             </Description>
           </em:targetApplication>
           <em:targetApplication> <!-- Thunderbird -->
             <Description>
 	      <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
-	      <em:minVersion>3.0b1</em:minVersion>
-	      <em:maxVersion>3.0pre</em:maxVersion>
+	      <em:minVersion>@tb_min_version@</em:minVersion>
+	      <em:maxVersion>@tb_max_version@</em:maxVersion>
               <em:updateLink>@package_url@</em:updateLink>
             </Description>
           </em:targetApplication>
         </Description>
       </li>
     </Seq>
   </em:updates>
 </Description>