Bug 1551639 - Use .inc suffix for generated source files that are only included. r=nalexander

There is a big difference between generated source files that are built
directly, and those that are only included.

In the latter case, the build system won't know the files that does the
including depends on the generated source. So those sources do need to
be built during the export tier.

But in the former case, the build system has all the dependency
information it needs, and, while these generated sources are currently
built as part of the export tier, they don't actually need to be. We're
going to change that, and in preparation, we rename included files so as
to be more clearly identified.

Differential Revision: https://phabricator.services.mozilla.com/D33770

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Mike Hommey 2019-06-06 04:34:53 +00:00
Родитель a8f6531a1b
Коммит 98317c472f
5 изменённых файлов: 8 добавлений и 8 удалений

Просмотреть файл

@ -62,7 +62,7 @@ included_inclnames_to_ignore = set([
'javascript-trace.h', # generated in $OBJDIR if HAVE_DTRACE is defined 'javascript-trace.h', # generated in $OBJDIR if HAVE_DTRACE is defined
'frontend/ReservedWordsGenerated.h', # generated in $OBJDIR 'frontend/ReservedWordsGenerated.h', # generated in $OBJDIR
'gc/StatsPhasesGenerated.h', # generated in $OBJDIR 'gc/StatsPhasesGenerated.h', # generated in $OBJDIR
'gc/StatsPhasesGenerated.cpp', # generated in $OBJDIR 'gc/StatsPhasesGenerated.inc', # generated in $OBJDIR
'jit/LOpcodes.h', # generated in $OBJDIR 'jit/LOpcodes.h', # generated in $OBJDIR
'jit/MOpcodes.h', # generated in $OBJDIR 'jit/MOpcodes.h', # generated in $OBJDIR
'jscustomallocator.h', # provided by embedders; allowed to be missing 'jscustomallocator.h', # provided by embedders; allowed to be missing
@ -118,7 +118,7 @@ oddly_ordered_inclnames = set([
# Included in the body of frontend/TokenStream.h # Included in the body of frontend/TokenStream.h
'frontend/ReservedWordsGenerated.h', 'frontend/ReservedWordsGenerated.h',
'gc/StatsPhasesGenerated.h', # Included in the body of gc/Statistics.h 'gc/StatsPhasesGenerated.h', # Included in the body of gc/Statistics.h
'gc/StatsPhasesGenerated.cpp', # Included in the body of gc/Statistics.cpp 'gc/StatsPhasesGenerated.inc', # Included in the body of gc/Statistics.cpp
'psapi.h', # Must be included after "util/Windows.h" on Windows 'psapi.h', # Must be included after "util/Windows.h" on Windows
'machine/endian.h', # Must be included after <sys/types.h> on BSD 'machine/endian.h', # Must be included after <sys/types.h> on BSD
'winbase.h', # Must precede other system headers(?) 'winbase.h', # Must precede other system headers(?)

Просмотреть файл

@ -147,7 +147,7 @@ using PhaseTable = EnumeratedArray<Phase, Phase::LIMIT, PhaseInfo>;
using PhaseKindTable = using PhaseKindTable =
EnumeratedArray<PhaseKind, PhaseKind::LIMIT, PhaseKindInfo>; EnumeratedArray<PhaseKind, PhaseKind::LIMIT, PhaseKindInfo>;
#include "gc/StatsPhasesGenerated.cpp" #include "gc/StatsPhasesGenerated.inc"
static double t(TimeDuration duration) { return duration.ToMilliseconds(); } static double t(TimeDuration duration) { return duration.ToMilliseconds(); }

Просмотреть файл

@ -17,10 +17,10 @@ include('../js-cxxflags.mozbuild')
# Generate GC statistics phase data. # Generate GC statistics phase data.
GENERATED_FILES += ['StatsPhasesGenerated.cpp', 'StatsPhasesGenerated.h'] GENERATED_FILES += ['StatsPhasesGenerated.h', 'StatsPhasesGenerated.inc']
StatsPhasesGeneratedHeader = GENERATED_FILES['StatsPhasesGenerated.h'] StatsPhasesGeneratedHeader = GENERATED_FILES['StatsPhasesGenerated.h']
StatsPhasesGeneratedHeader.script = 'GenerateStatsPhases.py:generateHeader' StatsPhasesGeneratedHeader.script = 'GenerateStatsPhases.py:generateHeader'
StatsPhasesGeneratedCpp = GENERATED_FILES['StatsPhasesGenerated.cpp'] StatsPhasesGeneratedCpp = GENERATED_FILES['StatsPhasesGenerated.inc']
StatsPhasesGeneratedCpp.script = 'GenerateStatsPhases.py:generateCpp' StatsPhasesGeneratedCpp.script = 'GenerateStatsPhases.py:generateCpp'
UNIFIED_SOURCES += [ UNIFIED_SOURCES += [

Просмотреть файл

@ -287,7 +287,7 @@ servo_props.inputs = [
if CONFIG['COMPILE_ENVIRONMENT']: if CONFIG['COMPILE_ENVIRONMENT']:
GENERATED_FILES += [ GENERATED_FILES += [
'CompositorAnimatableProperties.h', 'CompositorAnimatableProperties.h',
'nsComputedDOMStyleGenerated.cpp', 'nsComputedDOMStyleGenerated.inc',
'nsCSSPropsGenerated.inc', 'nsCSSPropsGenerated.inc',
'ServoStyleConsts.h', 'ServoStyleConsts.h',
] ]
@ -303,7 +303,7 @@ if CONFIG['COMPILE_ENVIRONMENT']:
'!ServoCSSPropList.py', '!ServoCSSPropList.py',
] ]
computed = GENERATED_FILES['nsComputedDOMStyleGenerated.cpp'] computed = GENERATED_FILES['nsComputedDOMStyleGenerated.inc']
computed.script = 'GenerateComputedDOMStyleGenerated.py:generate' computed.script = 'GenerateComputedDOMStyleGenerated.py:generate'
computed.inputs = [ computed.inputs = [
'!ServoCSSPropList.py', '!ServoCSSPropList.py',

Просмотреть файл

@ -199,7 +199,7 @@ struct ComputedStyleMap {
// This generated file includes definition of kEntries which is typed // This generated file includes definition of kEntries which is typed
// Entry[] and used below, so this #include has to be put here. // Entry[] and used below, so this #include has to be put here.
#include "nsComputedDOMStyleGenerated.cpp" #include "nsComputedDOMStyleGenerated.inc"
/** /**
* Returns the number of properties that should be exposed on an * Returns the number of properties that should be exposed on an