Bug 772828 - Part b: use RESOURCE_FILES in moz.build instead of manua…

…l rules in Makefile.in; r=mshal
Brli · Nov 5, 2013 · 999f24a · 999f24a
1 parent 125fc22
commit 999f24a
Show file tree

Hide file tree

Showing 30 changed files with 153 additions and 203 deletions.
diff --git a/content/xml/content/src/Makefile.in b/content/xml/content/src/Makefile.in
diff --git a/content/xml/content/src/moz.build b/content/xml/content/src/moz.build
@@ -27,3 +27,6 @@ LOCAL_INCLUDES += [
     '/content/base/src',
 ]
 
+RESOURCE_FILES.dtd += [
+    'htmlmathml-f.ent',
+]
diff --git a/editor/composer/src/Makefile.in b/editor/composer/src/Makefile.in
diff --git a/editor/composer/src/moz.build b/editor/composer/src/moz.build
@@ -18,3 +18,25 @@ UNIFIED_SOURCES += [
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'xul'
+RESOURCE_FILES += [
+    'res/EditorOverride.css',
+    'res/grabber.gif',
+    'res/table-add-column-after-active.gif',
+    'res/table-add-column-after-hover.gif',
+    'res/table-add-column-after.gif',
+    'res/table-add-column-before-active.gif',
+    'res/table-add-column-before-hover.gif',
+    'res/table-add-column-before.gif',
+    'res/table-add-row-after-active.gif',
+    'res/table-add-row-after-hover.gif',
+    'res/table-add-row-after.gif',
+    'res/table-add-row-before-active.gif',
+    'res/table-add-row-before-hover.gif',
+    'res/table-add-row-before.gif',
+    'res/table-remove-column-active.gif',
+    'res/table-remove-column-hover.gif',
+    'res/table-remove-column.gif',
+    'res/table-remove-row-active.gif',
+    'res/table-remove-row-hover.gif',
+    'res/table-remove-row.gif',
+]
diff --git a/intl/locale/src/Makefile.in b/intl/locale/src/Makefile.in
@@ -7,16 +7,8 @@ ifeq ($(MOZ_WIDGET_TOOLKIT), qt)
 OS_INCLUDES	+= $(MOZ_QT_CFLAGS)
 endif
 
-EXPORT_RESOURCE = \
-		$(srcdir)/langGroups.properties \
-		$(srcdir)/language.properties \
-		$(NULL)
-
-
 include $(topsrcdir)/config/rules.mk
 
 charsetalias.properties.h: props2arrays.py charsetalias.properties
 	$(PYTHON) $^ $@
 
-libs::
-	$(INSTALL) $(EXPORT_RESOURCE) $(DIST)/bin/res
diff --git a/intl/locale/src/moz.build b/intl/locale/src/moz.build
@@ -42,3 +42,8 @@ GENERATED_FILES = [
 LOCAL_INCLUDES += [
     '/intl/uconv/src',
 ]
+
+RESOURCE_FILES += [
+    'langGroups.properties',
+    'language.properties',
+]
diff --git a/intl/unicharutil/tables/Makefile.in b/intl/unicharutil/tables/Makefile.in
@@ -5,19 +5,7 @@
 
 include $(topsrcdir)/config/rules.mk
 
-_PROP_TABLES = \
-	htmlEntityVersions.properties \
-	html40Latin1.properties \
-	html40Symbols.properties \
-	html40Special.properties \
-	transliterate.properties \
-	mathml20.properties \
-	$(NULL)
-
 ifeq ($(MOZ_WIDGET_TOOLKIT), qt)
 CFLAGS          += $(MOZ_QT_CFLAGS)
 CXXFLAGS        += $(MOZ_QT_CFLAGS)
 endif
-
-libs:: $(_PROP_TABLES)
-	$(INSTALL) $^ $(DIST)/bin/res/entityTables
diff --git a/intl/unicharutil/tables/moz.build b/intl/unicharutil/tables/moz.build
@@ -4,3 +4,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/.
 
+RESOURCE_FILES.entityTables = [
+    'htmlEntityVersions.properties',
+    'html40Latin1.properties',
+    'html40Symbols.properties',
+    'html40Special.properties',
+    'mathml20.properties',
+    'transliterate.properties',
+]
diff --git a/layout/generic/Makefile.in b/layout/generic/Makefile.in
@@ -2,10 +2,6 @@
 # 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/.
 
-RESOURCES_HTML = \
-		$(srcdir)/folder.png \
-		$(NULL)
-
 include $(topsrcdir)/config/rules.mk
 
 CXXFLAGS += \
@@ -19,6 +15,3 @@ endif
 ifdef MOZ_ENABLE_QT
 CXXFLAGS += $(MOZ_QT_CFLAGS)
 endif
-
-libs::
-	$(INSTALL) $(RESOURCES_HTML) $(DIST)/bin/res/html
diff --git a/layout/generic/moz.build b/layout/generic/moz.build
@@ -127,3 +127,7 @@ LOCAL_INCLUDES += [
 ]
 
 JAR_MANIFESTS += ['jar.mn']
+
+RESOURCE_FILES.html = [
+    'folder.png',
+]
diff --git a/layout/mathml/Makefile.in b/layout/mathml/Makefile.in
diff --git a/layout/mathml/moz.build b/layout/mathml/moz.build
@@ -51,4 +51,22 @@ if CONFIG['ENABLE_TESTS']:
         'tests',
     ]
 
-JAR_MANIFESTS += ['jar.mn']
+JAR_MANIFESTS += ['jar.mn']
+
+RESOURCE_FILES.fonts += [
+    'mathfont.properties',
+    'mathfontAsanaMath.properties',
+    'mathfontMathJax_Main.properties',
+    'mathfontStandardSymbolsL.properties',
+    'mathfontSTIXNonUnicode.properties',
+    'mathfontSTIXSize1.properties',
+    'mathfontSTIXSizeOneSym.properties',
+    'mathfontUnicode.properties',
+]
+
+RESOURCE_FILES.fonts['mathfont.properties'].preprocess = True
+
+if CONFIG['TARGET_MD_ARCH'] == 'win32':
+    RESOURCE_FILES.fonts += [
+        'mathfontSymbol.properties',
+    ]
diff --git a/layout/style/Makefile.in b/layout/style/Makefile.in
@@ -17,18 +17,6 @@ include $(topsrcdir)/config/rules.mk
 nsStyleStructList.h : $(srcdir)/generate-stylestructlist.py
 	$(PYTHON) $< > $@
 
-_FILES	= \
-	contenteditable.css \
-	designmode.css \
-	ImageDocument.css \
-	TopLevelImageDocument.css \
-	TopLevelVideoDocument.css \
-	$(NULL)
-
 GARBAGE	+= \
-	$(addprefix $(DIST)/bin/res/,$(_FILES)) \
 	nsStyleStructList.h \
 	$(NULL)
-
-libs:: $(_FILES)
-	$(INSTALL) $^ $(DIST)/bin/res
diff --git a/layout/style/moz.build b/layout/style/moz.build
@@ -156,3 +156,11 @@ LOCAL_INCLUDES += [
 ]
 
 JAR_MANIFESTS += ['jar.mn']
+
+RESOURCE_FILES += [
+    'contenteditable.css',
+    'designmode.css',
+    'ImageDocument.css',
+    'TopLevelImageDocument.css',
+    'TopLevelVideoDocument.css',
+]
diff --git a/layout/svg/Makefile.in b/layout/svg/Makefile.in
@@ -1,9 +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/.
-
-include $(topsrcdir)/config/rules.mk
-
-libs::
-	$(INSTALL) $(srcdir)/svg.css $(DIST)/bin/res

diff --git a/layout/svg/moz.build b/layout/svg/moz.build
@@ -58,3 +58,7 @@ LOCAL_INCLUDES += [
     '../xul',
 ]
 
+RESOURCE_FILES += [
+    'svg.css',
+]
+
diff --git a/mobile/android/fonts/Makefile.in b/mobile/android/fonts/Makefile.in
@@ -2,25 +2,5 @@
 # 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/.
 
-packaged_fonts =  \
-	CharisSILCompact-R.ttf \
-	CharisSILCompact-B.ttf \
-	CharisSILCompact-I.ttf \
-	CharisSILCompact-BI.ttf \
-	ClearSans-Thin.ttf \
-	ClearSans-Light.ttf \
-	ClearSans-Regular.ttf \
-	ClearSans-Medium.ttf \
-	ClearSans-Bold.ttf \
-	ClearSans-Italic.ttf \
-	ClearSans-MediumItalic.ttf \
-	ClearSans-BoldItalic.ttf \
-	$(NULL)
-
-GARBAGE += $(packaged_fonts)
-
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/testing/testsuite-targets.mk
-
-libs:: $(packaged_fonts)
-	$(INSTALL) $^ $(DIST)/bin/res/fonts/
diff --git a/mobile/android/fonts/moz.build b/mobile/android/fonts/moz.build
@@ -4,3 +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/.
 
+RESOURCE_FILES.fonts += [
+    'CharisSILCompact-B.ttf',
+    'CharisSILCompact-BI.ttf',
+    'CharisSILCompact-I.ttf',
+    'CharisSILCompact-R.ttf',
+    'ClearSans-Bold.ttf',
+    'ClearSans-BoldItalic.ttf',
+    'ClearSans-Italic.ttf',
+    'ClearSans-Light.ttf',
+    'ClearSans-Medium.ttf',
+    'ClearSans-MediumItalic.ttf',
+    'ClearSans-Regular.ttf',
+    'ClearSans-Thin.ttf',
+]
diff --git a/netwerk/test/Makefile.in b/netwerk/test/Makefile.in
@@ -17,12 +17,6 @@ include $(topsrcdir)/config/rules.mk
 check::
 	$(RUN_TEST_PROGRAM) $(DIST)/bin/TestCookie$(BIN_SUFFIX)
 
-_RES_FILES 	= urlparse.dat \
-		  urlparse_unx.dat \
-		  $(NULL)
-libs:: $(_RES_FILES)
-	$(INSTALL) $^ $(DIST)/bin/res
-
 # One of the xpcshell unit tests needs this file, so make sure it winds
 #  up in the test directory.
 libs::

diff --git a/netwerk/test/moz.build b/netwerk/test/moz.build
@@ -56,3 +56,7 @@ CPP_UNIT_TESTS += [
     'TestUDPSocket.cpp',
 ]
 
+RESOURCE_FILES += [
+    'urlparse.dat',
+    'urlparse_unx.dat',
+]
diff --git a/rdf/tests/dsds/Makefile.in b/rdf/tests/dsds/Makefile.in
@@ -5,22 +5,8 @@
 
 MOZILLA_INTERNAL_API = 1
 
-SAMPLES_DIR	= $(DIST)/bin/res/samples/rdf
-
-RESOURCE_SAMPLES = \
-		DataSourceViewer.xul \
-		DataSourceViewer.css \
-		$(NULL)
-
 EXTRA_DSO_LDOPTS = \
 		-L$(DIST)/bin \
 		$(XPCOM_LIBS) \
 		$(NSPR_LIBS) \
 		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
-
-GARBAGE		+= $(addprefix $(SAMPLES_DIR)/, $(RESOURCE_SAMPLES))
-
-libs::
-	$(INSTALL) $(addprefix $(srcdir)/,$(RESOURCE_SAMPLES)) $(SAMPLES_DIR)
diff --git a/rdf/tests/dsds/moz.build b/rdf/tests/dsds/moz.build
@@ -13,3 +13,7 @@ LIBRARY_NAME = 'rdfdsds'
 
 IS_COMPONENT = True
 
+RESOURCE_FILES.samples.rdf += [
+    'DataSourceViewer.xul',
+    'DataSourceViewer.css',
+]
diff --git a/tools/trace-malloc/Makefile.in b/tools/trace-malloc/Makefile.in
@@ -60,6 +60,3 @@ include $(topsrcdir)/config/rules.mk
 # install rules.txt along with spacetrace executable
 libs:: rules.txt
 	$(INSTALL) $< $(DIST)/bin
-
-libs:: spacetrace.css
-	$(INSTALL) $< $(DIST)/bin/res
diff --git a/tools/trace-malloc/moz.build b/tools/trace-malloc/moz.build
@@ -39,3 +39,7 @@ SOURCES += [
 ]
 
 SIMPLE_PROGRAMS += simple_cpp_sources
+
+RESOURCE_FILES += [
+    'spacetrace.css'
+]