Bug 1163442 - Use FINAL_TARGET_FILES and PP_TARGETS for SeaMonkey themes r=neil a=ratty for a CLOSED TREE
authorIan Neal <iann_cvs@blueyonder.co.uk>
Tue, 23 Jun 2015 12:56:38 +0100
changeset 22802 1fafcee93411a4bc9ef99eda31887bf5809887c7
parent 22801 9a0db622167bec9b8c3ec8709cd99ddcc9eaa56c
child 22803 33c0832f86e06bcb95b626f06e1cd12f6029db15
push id1443
push usermbanner@mozilla.com
push dateMon, 10 Aug 2015 18:31:17 +0000
treeherdercomm-beta@8fe07d686c22 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersneil, ratty
bugs1163442
Bug 1163442 - Use FINAL_TARGET_FILES and PP_TARGETS for SeaMonkey themes r=neil a=ratty for a CLOSED TREE
suite/themes/classic/Makefile.in
suite/themes/classic/moz.build
suite/themes/modern/Makefile.in
suite/themes/modern/moz.build
--- a/suite/themes/classic/Makefile.in
+++ b/suite/themes/classic/Makefile.in
@@ -1,24 +1,9 @@
 # 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@
-
-include $(DEPTH)/config/autoconf.mk
-
-include $(topsrcdir)/config/rules.mk
-
 CLASSIC_EXTENSION_DIR = {972ce4c6-7e08-4474-a285-3208198ce6fd}
 
-FILES = \
-	$(srcdir)/chrome.manifest \
-	$(srcdir)/icon.png \
-	$(srcdir)/preview.png \
-	$(NULL)
-
-libs::
-	$(INSTALL) $(FILES) $(DIST)/bin/extensions/$(CLASSIC_EXTENSION_DIR)
-	$(call py_action,preprocessor,$(DEFINES) $(ACDEFINES) $(srcdir)/install.rdf -o $(DIST)/bin/extensions/$(CLASSIC_EXTENSION_DIR)/install.rdf)
+INSTALL_RDF = install.rdf
+INSTALL_RDF_PATH = $(FINAL_TARGET)/extensions/$(CLASSIC_EXTENSION_DIR)
+PP_TARGETS += INSTALL_RDF
--- a/suite/themes/classic/moz.build
+++ b/suite/themes/classic/moz.build
@@ -1,8 +1,16 @@
 # vim: set filetype=python:
 # 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/.
 
 JAR_MANIFESTS += ['jar.mn']
 
+classic_extension_dir = '{972ce4c6-7e08-4474-a285-3208198ce6fd}'
+
 DEFINES['SEAMONKEY_VERSION'] = CONFIG['SEAMONKEY_VERSION']
+
+FINAL_TARGET_FILES.extensions[classic_extension_dir] += [
+    'chrome.manifest',
+    'icon.png',
+    'preview.png',
+]
deleted file mode 100644
--- a/suite/themes/modern/Makefile.in
+++ /dev/null
@@ -1,21 +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		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(topsrcdir)/config/config.mk
-
-FILES = \
-	$(srcdir)/preview.png \
-	$(srcdir)/icon.png \
-	$(NULL)
-
-libs::
-	$(INSTALL) $(FILES) $(FINAL_TARGET)
-
-include $(topsrcdir)/config/rules.mk
--- a/suite/themes/modern/moz.build
+++ b/suite/themes/modern/moz.build
@@ -7,8 +7,13 @@ DIST_FILES += ['install.rdf']
 
 DIST_SUBDIR = 'extensions/modern@themes.mozilla.org'
 
 JAR_MANIFESTS += ['jar.mn']
 
 USE_EXTENSION_MANIFEST = True
 
 DEFINES['SEAMONKEY_VERSION'] = CONFIG['SEAMONKEY_VERSION']
+
+FINAL_TARGET_FILES += [
+    'icon.png',
+    'preview.png',
+]