Merge pull request #1348 from notmasteryet/installrdf

Use <em:maxVersion>@FIREFOX_VERSION@</em:maxVersion>

Makefile

@@ -226,6 +226,7 @@ FIREFOX_CONTENT_DIR := $(EXTENSION_SRC)/firefox/$(CONTENT_DIR)/
 FIREFOX_EXTENSION_FILES_TO_COPY = \
 	*.js \
 	*.rdf \
+	install.rdf.in \
 	README.mozilla \
 	components \
 	../../LICENSE \
@@ -237,6 +238,12 @@ FIREFOX_EXTENSION_FILES = \
 	content \
 	LICENSE \
 	$(NULL)
+FIREFOX_MC_EXTENSION_FILES = \
+	bootstrap.js \
+	components \
+	content \
+	LICENSE \
+	$(NULL)
 
 CHROME_BUILD_DIR := $(BUILD_DIR)/chrome
 CHROME_CONTENT_DIR := $(EXTENSION_SRC)/chrome/$(CONTENT_DIR)/
@@ -269,6 +276,7 @@ extension: | production
 	@rm -Rf $(FIREFOX_BUILD_CONTENT)/$(BUILD_DIR)/;
 	# Update the build version number
 	@sed -i.bak "s/PDFJSSCRIPT_VERSION/$(PDFJSSCRIPT_VERSION)/" $(FIREFOX_BUILD_DIR)/install.rdf
+	@sed -i.bak "s/PDFJSSCRIPT_VERSION/$(PDFJSSCRIPT_VERSION)/" $(FIREFOX_BUILD_DIR)/install.rdf.in
 	@sed -i.bak "s/PDFJSSCRIPT_VERSION/$(PDFJSSCRIPT_VERSION)/" $(FIREFOX_BUILD_DIR)/update.rdf
 	@sed -i.bak "s/PDFJSSCRIPT_VERSION/$(PDFJSSCRIPT_VERSION)/" $(FIREFOX_BUILD_DIR)/README.mozilla
 	@rm -f $(FIREFOX_BUILD_DIR)/*.bak
@@ -282,10 +290,7 @@ extension: | production
 	@cd $(FIREFOX_BUILD_DIR); zip -r $(FIREFOX_AMO_EXTENSION_NAME) $(FIREFOX_EXTENSION_FILES)
 	@echo "AMO extension created: " $(FIREFOX_AMO_EXTENSION_NAME)
 	# List all files for mozilla-central
-	@cd $(FIREFOX_BUILD_DIR); find $(FIREFOX_EXTENSION_FILES) -type f > extension-files
+	@cd $(FIREFOX_BUILD_DIR); find $(FIREFOX_MC_EXTENSION_FILES) -type f > extension-files
-	# <em:maxVersion> must be set to "*" for mozilla-central
-	@sed -i.bak "s/em:maxVersion>[^<]*/em:maxVersion>*/" $(FIREFOX_BUILD_DIR)/install.rdf
-	@rm -f $(FIREFOX_BUILD_DIR)/*.bak
 
 	# Clear out everything in the chrome extension build directory
 	@rm -Rf $(CHROME_BUILD_DIR)

extensions/firefox/install.rdf

@@ -7,7 +7,7 @@
     <em:id>uriloader@pdf.js</em:id>
     <em:name>pdf.js</em:name>
     <em:version>PDFJSSCRIPT_VERSION</em:version>
-	  <em:iconURL>chrome://pdf.js/skin/logo.png</em:iconURL>
+    <em:iconURL>chrome://pdf.js/skin/logo.png</em:iconURL>
     <em:targetApplication>
       <Description>
        <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>

extensions/firefox/install.rdf.in

@@ -0,0 +1,28 @@
+<?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>uriloader@pdf.js</em:id>
+    <em:name>pdf.js</em:name>
+    <em:version>PDFJSSCRIPT_VERSION</em:version>
+    <em:iconURL>chrome://pdf.js/skin/logo.png</em:iconURL>
+    <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:strictCompatibility>true</em:strictCompatibility>
+     </Description>
+    </em:targetApplication>
+    <em:bootstrap>true</em:bootstrap>
+    <em:unpack>true</em:unpack>
+    <em:creator>Mozilla Labs</em:creator>
+    <em:description>pdf.js uri loader</em:description>
+    <em:homepageURL>https://github.com/mozilla/pdf.js/</em:homepageURL>
+    <em:type>2</em:type>
+  </Description>
+</RDF>

make.js

@@ -220,6 +220,7 @@ target.firefox = function() {
       FIREFOX_EXTENSION_FILES_TO_COPY =
         ['*.js',
          '*.rdf',
+         'install.rdf.in',
          'README.mozilla',
          'components',
          '../../LICENSE'];
@@ -229,6 +230,11 @@ target.firefox = function() {
          'components',
          'content',
          'LICENSE'];
+      FIREFOX_MC_EXTENSION_FILES =
+        ['bootstrap.js',
+         'components',
+         'content',
+         'LICENSE'];
       FIREFOX_EXTENSION_NAME = 'pdf.js.xpi',
       FIREFOX_AMO_EXTENSION_NAME = 'pdf.js.amo.xpi';
 
@@ -274,6 +280,7 @@ target.firefox = function() {
   // Update the build version number
   sed('-i', /PDFJSSCRIPT_VERSION/, EXTENSION_VERSION, FIREFOX_BUILD_DIR + '/install.rdf');
   sed('-i', /PDFJSSCRIPT_VERSION/, EXTENSION_VERSION, FIREFOX_BUILD_DIR + '/update.rdf');
+  sed('-i', /PDFJSSCRIPT_VERSION/, EXTENSION_VERSION, FIREFOX_BUILD_DIR + '/install.rdf.in');
   sed('-i', /PDFJSSCRIPT_VERSION/, EXTENSION_VERSION, FIREFOX_BUILD_DIR + '/README.mozilla');
 
   // Create the xpi
@@ -292,13 +299,11 @@ target.firefox = function() {
   // List all files for mozilla-central
   cd(FIREFOX_BUILD_DIR);
   var extensionFiles = '';
-  for (file in find(FIREFOX_EXTENSION_FILES)) {
+  for (file in find(FIREFOX_MC_EXTENSION_FILES)) {
     if (test('-f', file))
       extensionFiles += file+'\n';
   }
   extensionFiles.to('extension-files');
-  // <em:maxVersion> must be set to "*" for mozilla-central
-  sed('-i', /em:maxVersion>[^<]*/, 'em:maxVersion>*', 'install.rdf');
 };
 
 //