Bug 740795 part A - file moves for pdf.js not being shipped as an extension, r=bsmedberg
authorDave Townsend <dtownsend@oxymoronical.com>
Fri, 18 May 2012 12:42:01 -0400
changeset 94395 6eb40a0f8e4cc3f8092e36f5e29645ad2851468a
parent 94394 be715fe9c9164e5c4b519f567d6a96aa6127cfa7
child 94396 7bbd1cc126f3141bdd1c771a4590187f69c5bb79
push id22712
push userryanvm@gmail.com
push dateSat, 19 May 2012 00:52:01 +0000
treeherdermozilla-central@642d1a36702f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbsmedberg
bugs740795
milestone15.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 740795 part A - file moves for pdf.js not being shipped as an extension, r=bsmedberg
browser/app/profile/extensions/Makefile.in
browser/app/profile/extensions/uriloader@pdf.js/LICENSE
browser/app/profile/extensions/uriloader@pdf.js/Makefile.in
browser/app/profile/extensions/uriloader@pdf.js/README.mozilla
browser/app/profile/extensions/uriloader@pdf.js/bootstrap.js
browser/app/profile/extensions/uriloader@pdf.js/components/PdfStreamConverter.js
browser/app/profile/extensions/uriloader@pdf.js/content/web/debugger.js
browser/app/profile/extensions/uriloader@pdf.js/content/web/images/bookmark.svg
browser/app/profile/extensions/uriloader@pdf.js/content/web/images/check.svg
browser/app/profile/extensions/uriloader@pdf.js/content/web/images/comment.svg
browser/app/profile/extensions/uriloader@pdf.js/content/web/images/document-print.svg
browser/app/profile/extensions/uriloader@pdf.js/content/web/images/download.svg
browser/app/profile/extensions/uriloader@pdf.js/content/web/images/go-down.svg
browser/app/profile/extensions/uriloader@pdf.js/content/web/images/go-up.svg
browser/app/profile/extensions/uriloader@pdf.js/content/web/images/loading-icon.gif
browser/app/profile/extensions/uriloader@pdf.js/content/web/images/nav-outline.svg
browser/app/profile/extensions/uriloader@pdf.js/content/web/images/nav-thumbs.svg
browser/app/profile/extensions/uriloader@pdf.js/content/web/images/pin-down.svg
browser/app/profile/extensions/uriloader@pdf.js/content/web/images/pin-up.svg
browser/app/profile/extensions/uriloader@pdf.js/content/web/images/zoom-in.svg
browser/app/profile/extensions/uriloader@pdf.js/content/web/images/zoom-out.svg
browser/app/profile/extensions/uriloader@pdf.js/content/web/viewer-snippet-firefox-extension.html
browser/app/profile/extensions/uriloader@pdf.js/content/web/viewer.css
browser/app/profile/extensions/uriloader@pdf.js/content/web/viewer.html
browser/app/profile/extensions/uriloader@pdf.js/content/web/viewer.js
browser/app/profile/extensions/uriloader@pdf.js/extension-files
browser/app/profile/extensions/uriloader@pdf.js/icon.png
browser/app/profile/extensions/uriloader@pdf.js/icon64.png
browser/app/profile/extensions/uriloader@pdf.js/install.rdf.in
browser/app/profile/extensions/uriloader@pdf.js/test/Makefile.in
browser/app/profile/extensions/uriloader@pdf.js/test/browser_pdfjs_main.js
browser/app/profile/extensions/uriloader@pdf.js/test/file_pdfjs_test.pdf
browser/extensions/pdfjs/LICENSE
browser/extensions/pdfjs/README.mozilla
browser/extensions/pdfjs/bootstrap.js
browser/extensions/pdfjs/chrome.manifest
browser/extensions/pdfjs/components/PdfStreamConverter.js
browser/extensions/pdfjs/content/web/debugger.js
browser/extensions/pdfjs/content/web/images/bookmark.svg
browser/extensions/pdfjs/content/web/images/check.svg
browser/extensions/pdfjs/content/web/images/comment.svg
browser/extensions/pdfjs/content/web/images/document-print.svg
browser/extensions/pdfjs/content/web/images/download.svg
browser/extensions/pdfjs/content/web/images/go-down.svg
browser/extensions/pdfjs/content/web/images/go-up.svg
browser/extensions/pdfjs/content/web/images/loading-icon.gif
browser/extensions/pdfjs/content/web/images/nav-outline.svg
browser/extensions/pdfjs/content/web/images/nav-thumbs.svg
browser/extensions/pdfjs/content/web/images/pin-down.svg
browser/extensions/pdfjs/content/web/images/pin-up.svg
browser/extensions/pdfjs/content/web/images/zoom-in.svg
browser/extensions/pdfjs/content/web/images/zoom-out.svg
browser/extensions/pdfjs/content/web/viewer-snippet-firefox-extension.html
browser/extensions/pdfjs/content/web/viewer.css
browser/extensions/pdfjs/content/web/viewer.html
browser/extensions/pdfjs/content/web/viewer.js
browser/extensions/pdfjs/extension-files
browser/extensions/pdfjs/icon.png
browser/extensions/pdfjs/icon64.png
browser/extensions/pdfjs/install.rdf.in
browser/extensions/pdfjs/test/Makefile.in
browser/extensions/pdfjs/test/browser_pdfjs_main.js
browser/extensions/pdfjs/test/file_pdfjs_test.pdf
browser/installer/package-manifest.in
--- a/browser/app/profile/extensions/Makefile.in
+++ b/browser/app/profile/extensions/Makefile.in
@@ -41,17 +41,16 @@ srcdir     = @srcdir@
 VPATH      = @srcdir@
 
 DISTROEXT = $(call core_abspath,$(DIST))/bin/distribution/extensions
 
 include $(DEPTH)/config/autoconf.mk
 
 DIRS = \
   {972ce4c6-7e08-4474-a285-3208198ce6fd} \
-  uriloader@pdf.js \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
 ifneq (,$(filter aurora beta,$(MOZ_UPDATE_CHANNEL)))
 EXTENSIONS = \
   testpilot@labs.mozilla.com \
   $(NULL)
deleted file mode 100644
--- a/browser/app/profile/extensions/uriloader@pdf.js/Makefile.in
+++ /dev/null
@@ -1,30 +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@
-
-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
rename from browser/app/profile/extensions/uriloader@pdf.js/LICENSE
rename to browser/extensions/pdfjs/LICENSE
rename from browser/app/profile/extensions/uriloader@pdf.js/README.mozilla
rename to browser/extensions/pdfjs/README.mozilla
rename from browser/app/profile/extensions/uriloader@pdf.js/bootstrap.js
rename to browser/extensions/pdfjs/bootstrap.js
new file mode 100644
--- /dev/null
+++ b/browser/extensions/pdfjs/chrome.manifest
@@ -0,0 +1,3 @@
+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}
rename from browser/app/profile/extensions/uriloader@pdf.js/components/PdfStreamConverter.js
rename to browser/extensions/pdfjs/components/PdfStreamConverter.js
rename from browser/app/profile/extensions/uriloader@pdf.js/content/web/debugger.js
rename to browser/extensions/pdfjs/content/web/debugger.js
rename from browser/app/profile/extensions/uriloader@pdf.js/content/web/images/bookmark.svg
rename to browser/extensions/pdfjs/content/web/images/bookmark.svg
rename from browser/app/profile/extensions/uriloader@pdf.js/content/web/images/check.svg
rename to browser/extensions/pdfjs/content/web/images/check.svg
rename from browser/app/profile/extensions/uriloader@pdf.js/content/web/images/comment.svg
rename to browser/extensions/pdfjs/content/web/images/comment.svg
rename from browser/app/profile/extensions/uriloader@pdf.js/content/web/images/document-print.svg
rename to browser/extensions/pdfjs/content/web/images/document-print.svg
rename from browser/app/profile/extensions/uriloader@pdf.js/content/web/images/download.svg
rename to browser/extensions/pdfjs/content/web/images/download.svg
rename from browser/app/profile/extensions/uriloader@pdf.js/content/web/images/go-down.svg
rename to browser/extensions/pdfjs/content/web/images/go-down.svg
rename from browser/app/profile/extensions/uriloader@pdf.js/content/web/images/go-up.svg
rename to browser/extensions/pdfjs/content/web/images/go-up.svg
rename from browser/app/profile/extensions/uriloader@pdf.js/content/web/images/loading-icon.gif
rename to browser/extensions/pdfjs/content/web/images/loading-icon.gif
rename from browser/app/profile/extensions/uriloader@pdf.js/content/web/images/nav-outline.svg
rename to browser/extensions/pdfjs/content/web/images/nav-outline.svg
rename from browser/app/profile/extensions/uriloader@pdf.js/content/web/images/nav-thumbs.svg
rename to browser/extensions/pdfjs/content/web/images/nav-thumbs.svg
rename from browser/app/profile/extensions/uriloader@pdf.js/content/web/images/pin-down.svg
rename to browser/extensions/pdfjs/content/web/images/pin-down.svg
rename from browser/app/profile/extensions/uriloader@pdf.js/content/web/images/pin-up.svg
rename to browser/extensions/pdfjs/content/web/images/pin-up.svg
rename from browser/app/profile/extensions/uriloader@pdf.js/content/web/images/zoom-in.svg
rename to browser/extensions/pdfjs/content/web/images/zoom-in.svg
rename from browser/app/profile/extensions/uriloader@pdf.js/content/web/images/zoom-out.svg
rename to browser/extensions/pdfjs/content/web/images/zoom-out.svg
rename from browser/app/profile/extensions/uriloader@pdf.js/content/web/viewer-snippet-firefox-extension.html
rename to browser/extensions/pdfjs/content/web/viewer-snippet-firefox-extension.html
rename from browser/app/profile/extensions/uriloader@pdf.js/content/web/viewer.css
rename to browser/extensions/pdfjs/content/web/viewer.css
rename from browser/app/profile/extensions/uriloader@pdf.js/content/web/viewer.html
rename to browser/extensions/pdfjs/content/web/viewer.html
rename from browser/app/profile/extensions/uriloader@pdf.js/content/web/viewer.js
rename to browser/extensions/pdfjs/content/web/viewer.js
rename from browser/app/profile/extensions/uriloader@pdf.js/extension-files
rename to browser/extensions/pdfjs/extension-files
rename from browser/app/profile/extensions/uriloader@pdf.js/icon.png
rename to browser/extensions/pdfjs/icon.png
rename from browser/app/profile/extensions/uriloader@pdf.js/icon64.png
rename to browser/extensions/pdfjs/icon64.png
rename from browser/app/profile/extensions/uriloader@pdf.js/install.rdf.in
rename to browser/extensions/pdfjs/install.rdf.in
rename from browser/app/profile/extensions/uriloader@pdf.js/test/Makefile.in
rename to browser/extensions/pdfjs/test/Makefile.in
--- a/browser/app/profile/extensions/uriloader@pdf.js/test/Makefile.in
+++ b/browser/extensions/pdfjs/test/Makefile.in
@@ -1,17 +1,17 @@
 # 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     = ../../../../../..
+DEPTH     = ../../../..
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
-relativesrcdir  = browser/app/profile/extensions/uriloader@pdf.js/test
+relativesrcdir  = browser/features/pdfjs/test
 
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
 
 _BROWSER_TEST_FILES = \
   browser_pdfjs_main.js \
   file_pdfjs_test.pdf \
   $(NULL)
rename from browser/app/profile/extensions/uriloader@pdf.js/test/browser_pdfjs_main.js
rename to browser/extensions/pdfjs/test/browser_pdfjs_main.js
--- a/browser/app/profile/extensions/uriloader@pdf.js/test/browser_pdfjs_main.js
+++ b/browser/extensions/pdfjs/test/browser_pdfjs_main.js
@@ -1,31 +1,18 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
-const RELATIVE_DIR = "browser/app/profile/extensions/uriloader@pdf.js/test/";
+const RELATIVE_DIR = "browser/features/pdfjs/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() {
     newTabBrowser.removeEventListener("load", onLoad, true);
 
     var hasViewer = newTabBrowser.contentDocument.querySelector('div#viewer');
     var hasPDFJS = 'PDFJS' in newTabBrowser.contentWindow.wrappedJSObject;
 
rename from browser/app/profile/extensions/uriloader@pdf.js/test/file_pdfjs_test.pdf
rename to browser/extensions/pdfjs/test/file_pdfjs_test.pdf
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -471,19 +471,20 @@
 @BINPATH@/libGLESv2.dll
 @BINPATH@/@MOZ_D3DX9_DLL@
 @BINPATH@/@MOZ_D3DCOMPILER_DLL@
 #endif
 
 ; [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
 @BINPATH@/chrome/toolkit@JAREXT@
 @BINPATH@/chrome/toolkit.manifest
 #ifdef MOZ_GTK2
 @BINPATH@/chrome/icons/default/default16.png
 @BINPATH@/chrome/icons/default/default32.png