Back out bug 740795 because of bustages (check-sync-dirs at least)

browser/Makefile.in

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

browser/app/profile/extensions/Makefile.in

@@ -46,6 +46,7 @@ include $(DEPTH)/config/autoconf.mk
 
 DIRS = \
   {972ce4c6-7e08-4474-a285-3208198ce6fd} \
+  uriloader@pdf.js \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk

browser/app/profile/extensions/uriloader@pdf.js/Makefile.in

@@ -0,0 +1,30 @@
+# 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@
+
+APPEXT = $(call core_abspath,$(DIST))/bin/extensions
+
+TEST_DIRS += test
+
+include $(DEPTH)/config/autoconf.mk
+include $(topsrcdir)/config/rules.mk
+
+# Using the extension-files as an extension files whitelist to avoid noise
+# in the xpi file such as MOZILLA.readme, install.pdf.in and this make file.
+FILES := $(shell cat $(srcdir)/extension-files)
+
+libs::
+	$(PYTHON) $(MOZILLA_DIR)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) $(srcdir)/install.rdf.in > install.rdf
+	$(ZIP) -9X $(APPEXT)/uriloader@pdf.js.xpi install.rdf
+	cd $(call core_abspath,$(srcdir)) && \
+	$(ZIP) -9X $(APPEXT)/uriloader@pdf.js.xpi $(FILES)
+
+install::
+	$(SYSINSTALL) $(IFLAGS1) $(APPEXT)/uriloader@pdf.js.xpi $(DESTDIR)$(mozappdir)/extensions
+
+GARBAGE += install.rdf

browser/app/profile/extensions/uriloader@pdf.js/test/Makefile.in

@@ -2,11 +2,11 @@
 # 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     = ../../../..
+DEPTH     = ../../../../../..
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
-relativesrcdir  = browser/features/pdfjs/test
+relativesrcdir  = browser/app/profile/extensions/uriloader@pdf.js/test
 
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk

browser/app/profile/extensions/uriloader@pdf.js/test/browser_pdfjs_main.js

@@ -2,12 +2,25 @@
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
-const RELATIVE_DIR = "browser/features/pdfjs/test/";
+const RELATIVE_DIR = "browser/app/profile/extensions/uriloader@pdf.js/test/";
 const TESTROOT = "http://example.com/browser/" + RELATIVE_DIR;
 
 function test() {
   waitForExplicitFinish();
 
+  AddonManager.getAddonByID("uriloader@pdf.js", function(aAddon) {
+    is(aAddon.userDisabled, true, 'Pdf.js addon must be disabled by default');
+    aAddon.userDisabled = false;
+
+    registerCleanupFunction(function() {
+      aAddon.userDisabled = true;
+    });
+
+    continueTest();
+  });
+}
+
+function continueTest() {
   var tab = gBrowser.addTab(TESTROOT + "file_pdfjs_test.pdf");
   var newTabBrowser = gBrowser.getBrowserForTab(tab);
   newTabBrowser.addEventListener("load", function onLoad() {

browser/extensions/Makefile.in

@@ -1,32 +0,0 @@
-# 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)
-
-libs::
-	$(PYTHON) $(topsrcdir)/config/nsinstall.py \
-	  $(srcdir)/pdfjs \
-          $(foreach exclude,$(exclude_files), -X $(srcdir)/pdfjs/$(exclude)) \
-          $(DIST)/bin/chrome/pdfjs
-	$(PYTHON) $(MOZILLA_DIR)/config/buildlist.py \
-	  $(DIST)/bin/chrome.manifest "manifest chrome/pdfjs/chrome.manifest"

browser/extensions/pdfjs/chrome.manifest

@@ -1,3 +0,0 @@
-resource pdf.js content/
-component {6457a96b-2d68-439a-bcfa-44465fbcdbb1} components/PdfStreamConverter.js
-contract @mozilla.org/streamconv;1?from=application/pdf&to=*/* {6457a96b-2d68-439a-bcfa-44465fbcdbb1}

browser/installer/package-manifest.in

@@ -476,10 +476,9 @@
 ; [Browser Chrome Files]
 @BINPATH@/chrome/browser@JAREXT@
 @BINPATH@/chrome/browser.manifest
-+@BINPATH@/chrome/pdfjs/*
-+@BINPATH@/chrome/pdfjs.manifest
 @BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
 @BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
+@BINPATH@/extensions/uriloader@pdf.js.xpi
 #ifdef SHIP_FEEDBACK
 @BINPATH@/distribution/extensions/testpilot@labs.mozilla.com.xpi
 #endif

browser/makefiles.sh

@@ -80,7 +80,6 @@ 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

config/nsinstall.py

@@ -67,8 +67,6 @@ 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.
@@ -110,18 +108,12 @@ 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)

config/tests/unit-nsinstall.py

@@ -47,25 +47,11 @@ class TestNsinstall(unittest.TestCase):
         "Test nsinstall <dir> <dest dir>"
         sourcedir = self.mkdirs("sourcedir")
         self.touch("testfile", sourcedir)
-        Xfile = self.touch("Xfile", sourcedir)
-        copieddir = self.mkdirs("sourcedir/copieddir")
-        self.touch("testfile2", copieddir)
-        Xdir = self.mkdirs("sourcedir/Xdir")
-        self.touch("testfile3", Xdir)
-
         destdir = self.mkdirs("destdir")
-
-        self.assertEqual(nsinstall([sourcedir, destdir,
-                                    '-X', Xfile,
-                                    '-X', Xdir]), 0)
-
+        self.assertEqual(nsinstall([sourcedir, destdir]), 0)
         testdir = os.path.join(destdir, "sourcedir")
         self.assert_(os.path.isdir(testdir))
         self.assert_(os.path.isfile(os.path.join(testdir, "testfile")))
-        self.assert_(not os.path.exists(os.path.join(testdir, "Xfile")))
-        self.assert_(os.path.isdir(os.path.join(testdir, "copieddir")))
-        self.assert_(os.path.isfile(os.path.join(testdir, "copieddir", "testfile2")))
-        self.assert_(not os.path.exists(os.path.join(testdir, "Xdir")))
 
     def test_nsinstall_multiple(self):
         "Test nsinstall <three files> <dest dir>"