Bug 941450 - Add some GENERATED_FILES to moz.build. r=gps

This commit is contained in:
Mike Hommey 2013-11-22 08:16:18 +09:00
parent 5bab729026
commit 210fcbefa5
30 changed files with 73 additions and 68 deletions

View File

@ -1712,3 +1712,7 @@ include $(topsrcdir)/config/makefiles/autotargets.mk
ifneq ($(NULL),$(AUTO_DEPS))
default all libs tools export:: $(AUTO_DEPS)
endif
export:: $(GENERATED_FILES)
GARBAGE += $(GENERATED_FILES)

View File

@ -4,16 +4,8 @@
include $(topsrcdir)/config/rules.mk
EncodingUtils.$(OBJ_SUFFIX): labelsencodings.properties.h
FallbackEncoding.$(OBJ_SUFFIX): localesfallbacks.properties.h
PROPS2ARRAYS = $(topsrcdir)/intl/locale/src/props2arrays.py
labelsencodings.properties.h: $(PROPS2ARRAYS) labelsencodings.properties
$(PYTHON) $^ $@
localesfallbacks.properties.h: $(PROPS2ARRAYS) localesfallbacks.properties
$(PYTHON) $^ $@
GARBAGE += \
labelsencodings.properties.h \
localesfallbacks.properties.h \
$(NULL)

View File

@ -30,3 +30,7 @@ LOCAL_INCLUDES += [
'/intl/locale/src',
]
GENERATED_FILES += [
'labelsencodings.properties.h',
'localesfallbacks.properties.h',
]

View File

@ -79,5 +79,3 @@ endif
PremultiplyTables.h: $(srcdir)/genTables.py
$(PYTHON) $(srcdir)/genTables.py
gfxUtils.$(OBJ_SUFFIX): PremultiplyTables.h

View File

@ -279,3 +279,7 @@ LIBRARY_NAME = 'thebes'
include('/ipc/chromium/chromium-config.mozbuild')
FINAL_LIBRARY = 'xul'
GENERATED_FILES = [
'PremultiplyTables.h',
]

View File

@ -19,14 +19,8 @@ LOCAL_INCLUDES = \
include $(topsrcdir)/config/rules.mk
nsCharsetAlias.$(OBJ_SUFFIX): charsetalias.properties.h
charsetalias.properties.h: props2arrays.py charsetalias.properties
$(PYTHON) $^ $@
GARBAGE += \
charsetalias.properties.h \
$(NULL)
libs::
$(INSTALL) $(EXPORT_RESOURCE) $(DIST)/bin/res

View File

@ -34,3 +34,7 @@ EXTRA_JS_MODULES += [
MSVC_ENABLE_PGO = True
FINAL_LIBRARY = 'i18n'
GENERATED_FILES = [
'charsetalias.properties.h',
]

View File

@ -7,11 +7,5 @@ include $(topsrcdir)/config/rules.mk
INCLUDES += -I$(srcdir)/..
nsOS2Charset.$(OBJ_SUFFIX): os2charset.properties.h
os2charset.properties.h: $(srcdir)/../props2arrays.py os2charset.properties
$(PYTHON) $^ $@
GARBAGE += \
os2charset.properties.h \
$(NULL)

View File

@ -12,3 +12,7 @@ SOURCES += [
]
FINAL_LIBRARY = 'i18n'
GENERATED_FILES = [
'os2charset.properties.h',
]

View File

@ -16,11 +16,5 @@ endif
DEFINES += -DOSTYPE=\"$(OS_CONFIG)\"
nsUNIXCharset.$(OBJ_SUFFIX): unixcharset.properties.h
unixcharset.properties.h: $(srcdir)/../props2arrays.py unixcharset.properties
$(PYTHON) $^ $@
GARBAGE += \
unixcharset.properties.h \
$(NULL)

View File

@ -20,3 +20,7 @@ else:
]
FINAL_LIBRARY = 'i18n'
GENERATED_FILES = [
'unixcharset.properties.h',
]

View File

@ -7,11 +7,5 @@ include $(topsrcdir)/config/rules.mk
INCLUDES += -I$(srcdir)/..
nsWinCharset.$(OBJ_SUFFIX): wincharset.properties.h
wincharset.properties.h: $(srcdir)/../props2arrays.py wincharset.properties
$(PYTHON) $^ $@
GARBAGE += \
wincharset.properties.h \
$(NULL)

View File

@ -12,3 +12,7 @@ SOURCES += [
]
FINAL_LIBRARY = 'i18n'
GENERATED_FILES = [
'wincharset.properties.h',
]

View File

@ -606,8 +606,6 @@ ifdef MOZ_ETW
ETWProvider.h ETWProvider.rc ETWProvider.mof: ETWProvider.man
$(MC) -um -mof $^
Probes.$(OBJ_SUFFIX): ETWProvider.h
ETWProvider.res: ETWProvider.rc
$(RC) -r -i "$(SDKDIR)Include" $^

View File

@ -1712,3 +1712,7 @@ include $(topsrcdir)/config/makefiles/autotargets.mk
ifneq ($(NULL),$(AUTO_DEPS))
default all libs tools export:: $(AUTO_DEPS)
endif
export:: $(GENERATED_FILES)
GARBAGE += $(GENERATED_FILES)

View File

@ -384,3 +384,8 @@ if CONFIG['JS_SHARED_LIBRARY']:
FORCE_SHARED_LIB = True
FORCE_STATIC_LIB = True
if CONFIG['MOZ_ETW']:
GENERATED_FILES = [
'ETWProvider.h',
]

View File

@ -63,10 +63,6 @@ ifdef MOZ_JSDEBUGGER
DEFINES += -DMOZ_JSDEBUGGER
endif
nsXPConnect.$(OBJ_SUFFIX): dom_quickstubs.h
XPCJSRuntime.$(OBJ_SUFFIX): dom_quickstubs.h
dom_quickstubs.h: dom_quickstubs.cpp
dom_quickstubs.cpp: $(srcdir)/dom_quickstubs.qsconf \
@ -84,8 +80,6 @@ dom_quickstubs.cpp: $(srcdir)/dom_quickstubs.qsconf \
$(ENABLE_TRACEABLE_FLAGS) \
$(srcdir)/dom_quickstubs.qsconf
DictionaryHelpers.$(OBJ_SUFFIX): DictionaryHelpers.cpp
DictionaryHelpers.h: DictionaryHelpers.cpp
DictionaryHelpers.cpp: $(srcdir)/dictionary_helper_gen.conf \
@ -104,9 +98,6 @@ DictionaryHelpers.cpp: $(srcdir)/dictionary_helper_gen.conf \
$(srcdir)/dictionary_helper_gen.conf \
event_impl_gen.conf
GeneratedEvents.$(OBJ_SUFFIX): GeneratedEvents.h \
GeneratedEvents.cpp
event_impl_gen.conf : $(srcdir)/event_impl_gen.conf.in
$(call py_action,preprocessor,$(DEFINES) $(ACDEFINES) $^ -o event_impl_gen.conf)
@ -154,13 +145,6 @@ GeneratedEvents-webidl: event_impl_gen.conf
event_impl_gen.conf
GARBAGE += \
dom_quickstubs.h \
dom_quickstubs.cpp \
DictionaryHelpers.h \
DictionaryHelpers.cpp \
GeneratedEvents.h \
GeneratedEvents.cpp \
GeneratedEventClasses.h \
event_impl_gen.conf \
xpidl_debug \
$(MDDEPDIR)/dom_qsgen.pp \

View File

@ -63,3 +63,10 @@ LIBRARY_NAME = 'xpconnect_s'
include('/ipc/chromium/chromium-config.mozbuild')
FINAL_LIBRARY = 'gklayout'
GENERATED_FILES = [
'DictionaryHelpers.h',
'dom_quickstubs.h',
'GeneratedEventClasses.h',
'GeneratedEvents.h',
]

View File

@ -16,5 +16,3 @@ include $(topsrcdir)/config/rules.mk
jpeg_nbits_table.h: $(srcdir)/genTables.py
$(PYTHON) $(srcdir)/genTables.py
jchuff.$(OBJ_SUFFIX): jpeg_nbits_table.h

View File

@ -150,3 +150,7 @@ if CONFIG['OS_TARGET'] == 'WINNT':
NO_VISIBILITY_FLAGS = True
FINAL_LIBRARY = 'gkmedias'
GENERATED_FILES = [
'jpeg_nbits_table.h',
]

View File

@ -13,10 +13,5 @@ include $(topsrcdir)/config/rules.mk
# Generate the include file containing compact, static definitions
# for effective TLD data.
nsEffectiveTLDService.$(OBJ_SUFFIX): etld_data.inc
nsEffectiveTLDService.h: etld_data.inc
etld_data.inc: $(srcdir)/prepare_tlds.py $(srcdir)/effective_tld_names.dat
$(PYTHON) $(srcdir)/prepare_tlds.py $(srcdir)/effective_tld_names.dat > etld_data.inc
GARBAGE += etld_data.inc

View File

@ -38,3 +38,7 @@ FAIL_ON_WARNINGS = True
MSVC_ENABLE_PGO = True
FINAL_LIBRARY = 'necko'
GENERATED_FILES = [
'etld_data.inc',
]

View File

@ -4,6 +4,4 @@
include $(topsrcdir)/config/rules.mk
xmltok.$(OBJ_SUFFIX): moz_extensions.c
DEFINES += -DHAVE_EXPAT_CONFIG_H

View File

@ -18,3 +18,7 @@ SOURCES += [
MSVC_ENABLE_PGO = True
FINAL_LIBRARY = 'gkmedias'
GENERATED_FILES = [
'moz_extensions.c',
]

View File

@ -202,6 +202,7 @@ class TreeMetadataEmitter(LoggingMixin):
FILES_PER_UNIFIED_FILE='FILES_PER_UNIFIED_FILE',
FORCE_SHARED_LIB='FORCE_SHARED_LIB',
FORCE_STATIC_LIB='FORCE_STATIC_LIB',
GENERATED_FILES='GENERATED_FILES',
HOST_LIBRARY_NAME='HOST_LIBRARY_NAME',
IS_COMPONENT='IS_COMPONENT',
JS_MODULES_PATH='JS_MODULES_PATH',

View File

@ -108,6 +108,14 @@ VARIABLES = {
and reduce the debug info size.
""", 'compile'),
'GENERATED_FILES': (StrictOrderingOnAppendList, list, [],
"""Generic generated files.
This variable contains a list of generate files for the build system
to generate at export time. The rules for those files still live in
Makefile.in.
""", 'export'),
'DEFINES': (OrderedDict, dict, OrderedDict(),
"""Dictionary of compiler defines to declare.

View File

@ -49,6 +49,4 @@ $(histogram_enum_file): $(histograms_file) $(enum_python_deps)
$(histogram_data_file): $(histograms_file) $(data_python_deps)
$(PYTHON) $(srcdir)/gen-histogram-data.py $< > $@
Telemetry.$(OBJ_SUFFIX): $(histogram_data_file)
GARBAGE += $(histogram_data_file) $(histogram_enum_file)
GARBAGE += $(histogram_enum_file)

View File

@ -43,3 +43,7 @@ MSVC_ENABLE_PGO = True
include('/ipc/chromium/chromium-config.mozbuild')
FINAL_LIBRARY = 'xul'
GENERATED_FILES = [
'TelemetryHistogramData.inc',
]

View File

@ -164,10 +164,6 @@ xptcstubsdef_asm.solx86: $(DIST)/include/xptcstubsdef.inc
$(DIST)/include/xptcstubsdef.inc > $@
ifeq (x86_64,$(OS_TEST))
ASFLAGS += -xarch=amd64
xptcstubs_asm_x86_64_solaris_SUNW.$(OBJ_SUFFIX): xptcstubsdef_asm.solx86
else
xptcstubs_asm_x86_solaris_SUNW.$(OBJ_SUFFIX): xptcstubsdef_asm.solx86
endif
endif

View File

@ -281,6 +281,9 @@ if CONFIG['OS_ARCH'] == 'OpenBSD' and CONFIG['OS_TEST'] == 'sparc64':
]
if CONFIG['OS_ARCH'] == 'SunOS' and CONFIG['OS_TEST'].find('86') == -1:
GENERATED_FILES = [
'xptcstubsdef_asm.solx86',
]
if CONFIG['HAVE_64BIT_OS']:
SOURCES += [
'xptcinvoke_sparcv9_solaris.cpp',