Bug 1265202 - Back out changeset ef98cb11ba62 from bug 12506160 which used a signed XPI.
authorMatthew Noorenberghe <mozilla@noorenberghe.ca>
Mon, 18 Apr 2016 14:21:11 -0700
changeset 331508 22d11eca4d25260d79711a56f6bca102d61fbca7
parent 331505 fae9c42677310d5dbe380e6e70efff2d46a99cc5
child 331509 dadd3d52a252edd85975ff73ac404325d28598b2
push id6048
push userkmoir@mozilla.com
push dateMon, 06 Jun 2016 19:02:08 +0000
treeherdermozilla-beta@46d72a56c57d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1265202, 12506160
milestone48.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 1265202 - Back out changeset ef98cb11ba62 from bug 12506160 which used a signed XPI. MozReview-Commit-ID: 1xvljv37AKM
browser/tools/mozscreenshots/mozscreenshots/extension/Makefile.in
browser/tools/mozscreenshots/mozscreenshots/extension/install.rdf
browser/tools/mozscreenshots/mozscreenshots/extension/moz.build
browser/tools/mozscreenshots/mozscreenshots/extension/mozscreenshots-signed.xpi
new file mode 100644
--- /dev/null
+++ b/browser/tools/mozscreenshots/mozscreenshots/extension/Makefile.in
@@ -0,0 +1,12 @@
+# 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/.
+
+TEST_EXTENSIONS_DIR = $(DEPTH)/_tests/testing/mochitest/extensions
+GENERATED_DIRS =  $(TEST_EXTENSIONS_DIR)
+XPI_PKGNAME = mozscreenshots@mozilla.org
+
+include $(topsrcdir)/config/rules.mk
+
+libs::
+	(cd $(DIST)/xpi-stage && tar $(TAR_CREATE_FLAGS) - $(XPI_NAME)) | (cd $(TEST_EXTENSIONS_DIR) && tar -xf -)
--- a/browser/tools/mozscreenshots/mozscreenshots/extension/install.rdf
+++ b/browser/tools/mozscreenshots/mozscreenshots/extension/install.rdf
@@ -4,17 +4,17 @@
    - 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/. -->
 
 <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>mozscreenshots@mozilla.org</em:id>
-    <em:version>0.3.2</em:version>
+#expand <em:version>__MOZILLA_VERSION_U__</em:version>
     <em:bootstrap>true</em:bootstrap>
 
     <!-- for running custom screenshot binaries -->
     <em:unpack>true</em:unpack>
 
     <!-- Front End MetaData -->
     <em:name>mozscreenshots</em:name>
     <em:description>Take screenshots of Mozilla applications in various UI configurations.</em:description>
--- a/browser/tools/mozscreenshots/mozscreenshots/extension/moz.build
+++ b/browser/tools/mozscreenshots/mozscreenshots/extension/moz.build
@@ -10,12 +10,8 @@ JAR_MANIFESTS += ['jar.mn']
 
 USE_EXTENSION_MANIFEST = True
 NO_JS_MANIFEST = True
 
 FINAL_TARGET_PP_FILES += [
     'bootstrap.js',
     'install.rdf',
 ]
-
-TEST_HARNESS_FILES.testing.mochitest.extensions += [
-    'mozscreenshots-signed.xpi',
-]
deleted file mode 100644
index af47dca31ea885380144d612e86b7cc6fbf5da2d..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001