Bug 740795 part C - Don't ship pdf.js as an extension, build changes, r=ted

--HG--
extra : rebase_source : 2008d063ce9969f1e3846a69b403016c0f60db60

browser/Makefile.in

@@ -16,6 +16,7 @@ PARALLEL_DIRS = \
   locales \
   modules \
   themes \
+  extensions \
   $(NULL)
 
 DIRS = \

browser/extensions/Makefile.in

@@ -0,0 +1,35 @@
+# 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/.
+
+DEPTH      = ../..
+topsrcdir  = @top_srcdir@
+srcdir     = @srcdir@
+VPATH      = @srcdir@
+
+CHROMEDIR = $(call core_abspath,$(DIST))/bin/chrome
+
+include $(DEPTH)/config/autoconf.mk
+
+TEST_DIRS += pdfjs/test
+
+include $(topsrcdir)/config/rules.mk
+
+exclude_files = \
+  test \
+  install.rdf \
+  bootstrap.js \
+  icon.png \
+  icon64.png \
+  $(NULL)
+
+$(DIST)/bin/chrome/pdfjs.manifest: $(GLOBAL_DEPS)
+	printf "manifest pdfjs/chrome.manifest" > $@
+
+libs:: $(DIST)/bin/chrome/pdfjs.manifest
+	$(PYTHON) $(topsrcdir)/config/nsinstall.py \
+	  $(srcdir)/pdfjs \
+          $(foreach exclude,$(exclude_files), -X $(srcdir)/pdfjs/$(exclude)) \
+          $(DIST)/bin/chrome
+	$(PYTHON) $(MOZILLA_DIR)/config/buildlist.py \
+	  $(DIST)/bin/chrome.manifest "manifest chrome/pdfjs.manifest"

browser/installer/package-manifest.in

@@ -480,8 +480,8 @@
 ; [Browser Chrome Files]
 @BINPATH@/chrome/browser@JAREXT@
 @BINPATH@/chrome/browser.manifest
-+@BINPATH@/chrome/pdfjs/*
-+@BINPATH@/chrome/pdfjs.manifest
+@BINPATH@/chrome/pdfjs.manifest
+@BINPATH@/chrome/pdfjs/*
 @BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
 @BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
 #ifdef SHIP_FEEDBACK

browser/makefiles.sh

@@ -47,6 +47,7 @@ browser/devtools/styleeditor/Makefile
 browser/devtools/styleinspector/Makefile
 browser/devtools/tilt/Makefile
 browser/devtools/webconsole/Makefile
+browser/extensions/Makefile
 browser/fuel/Makefile
 browser/fuel/public/Makefile
 browser/fuel/src/Makefile

js/src/config/nsinstall.py

@@ -34,6 +34,8 @@ def nsinstall(argv):
                help="Create link (ignored)")
   p.add_option('-L', action="store", metavar="linkprefix",
                help="Link prefix (ignored)")
+  p.add_option('-X', action="append", metavar="file",
+               help="Ignore a file when installing a directory recursively.")
 
   # The remaining arguments are not used in our tree, thus they're not
   # implented.
@@ -75,12 +77,18 @@ def nsinstall(argv):
       os.makedirs(args[0])
     return 0
 
+  if options.X:
+    options.X = [os.path.abspath(p) for p in options.X]
+
   # nsinstall arg1 [...] directory
   if len(args) < 2:
     p.error('not enough arguments')
 
   def copy_all_entries(entries, target):
     for e in entries:
+      if options.X and os.path.abspath(e) in options.X:
+        continue
+
       dest = os.path.join(target,
                           os.path.basename(os.path.normpath(e)))
       handleTarget(e, dest)