Bug 672897 - Update compatibility info for mobile Feedback add-on automatically [r=mfinkle]
authorMatt Brubeck <mbrubeck@mozilla.com>
Wed, 20 Jul 2011 13:39:15 -0700
changeset 73120 2b4cf59fa42cba0a4093b178050e228d3f7ef97f
parent 73119 1e772f5fbc24b46e8c81e25bba9d0fbcd2c90380
child 73121 cdec5871f47be2cb41bf82e3371c4c5eeb3cfbd0
push id20819
push usermak77@bonardo.net
push dateThu, 21 Jul 2011 12:32:52 +0000
treeherdermozilla-central@036c28e4e0f2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmfinkle
bugs672897
milestone8.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 672897 - Update compatibility info for mobile Feedback add-on automatically [r=mfinkle]
mobile/app/profile/extensions/Makefile.in
mobile/app/profile/extensions/feedback@mobile.mozilla.org/install.rdf
mobile/app/profile/extensions/feedback@mobile.mozilla.org/install.rdf.in
--- a/mobile/app/profile/extensions/Makefile.in
+++ b/mobile/app/profile/extensions/Makefile.in
@@ -35,30 +35,33 @@
 #
 # ***** END LICENSE BLOCK *****
 
 DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
+EXTENSIONS_DIR = $(call core_abspath,$(DIST))/bin/extensions
+
 include $(DEPTH)/config/autoconf.mk
 
 include $(topsrcdir)/config/rules.mk
 
 ifneq (,$(filter aurora beta,$(MOZ_UPDATE_CHANNEL)))
 EXTENSIONS = \
   feedback@mobile.mozilla.org \
   $(NULL)
 
-ABS_DIST = $(call core_abspath,$(DIST))
-
-define _PACKAGE_EXTENSIONS
-rm -f $(ABS_DIST)/bin/extensions/$(dir).xpi
-mkdir -p $(ABS_DIST)/bin/extensions
-cd $(srcdir)/$(dir)/; $(ZIP) -r9 $(ABS_DIST)/bin/extensions/$(dir).xpi *
+define _INSTALL_EXTENSION
+$(NSINSTALL) -D $(dir) && \
+  $(PYTHON) $(MOZILLA_DIR)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) $(srcdir)/$(dir)/install.rdf.in > $(dir)/install.rdf && \
+  cd $(dir) && \
+  $(ZIP) -r9XD $(EXTENSIONS_DIR)/$(dir).xpi install.rdf && \
+  cd $(srcdir)/$(dir) && \
+  $(ZIP) -r9XD $(EXTENSIONS_DIR)/$(dir).xpi * -x install.rdf.in
 
 endef # do not remove the blank line!
 
 libs::
-	$(foreach dir,$(EXTENSIONS),$(_PACKAGE_EXTENSIONS))
-
+	$(NSINSTALL) -D $(EXTENSIONS_DIR)
+	$(foreach dir,$(EXTENSIONS),$(_INSTALL_EXTENSION))
 endif
rename from mobile/app/profile/extensions/feedback@mobile.mozilla.org/install.rdf
rename to mobile/app/profile/extensions/feedback@mobile.mozilla.org/install.rdf.in
--- a/mobile/app/profile/extensions/feedback@mobile.mozilla.org/install.rdf
+++ b/mobile/app/profile/extensions/feedback@mobile.mozilla.org/install.rdf.in
@@ -1,24 +1,26 @@
 <?xml version="1.0"?>
 
+#filter substitution
+
 <RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
      xmlns:em="http://www.mozilla.org/2004/em-rdf#">
   <Description about="urn:mozilla:install-manifest">
     <em:id>feedback@mobile.mozilla.org</em:id>
     <em:version>1.0.1</em:version>
     <em:type>2</em:type>
 
     <!-- Target Application this extension can install into, 
          with minimum and maximum supported versions. --> 
     <em:targetApplication>
       <Description>
         <em:id>{a23983c0-fd0e-11dc-95ff-0800200c9a66}</em:id>
-        <em:minVersion>2.0b1pre</em:minVersion>
-        <em:maxVersion>6.*</em:maxVersion>
+        <em:minVersion>4.0</em:minVersion>
+        <em:maxVersion>@FIREFOX_VERSION@</em:maxVersion>
       </Description>
     </em:targetApplication>
    
     <!-- Front End MetaData -->
     <em:name>Feedback</em:name>
     <em:description>Help make Firefox better by giving feedback.</em:description>
     <em:creator>Mozilla Corporation</em:creator>
     <em:iconURL>chrome://feedback/skin/dino-32.png</em:iconURL>