Merge pull request #1334 from notmasteryet/build-mc

Add additional files for mc build

Makefile

@@ -210,6 +210,7 @@ pages-repo: | $(BUILD_DIR)
 # copy of the pdf.js source.
 CONTENT_DIR := content
 BUILD_NUMBER := `git log --format=oneline $(EXTENSION_BASE_VERSION).. | wc -l | awk '{print $$1}'`
+PDFJSSCRIPT_VERSION := 0.2.$(BUILD_NUMBER)
 EXTENSION_WEB_FILES = \
 	web/images \
 	web/viewer.css \
@@ -225,14 +226,16 @@ FIREFOX_CONTENT_DIR := $(EXTENSION_SRC)/firefox/$(CONTENT_DIR)/
 FIREFOX_EXTENSION_FILES_TO_COPY = \
 	*.js \
 	*.rdf \
+	README.mozilla \
 	components \
+	../../LICENSE \
 	$(NULL)
 FIREFOX_EXTENSION_FILES = \
-	content \
+	bootstrap.js \
-	*.js \
 	install.rdf \
 	components \
 	content \
+	LICENSE \
 	$(NULL)
 
 CHROME_BUILD_DIR := $(BUILD_DIR)/chrome
@@ -265,9 +268,11 @@ extension: | production
 	# We don't need pdf.js anymore since its inlined
 	@rm -Rf $(FIREFOX_BUILD_CONTENT)/$(BUILD_DIR)/;
 	# Update the build version number
-	@sed -i.bak "s/PDFJSSCRIPT_BUILD/$(BUILD_NUMBER)/" $(FIREFOX_BUILD_DIR)/install.rdf
+	@sed -i.bak "s/PDFJSSCRIPT_VERSION/$(PDFJSSCRIPT_VERSION)/" $(FIREFOX_BUILD_DIR)/install.rdf
-	@sed -i.bak "s/PDFJSSCRIPT_BUILD/$(BUILD_NUMBER)/" $(FIREFOX_BUILD_DIR)/update.rdf
+	@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
+	@find $(FIREFOX_BUILD_DIR) -name ".*" -delete
 	# Create the xpi
 	@cd $(FIREFOX_BUILD_DIR); zip -r $(FIREFOX_EXTENSION_NAME) $(FIREFOX_EXTENSION_FILES)
 	@echo "extension created: " $(FIREFOX_EXTENSION_NAME)
@@ -276,6 +281,8 @@ extension: | production
 	@rm -f $(FIREFOX_BUILD_DIR)/*.bak
 	@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
 
 	# Clear out everything in the chrome extension build directory
 	@rm -Rf $(CHROME_BUILD_DIR)

extensions/firefox/README.mozilla

@@ -0,0 +1,4 @@
+This is the pdf.js project output, https://github.com/mozilla/pdf.js
+
+Current extension version is: PDFJSSCRIPT_VERSION
+

extensions/firefox/install.rdf

@@ -6,13 +6,13 @@
   <Description about="urn:mozilla:install-manifest">
     <em:id>uriloader@pdf.js</em:id>
     <em:name>pdf.js</em:name>
-    <em:version>0.2.PDFJSSCRIPT_BUILD</em:version>
+    <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>6.0</em:minVersion>
-       <em:maxVersion>13.0a1</em:maxVersion>
+       <em:maxVersion>14.0a1</em:maxVersion>
      </Description>
     </em:targetApplication>
     <em:bootstrap>true</em:bootstrap>

extensions/firefox/update.rdf

@@ -8,7 +8,7 @@
       <RDF:Seq>
         <RDF:li>
           <RDF:Description>
-            <em:version>0.2.PDFJSSCRIPT_BUILD</em:version>
+            <em:version>PDFJSSCRIPT_VERSION</em:version>
             <em:targetApplication>
               <RDF:Description>
                 <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>

make.js

@@ -174,7 +174,9 @@ var EXTENSION_WEB_FILES =
        'web/viewer.html',
        'web/viewer-production.html'],
     EXTENSION_BASE_VERSION = '4bb289ec499013de66eb421737a4dbb4a9273eda',
-    EXTENSION_BUILD_NUMBER;
+    EXTENSION_VERSION_PREFIX = '0.2.',
+    EXTENSION_BUILD_NUMBER,
+    EXTENSION_VERSION;
 
 //
 // make extension
@@ -200,6 +202,8 @@ target.buildnumber = function() {
     .output.match(/\n/g).length; // get # of lines in git output
 
   echo('Extension build number: ' + EXTENSION_BUILD_NUMBER);
+
+  EXTENSION_VERSION = EXTENSION_VERSION_PREFIX + EXTENSION_BUILD_NUMBER;
 };
 
 //
@@ -215,13 +219,15 @@ target.firefox = function() {
       FIREFOX_EXTENSION_FILES_TO_COPY =
         ['*.js',
          '*.rdf',
-         'components'];
+         'README.mozilla',
+         'components',
+         '../../LICENSE'];
       FIREFOX_EXTENSION_FILES =
-        ['content',
+        ['bootstrap.js',
-         '*.js',
          'install.rdf',
          'components',
-         'content'];
+         'content',
+         'LICENSE'];
       FIREFOX_EXTENSION_NAME = 'pdf.js.xpi',
       FIREFOX_AMO_EXTENSION_NAME = 'pdf.js.amo.xpi';
 
@@ -258,10 +264,13 @@ target.firefox = function() {
 
   // We don't need pdf.js anymore since its inlined
   rm('-Rf', FIREFOX_BUILD_CONTENT_DIR + BUILD_DIR);
+  // TODO remove '.DS_Store' and other hidden files
+  // `find $(FIREFOX_BUILD_DIR) -name ".*" -delete`
 
   // Update the build version number
-  sed('-i', /PDFJSSCRIPT_BUILD/, EXTENSION_BUILD_NUMBER, FIREFOX_BUILD_DIR + '/install.rdf');
+  sed('-i', /PDFJSSCRIPT_VERSION/, EXTENSION_VERSION, FIREFOX_BUILD_DIR + '/install.rdf');
-  sed('-i', /PDFJSSCRIPT_BUILD/, EXTENSION_BUILD_NUMBER, FIREFOX_BUILD_DIR + '/update.rdf');
+  sed('-i', /PDFJSSCRIPT_VERSION/, EXTENSION_VERSION, FIREFOX_BUILD_DIR + '/update.rdf');
+  sed('-i', /PDFJSSCRIPT_VERSION/, EXTENSION_VERSION, FIREFOX_BUILD_DIR + '/README.mozilla');
 
   // Create the xpi
   cd(FIREFOX_BUILD_DIR);
@@ -275,6 +284,9 @@ target.firefox = function() {
   exec('zip -r ' + FIREFOX_AMO_EXTENSION_NAME + ' ' + FIREFOX_EXTENSION_FILES.join(' '));
   echo('AMO extension created: ' + FIREFOX_AMO_EXTENSION_NAME);
   cd(ROOT_DIR);
+
+  // TODO List all files for mozilla-central
+  // `@cd $(FIREFOX_BUILD_DIR); find $(FIREFOX_EXTENSION_FILES) -type f > extension-files`
 };
 
 //