Changeset 108523 in webkit


Ignore:
Timestamp:
Feb 22, 2012 10:56:40 AM (12 years ago)
Author:
Martin Robinson
Message:

[GTK] Clean build is broken when using make -j
​https://bugs.webkit.org/show_bug.cgi?id=76388

.:

  • GNUmakefile.am: Add new global source list variables.

Source/WebCore:

No new tests. This is just a build fix.

Use order-only dependencies to ensure that built sources are built before
files that depend on them.

  • GNUmakefile.am: Establish an order-only dependency on some built sources before starting

to build non-generated sources. Rename some temporary files and variables to be more consistent.

  • bindings/gobject/GNUmakefile.am: Updated to reflect new variable names.

Source/WebKit2:

  • GNUmakefile.am: Add some WebKit2 sources to global sources lists

so that we can refer to them in separate GNUmakefiles.

Location:
trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r108401 r108523  
     12012-02-22  Martin Robinson  <mrobinson@igalia.com>
     2
     3        [GTK] Clean build is broken when using make -j
     4        https://bugs.webkit.org/show_bug.cgi?id=76388
     5
     6        * GNUmakefile.am: Add new global source list variables.
     7
    182012-02-20  Ryosuke Niwa  <rniwa@webkit.org>
    29

  • trunk/GNUmakefile.am

    r108222 r108523  
    8181webkitgtk_built_sources :=
    8282webkitgtk_built_nosources :=
     83webkit2_sources :=
    8384webkit2_built_sources :=
     85webkit2_plugin_process_sources :=
    8486webkit2_plugin_process_built_sources :=
    8587webkittestrunner_built_sources :=

  • trunk/Source/WebCore/ChangeLog

    r108521 r108523  
     12012-02-22  Martin Robinson  <mrobinson@igalia.com>
     2
     3        [GTK] Clean build is broken when using make -j
     4        https://bugs.webkit.org/show_bug.cgi?id=76388
     5
     6        No new tests. This is just a build fix.
     7
     8        Use order-only dependencies to ensure that built sources are built before
     9        files that depend on them.
     10
     11        * GNUmakefile.am: Establish an order-only dependency on some built sources before starting
     12        to build non-generated sources. Rename some temporary files and variables to be more consistent.
     13        * bindings/gobject/GNUmakefile.am: Updated to reflect new variable names.
     14
    1152012-02-22  Dana Jansens  <danakj@chromium.org>
    216

  • trunk/Source/WebCore/GNUmakefile.am

    r108428 r108523  
    786786vpath %.idl $(IDL_PATH)
    787787
     788supplemental_dependency_file = $(top_builddir)/DerivedSources/WebCore/idl_supplemental_dependencies
     789idl_files_list = $(top_builddir)/DerivedSources/WebCore/idl_files_list
     790idl_attributes_file = $(WebCore)/bindings/scripts/IDLAttributes.txt
     791
     792.SECONDARY:
     793$(supplemental_dependency_file): $(SCRIPTS_FOR_RESOLVE_SUPPLEMENTAL) $(dom_binding_idls) $(idl_attributes_file)
     794        $(AM_V_GEN)
     795        $(AM_V_at)echo -n > $(idl_files_list)
     796        $(AM_V_at)($(foreach idl, $(dom_binding_idls), echo $(idl) &&) echo -n) >> $(idl_files_list)
     797        $(AM_V_at)$(PERL) -I$(WebCore)/bindings/scripts $(WebCore)/bindings/scripts/resolve-supplemental.pl --defines "LANGUAGE_JAVASCRIPT=1 $(FEATURE_DEFINES)" --idlFilesList $(idl_files_list) --supplementalDependencyFile $@ --idlAttributesFile $(idl_attributes_file)
     798
    788799# This does not appear to work correctly with gnumake unless
    789800# it includes an empty command list (the semicolon).
    790801DerivedSources/WebCore/JS%.cpp: DerivedSources/WebCore/JS%.h;
    791802
    792 SUPPLEMENTAL_DEPENDENCY_FILE = $(top_builddir)/DerivedSources/WebCore/supplemental_dependency.tmp
    793 IDL_FILES_TMP = $(top_builddir)/DerivedSources/WebCore/idl_files.tmp
    794 IDL_ATTRIBUTES_FILE = $(WebCore)/bindings/scripts/IDLAttributes.txt
    795 
    796803.SECONDARY:
    797 $(SUPPLEMENTAL_DEPENDENCY_FILE): $(SCRIPTS_FOR_RESOLVE_SUPPLEMENTAL) $(dom_binding_idls) $(IDL_ATTRIBUTES_FILE)
    798         $(AM_V_GEN)
    799         $(AM_V_at)echo -n > $(IDL_FILES_TMP)
    800         $(AM_V_at)($(foreach idl, $(dom_binding_idls), echo $(idl) &&) echo -n) >> $(IDL_FILES_TMP)
    801         $(AM_V_at)$(PERL) -I$(WebCore)/bindings/scripts $(WebCore)/bindings/scripts/resolve-supplemental.pl --defines "LANGUAGE_JAVASCRIPT=1 $(FEATURE_DEFINES)" --idlFilesList $(IDL_FILES_TMP) --supplementalDependencyFile $@ --idlAttributesFile $(IDL_ATTRIBUTES_FILE)
    802 
    803 .SECONDARY:
    804 DerivedSources/WebCore/JS%.h: %.idl $(SCRIPTS_FOR_GENERATE_BINDINGS) $(WebCore)/bindings/scripts/CodeGeneratorJS.pm $(SUPPLEMENTAL_DEPENDENCY_FILE)
    805         $(AM_V_GEN)$(PERL) -I$(WebCore)/bindings/scripts $(WebCore)/bindings/scripts/generate-bindings.pl $(IDL_PATH:%=--include "%") --outputDir "$(GENSOURCES_WEBCORE)" --defines "LANGUAGE_JAVASCRIPT=1 $(FEATURE_DEFINES)" --generator JS --supplementalDependencyFile $(SUPPLEMENTAL_DEPENDENCY_FILE) $<
     804DerivedSources/WebCore/JS%.h: %.idl $(SCRIPTS_FOR_GENERATE_BINDINGS) $(WebCore)/bindings/scripts/CodeGeneratorJS.pm $(supplemental_dependency_file)
     805        $(AM_V_GEN)$(PERL) -I$(WebCore)/bindings/scripts $(WebCore)/bindings/scripts/generate-bindings.pl $(IDL_PATH:%=--include "%") --outputDir "$(GENSOURCES_WEBCORE)" --defines "LANGUAGE_JAVASCRIPT=1 $(FEATURE_DEFINES)" --generator JS --supplementalDependencyFile $(supplemental_dependency_file) $<
     806
     807# See https://bugs.webkit.org/show_bug.cgi?id=76388
     808# We need to introduce a manual dependency to prevent non-generated sources from
     809# trying to build before the generated ones. This can happen if the supplemental
     810# IDL generation takes a long time. The pipe represents an order-only dependency,
     811# which means that GNUmake will only try to build the dependencies first, but
     812# not rebuild all the targets if the dependencies change.
     813$(webkitgtk_sources) $(webkit2_sources) $(webkit2_plugin_process_sources) $(webcore_sources) $(webcoregtk_sources) : | $(supplemental_dependency_file) $(webcore_built_sources)
    806814
    807815noinst_LTLIBRARIES += \

  • trunk/Source/WebCore/bindings/gobject/GNUmakefile.am

    r106373 r108523  
    461461# Filter out SVG and IndexedDB for now
    462462gdom_feature_defines := $(filter-out ENABLE_INDEXED_DATABASE=1, $(filter-out ENABLE_SVG%, $(FEATURE_DEFINES)))
    463 DerivedSources/webkit/WebKitDOM%.cpp DerivedSources/webkit/WebKitDOM%.h DerivedSources/webkit/WebKitDOM%Private.h: %.idl $(SCRIPTS_FOR_GENERATE_BINDINGS) $(WebCore)/bindings/scripts/CodeGeneratorGObject.pm $(WebCore)/bindings/gobject/GNUmakefile.am $(SUPPLEMENTAL_DEPENDENCY_FILE)
    464         $(AM_V_GEN)$(PERL) -I$(WebCore)/bindings/scripts $(WebCore)/bindings/scripts/generate-bindings.pl --include $(WebCore)/dom --include $(WebCore)/html --include $(WebCore)/css --include $(WebCore)/page --include $(WebCore)/xml --include $(WebCore)/svg --outputDir "$(GENSOURCES_WEBKIT)" --defines "LANGUAGE_GOBJECT=1 $(gdom_feature_defines)" --generator GObject --supplementalDependencyFile $(SUPPLEMENTAL_DEPENDENCY_FILE) $<
     463DerivedSources/webkit/WebKitDOM%.cpp DerivedSources/webkit/WebKitDOM%.h DerivedSources/webkit/WebKitDOM%Private.h: %.idl $(SCRIPTS_FOR_GENERATE_BINDINGS) $(WebCore)/bindings/scripts/CodeGeneratorGObject.pm $(WebCore)/bindings/gobject/GNUmakefile.am $(supplemental_dependency_file)
     464        $(AM_V_GEN)$(PERL) -I$(WebCore)/bindings/scripts $(WebCore)/bindings/scripts/generate-bindings.pl --include $(WebCore)/dom --include $(WebCore)/html --include $(WebCore)/css --include $(WebCore)/page --include $(WebCore)/xml --include $(WebCore)/svg --outputDir "$(GENSOURCES_WEBKIT)" --defines "LANGUAGE_GOBJECT=1 $(gdom_feature_defines)" --generator GObject --supplementalDependencyFile $(supplemental_dependency_file) $<

  • trunk/Source/WebKit2/ChangeLog

    r108512 r108523  
     12012-02-22  Martin Robinson  <mrobinson@igalia.com>
     2
     3        [GTK] Clean build is broken when using make -j
     4        https://bugs.webkit.org/show_bug.cgi?id=76388
     5
     6        * GNUmakefile.am: Add some WebKit2 sources to global sources lists
     7        so that we can refer to them in separate GNUmakefiles.
     8
    192012-02-22  Antaryami Pandia  <antaryami.pandia@motorola.com>
    210

  • trunk/Source/WebKit2/GNUmakefile.am

    r108222 r108523  
    196196        $(webkit2_built_sources)
    197197
    198 libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_SOURCES = \
     198webkit2_sources += \
    199199        Source/WebKit2/config.h \
    200200        Source/WebKit2/Platform/CoreIPC/ArgumentCoder.h \
    … …  
    960960        Source/WebKit2/WebProcess/WebProcess.h
    961961
     962libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_SOURCES = \
     963        $(webkit2_sources)
     964
    962965libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CPPFLAGS = \
    963966        -fno-strict-aliasing \
    … …  
    13851388BUILT_SOURCES += $(nodist_Programs_WebKitPluginProcess_SOURCES)
    13861389
    1387 Programs_WebKitPluginProcess_SOURCES = \
     1390webkit2_plugin_process_sources += \
    13881391        Source/WebKit2/Platform/CoreIPC/ArgumentCoder.h \
    13891392        Source/WebKit2/Platform/CoreIPC/ArgumentCoders.h \
    … …  
    14731476        Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp \
    14741477        Source/WebKit2/gtk/PluginMainGtk.cpp
     1478Programs_WebKitPluginProcess_SOURCES = \
     1479        $(webkit2_plugin_process_sources)
    14751480
    14761481Programs_WebKitPluginProcess_LDADD = \
Note: See TracChangeset for help on using the changeset viewer.