Diff
Modified: trunk/ChangeLog (206903 => 206904)
--- trunk/ChangeLog 2016-10-07 07:02:02 UTC (rev 206903)
+++ trunk/ChangeLog 2016-10-07 07:56:29 UTC (rev 206904)
@@ -1,3 +1,13 @@
+2016-10-07 Fujii Hironori <hironori.fu...@sony.com>
+
+ Use 'use lib $FindBin::Bin' to append Perl module include path
+ https://bugs.webkit.org/show_bug.cgi?id=162256
+
+ Reviewed by Carlos Garcia Campos.
+
+ * Source/cmake/WebKitMacros.cmake: Removed '-I' options from
+ invocation of Perl.
+
2016-10-06 Brent Fulgham <bfulg...@apple.com>
[Win][Direct2D] Add Direct2D CMake rules
Modified: trunk/Source/WebCore/CMakeLists.txt (206903 => 206904)
--- trunk/Source/WebCore/CMakeLists.txt 2016-10-07 07:02:02 UTC (rev 206903)
+++ trunk/Source/WebCore/CMakeLists.txt 2016-10-07 07:56:29 UTC (rev 206904)
@@ -3534,7 +3534,7 @@
DEPENDS ${WebCore_CSS_PROPERTY_NAMES}
WORKING_DIRECTORY ${DERIVED_SOURCES_WEBCORE_DIR}
COMMAND ${PERL_EXECUTABLE} -ne "print" ${WebCore_CSS_PROPERTY_NAMES} > ${DERIVED_SOURCES_WEBCORE_DIR}/CSSPropertyNames.in
- COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${WEBCORE_DIR}/css/makeprop.pl --defines "${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}" --preprocessor "${CODE_GENERATOR_PREPROCESSOR}" --gperf-executable "${GPERF_EXECUTABLE}"
+ COMMAND ${PERL_EXECUTABLE} ${WEBCORE_DIR}/css/makeprop.pl --defines "${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}" --preprocessor "${CODE_GENERATOR_PREPROCESSOR}" --gperf-executable "${GPERF_EXECUTABLE}"
VERBATIM)
list(APPEND WebCore_DERIVED_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/CSSPropertyNames.cpp)
list(APPEND WebCore_DERIVED_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/StyleBuilder.cpp)
@@ -3549,7 +3549,7 @@
DEPENDS ${WebCore_CSS_VALUE_KEYWORDS}
WORKING_DIRECTORY ${DERIVED_SOURCES_WEBCORE_DIR}
COMMAND ${PERL_EXECUTABLE} -ne "print" ${WebCore_CSS_VALUE_KEYWORDS} > ${DERIVED_SOURCES_WEBCORE_DIR}/CSSValueKeywords.in
- COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${WEBCORE_DIR}/css/makevalues.pl --defines "${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}" --preprocessor "${CODE_GENERATOR_PREPROCESSOR}"
+ COMMAND ${PERL_EXECUTABLE} ${WEBCORE_DIR}/css/makevalues.pl --defines "${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}" --preprocessor "${CODE_GENERATOR_PREPROCESSOR}"
VERBATIM)
list(APPEND WebCore_DERIVED_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/CSSValueKeywords.cpp)
ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/css/CSSParser.cpp CSSValueKeywords.h)
@@ -3577,7 +3577,7 @@
OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/UserAgentStyleSheetsData.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/UserAgentStyleSheets.h
MAIN_DEPENDENCY ${WEBCORE_DIR}/css/make-css-file-arrays.pl
DEPENDS ${WebCore_USER_AGENT_STYLE_SHEETS} ${WEBCORE_DIR}/bindings/scripts/preprocessor.pm
- COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${WEBCORE_DIR}/css/make-css-file-arrays.pl --defines "${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}" --preprocessor "${CODE_GENERATOR_PREPROCESSOR}" ${DERIVED_SOURCES_WEBCORE_DIR}/UserAgentStyleSheets.h ${DERIVED_SOURCES_WEBCORE_DIR}/UserAgentStyleSheetsData.cpp ${WebCore_USER_AGENT_STYLE_SHEETS}
+ COMMAND ${PERL_EXECUTABLE} ${WEBCORE_DIR}/css/make-css-file-arrays.pl --defines "${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}" --preprocessor "${CODE_GENERATOR_PREPROCESSOR}" ${DERIVED_SOURCES_WEBCORE_DIR}/UserAgentStyleSheets.h ${DERIVED_SOURCES_WEBCORE_DIR}/UserAgentStyleSheetsData.cpp ${WebCore_USER_AGENT_STYLE_SHEETS}
VERBATIM)
list(APPEND WebCore_DERIVED_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/UserAgentStyleSheetsData.cpp)
ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/css/StyleResolver.cpp UserAgentStyleSheetsData.cpp UserAgentStyleSheets.h)
@@ -3615,7 +3615,7 @@
OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/PlugInsResourcesData.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/PlugInsResources.h
MAIN_DEPENDENCY ${WEBCORE_DIR}/css/make-css-file-arrays.pl
DEPENDS ${WebCore_PLUG_INS_RESOURCES} ${WEBCORE_DIR}/bindings/scripts/preprocessor.pm
- COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${WEBCORE_DIR}/css/make-css-file-arrays.pl --defines "${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}" --preprocessor "${CODE_GENERATOR_PREPROCESSOR}" ${DERIVED_SOURCES_WEBCORE_DIR}/PlugInsResources.h ${DERIVED_SOURCES_WEBCORE_DIR}/PlugInsResourcesData.cpp ${WebCore_PLUG_INS_RESOURCES}
+ COMMAND ${PERL_EXECUTABLE} ${WEBCORE_DIR}/css/make-css-file-arrays.pl --defines "${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}" --preprocessor "${CODE_GENERATOR_PREPROCESSOR}" ${DERIVED_SOURCES_WEBCORE_DIR}/PlugInsResources.h ${DERIVED_SOURCES_WEBCORE_DIR}/PlugInsResourcesData.cpp ${WebCore_PLUG_INS_RESOURCES}
VERBATIM)
list(APPEND WebCore_DERIVED_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/PlugInsResourcesData.cpp)
ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/css/StyleResolver.cpp PlugInsResourcesData.cpp PlugInsResources.h)
Modified: trunk/Source/WebCore/ChangeLog (206903 => 206904)
--- trunk/Source/WebCore/ChangeLog 2016-10-07 07:02:02 UTC (rev 206903)
+++ trunk/Source/WebCore/ChangeLog 2016-10-07 07:56:29 UTC (rev 206904)
@@ -1,3 +1,27 @@
+2016-10-07 Fujii Hironori <hironori.fu...@sony.com>
+
+ Use 'use lib $FindBin::Bin' to append Perl module include path
+ https://bugs.webkit.org/show_bug.cgi?id=162256
+
+ Reviewed by Carlos Garcia Campos.
+
+ Some Perl scripts are needed to be executed with '-I' switch to
+ explicitly append Perl module include path. Use 'use lib' as well
+ as other Perl scripts do.
+
+ * CMakeLists.txt: Removed '-I' options from invocation of Perl.
+ * DerivedSources.make: Ditto.
+ * bindings/scripts/generate-bindings.pl: Use 'use lib'.
+ * bindings/scripts/preprocess-idls.pl: Ditto.
+ * css/make-css-file-arrays.pl: Ditto.
+ * css/makegrammar.pl: Ditto.
+ * css/makeprop.pl: Ditto.
+ * css/makevalues.pl: Ditto.
+ * dom/make_dom_exceptions.pl: Ditto.
+ * dom/make_event_factory.pl: Ditto.
+ * dom/make_names.pl: Ditto.
+ * page/make_settings.pl: Ditto.
+
2016-10-07 Youenn Fablet <you...@apple.com>
Refactor CachedResourceClient::notifyFinished
Modified: trunk/Source/WebCore/DerivedSources.make (206903 => 206904)
--- trunk/Source/WebCore/DerivedSources.make 2016-10-07 07:02:02 UTC (rev 206903)
+++ trunk/Source/WebCore/DerivedSources.make 2016-10-07 07:56:29 UTC (rev 206904)
@@ -899,13 +899,13 @@
.INTERMEDIATE : makeprop.intermediate
makeprop.intermediate : $(WEBCORE_CSS_PROPERTY_NAMES) css/makeprop.pl bindings/scripts/preprocessor.pm $(PLATFORM_FEATURE_DEFINES)
$(PERL) -pe '' $(WEBCORE_CSS_PROPERTY_NAMES) > CSSPropertyNames.in
- $(PERL) -I$(WebCore)/bindings/scripts "$(WebCore)/css/makeprop.pl" --defines "$(FEATURE_DEFINES)"
+ $(PERL) "$(WebCore)/css/makeprop.pl" --defines "$(FEATURE_DEFINES)"
CSSValueKeywords.h CSSValueKeywords.cpp : makevalues.intermediate
.INTERMEDIATE : makevalues.intermediate
makevalues.intermediate : $(WEBCORE_CSS_VALUE_KEYWORDS) css/makevalues.pl bindings/scripts/preprocessor.pm $(PLATFORM_FEATURE_DEFINES)
$(PERL) -pe '' $(WEBCORE_CSS_VALUE_KEYWORDS) > CSSValueKeywords.in
- $(PERL) -I$(WebCore)/bindings/scripts "$(WebCore)/css/makevalues.pl" --defines "$(FEATURE_DEFINES)"
+ $(PERL) "$(WebCore)/css/makevalues.pl" --defines "$(FEATURE_DEFINES)"
# --------
@@ -974,7 +974,7 @@
# CSS grammar
CSSGrammar.cpp : css/CSSGrammar.y.in $(PLATFORM_FEATURE_DEFINES)
- $(PERL) -I $(WebCore)/bindings/scripts $(WebCore)/css/makegrammar.pl --extraDefines "$(FEATURE_DEFINES)" --outputDir . --bison "$(BISON)" --symbolsPrefix cssyy $<
+ $(PERL) $(WebCore)/css/makegrammar.pl --extraDefines "$(FEATURE_DEFINES)" --outputDir . --bison "$(BISON)" --symbolsPrefix cssyy $<
# --------
@@ -1014,7 +1014,7 @@
endif
UserAgentStyleSheets.h : css/make-css-file-arrays.pl bindings/scripts/preprocessor.pm $(USER_AGENT_STYLE_SHEETS) $(PLATFORM_FEATURE_DEFINES)
- $(PERL) -I$(WebCore)/bindings/scripts $< --defines "$(FEATURE_DEFINES)" $@ UserAgentStyleSheetsData.cpp $(USER_AGENT_STYLE_SHEETS)
+ $(PERL) $< --defines "$(FEATURE_DEFINES)" $@ UserAgentStyleSheetsData.cpp $(USER_AGENT_STYLE_SHEETS)
# --------
@@ -1040,7 +1040,7 @@
PLUG_INS_RESOURCES = $(WebCore)/Resources/plugIns.js
PlugInsResources.h : css/make-css-file-arrays.pl bindings/scripts/preprocessor.pm $(PLUG_INS_RESOURCES) $(PLATFORM_FEATURE_DEFINES)
- $(PERL) -I$(WebCore)/bindings/scripts $< --defines "$(FEATURE_DEFINES)" $@ PlugInsResourcesData.cpp $(PLUG_INS_RESOURCES)
+ $(PERL) $< --defines "$(FEATURE_DEFINES)" $@ PlugInsResourcesData.cpp $(PLUG_INS_RESOURCES)
# --------
@@ -1047,7 +1047,7 @@
WebKitFontFamilyNames.cpp WebKitFontFamilyNames.h: WebKitFontFamilyMakeNames.intermediate
.INTERMEDIATE : WebKitFontFamilyMakeNames.intermediate
WebKitFontFamilyMakeNames.intermediate : dom/make_names.pl bindings/scripts/Hasher.pm bindings/scripts/StaticString.pm css/WebKitFontFamilyNames.in
- $(PERL) -I $(WebCore)/bindings/scripts $< --fonts $(WebCore)/css/WebKitFontFamilyNames.in
+ $(PERL) $< --fonts $(WebCore)/css/WebKitFontFamilyNames.in
# HTML tag and attribute names
@@ -1089,20 +1089,20 @@
ifdef HTML_FLAGS
htmlMakeNames.intermediate : dom/make_names.pl bindings/scripts/Hasher.pm bindings/scripts/StaticString.pm html/HTMLTagNames.in html/HTMLAttributeNames.in
- $(PERL) -I $(WebCore)/bindings/scripts $< --tags $(WebCore)/html/HTMLTagNames.in --attrs $(WebCore)/html/HTMLAttributeNames.in --factory --wrapperFactory --extraDefines "$(HTML_FLAGS)"
+ $(PERL) $< --tags $(WebCore)/html/HTMLTagNames.in --attrs $(WebCore)/html/HTMLAttributeNames.in --factory --wrapperFactory --extraDefines "$(HTML_FLAGS)"
else
htmlMakeNames.intermediate : dom/make_names.pl bindings/scripts/Hasher.pm bindings/scripts/StaticString.pm html/HTMLTagNames.in html/HTMLAttributeNames.in
- $(PERL) -I $(WebCore)/bindings/scripts $< --tags $(WebCore)/html/HTMLTagNames.in --attrs $(WebCore)/html/HTMLAttributeNames.in --factory --wrapperFactory
+ $(PERL) $< --tags $(WebCore)/html/HTMLTagNames.in --attrs $(WebCore)/html/HTMLAttributeNames.in --factory --wrapperFactory
endif
XMLNSNames.cpp : dom/make_names.pl bindings/scripts/Hasher.pm bindings/scripts/StaticString.pm xml/xmlnsattrs.in
- $(PERL) -I $(WebCore)/bindings/scripts $< --attrs $(WebCore)/xml/xmlnsattrs.in
+ $(PERL) $< --attrs $(WebCore)/xml/xmlnsattrs.in
XMLNames.cpp : dom/make_names.pl bindings/scripts/Hasher.pm bindings/scripts/StaticString.pm xml/xmlattrs.in
- $(PERL) -I $(WebCore)/bindings/scripts $< --attrs $(WebCore)/xml/xmlattrs.in
+ $(PERL) $< --attrs $(WebCore)/xml/xmlattrs.in
# --------
@@ -1119,16 +1119,16 @@
ifdef SVG_FLAGS
svgMakeNames.intermediate : dom/make_names.pl bindings/scripts/Hasher.pm bindings/scripts/StaticString.pm svg/svgtags.in svg/svgattrs.in
- $(PERL) -I $(WebCore)/bindings/scripts $< --tags $(WebCore)/svg/svgtags.in --attrs $(WebCore)/svg/svgattrs.in --extraDefines "$(SVG_FLAGS)" --factory --wrapperFactory
+ $(PERL) $< --tags $(WebCore)/svg/svgtags.in --attrs $(WebCore)/svg/svgattrs.in --extraDefines "$(SVG_FLAGS)" --factory --wrapperFactory
else
svgMakeNames.intermediate : dom/make_names.pl bindings/scripts/Hasher.pm bindings/scripts/StaticString.pm svg/svgtags.in svg/svgattrs.in
- $(PERL) -I $(WebCore)/bindings/scripts $< --tags $(WebCore)/svg/svgtags.in --attrs $(WebCore)/svg/svgattrs.in --factory --wrapperFactory
+ $(PERL) $< --tags $(WebCore)/svg/svgtags.in --attrs $(WebCore)/svg/svgattrs.in --factory --wrapperFactory
endif
XLinkNames.cpp : dom/make_names.pl bindings/scripts/Hasher.pm bindings/scripts/StaticString.pm svg/xlinkattrs.in
- $(PERL) -I $(WebCore)/bindings/scripts $< --attrs $(WebCore)/svg/xlinkattrs.in
+ $(PERL) $< --attrs $(WebCore)/svg/xlinkattrs.in
# --------
@@ -1139,7 +1139,7 @@
EventFactory.cpp EventHeaders.h EventInterfaces.h : EventFactory.intermediate
.INTERMEDIATE : EventFactory.intermediate
EventFactory.intermediate : dom/make_event_factory.pl $(EVENT_NAMES)
- $(PERL) -I $(WebCore)/bindings/scripts $< $(addprefix --input , $(filter-out $(WebCore)/dom/make_event_factory.pl, $^))
+ $(PERL) $< $(addprefix --input , $(filter-out $(WebCore)/dom/make_event_factory.pl, $^))
EVENT_TARGET_FACTORY = EventTargetFactory.in $(ADDITIONAL_EVENT_TARGET_FACTORY)
@@ -1146,12 +1146,12 @@
EventTargetHeaders.h EventTargetInterfaces.h : EventTargetFactory.intermediate
.INTERMEDIATE : EventTargetFactory.intermediate
EventTargetFactory.intermediate : dom/make_event_factory.pl $(EVENT_TARGET_FACTORY)
- $(PERL) -I $(WebCore)/bindings/scripts $< $(addprefix --input , $(filter-out $(WebCore)/dom/make_event_factory.pl, $^))
+ $(PERL) $< $(addprefix --input , $(filter-out $(WebCore)/dom/make_event_factory.pl, $^))
ExceptionCodeDescription.cpp ExceptionCodeDescription.h ExceptionHeaders.h ExceptionInterfaces.h : MakeDOMExceptions.intermediate
.INTERMEDIATE : MakeDOMExceptions.intermediate
MakeDOMExceptions.intermediate : dom/make_dom_exceptions.pl dom/DOMExceptions.in
- $(PERL) -I $(WebCore)/bindings/scripts $< --input $(WebCore)/dom/DOMExceptions.in
+ $(PERL) $< --input $(WebCore)/dom/DOMExceptions.in
# --------
@@ -1160,7 +1160,7 @@
JSMathMLElementWrapperFactory.cpp JSMathMLElementWrapperFactory.h MathMLElementFactory.cpp MathMLElementFactory.h MathMLElementTypeHelpers.h MathMLNames.cpp MathMLNames.h : mathmlMakeNames.intermediate
.INTERMEDIATE : mathmlMakeNames.intermediate
mathmlMakeNames.intermediate : dom/make_names.pl bindings/scripts/Hasher.pm bindings/scripts/StaticString.pm mathml/mathtags.in mathml/mathattrs.in
- $(PERL) -I $(WebCore)/bindings/scripts $< --tags $(WebCore)/mathml/mathtags.in --attrs $(WebCore)/mathml/mathattrs.in --factory --wrapperFactory
+ $(PERL) $< --tags $(WebCore)/mathml/mathtags.in --attrs $(WebCore)/mathml/mathattrs.in --factory --wrapperFactory
# --------
@@ -1169,7 +1169,7 @@
InternalSettingsGenerated.idl InternalSettingsGenerated.cpp InternalSettingsGenerated.h SettingsMacros.h : MakeSettings.intermediate
.INTERMEDIATE : MakeSettings.intermediate
MakeSettings.intermediate : page/make_settings.pl page/Settings.in
- $(PERL) -I $(WebCore)/bindings/scripts $< --input $(WebCore)/page/Settings.in
+ $(PERL) $< --input $(WebCore)/page/Settings.in
# --------
@@ -1184,10 +1184,6 @@
PREPROCESS_IDLS_SCRIPTS = \
bindings/scripts/preprocess-idls.pl
-generator_script = $(PERL) $(addprefix -I $(WebCore)/, $(sort $(dir $(1)))) $(WebCore)/bindings/scripts/generate-bindings.pl
-
-preprocess_idls_script = $(PERL) $(addprefix -I $(WebCore)/, $(sort $(dir $(1)))) $(WebCore)/bindings/scripts/preprocess-idls.pl
-
# JS bindings generator
IDL_INCLUDES = \
@@ -1230,11 +1226,11 @@
$(SUPPLEMENTAL_MAKEFILE_DEPS) : $(PREPROCESS_IDLS_SCRIPTS) $(JS_BINDING_IDLS) $(PLATFORM_FEATURE_DEFINES) DerivedSources.make
$(foreach f,$(JS_BINDING_IDLS),@echo $(f)>>$(IDL_FILES_TMP)$(NL))
- $(call preprocess_idls_script, $(PREPROCESS_IDLS_SCRIPTS)) --defines "$(FEATURE_DEFINES) $(ADDITIONAL_IDL_DEFINES) LANGUAGE_JAVASCRIPT" --idlFilesList $(IDL_FILES_TMP) --supplementalDependencyFile $(SUPPLEMENTAL_DEPENDENCY_FILE) --windowConstructorsFile $(WINDOW_CONSTRUCTORS_FILE) --workerGlobalScopeConstructorsFile $(WORKERGLOBALSCOPE_CONSTRUCTORS_FILE) --dedicatedWorkerGlobalScopeConstructorsFile $(DEDICATEDWORKERGLOBALSCOPE_CONSTRUCTORS_FILE) --supplementalMakefileDeps $@
+ $(PERL) $(WebCore)/bindings/scripts/preprocess-idls.pl --defines "$(FEATURE_DEFINES) $(ADDITIONAL_IDL_DEFINES) LANGUAGE_JAVASCRIPT" --idlFilesList $(IDL_FILES_TMP) --supplementalDependencyFile $(SUPPLEMENTAL_DEPENDENCY_FILE) --windowConstructorsFile $(WINDOW_CONSTRUCTORS_FILE) --workerGlobalScopeConstructorsFile $(WORKERGLOBALSCOPE_CONSTRUCTORS_FILE) --dedicatedWorkerGlobalScopeConstructorsFile $(DEDICATEDWORKERGLOBALSCOPE_CONSTRUCTORS_FILE) --supplementalMakefileDeps $@
$(DELETE) $(IDL_FILES_TMP)
JS%.h : %.idl $(JS_BINDINGS_SCRIPTS) $(IDL_ATTRIBUTES_FILE) $(WINDOW_CONSTRUCTORS_FILE) $(WORKERGLOBALSCOPE_CONSTRUCTORS_FILE) $(PLATFORM_FEATURE_DEFINES)
- $(call generator_script, $(JS_BINDINGS_SCRIPTS)) $(IDL_COMMON_ARGS) --defines "$(FEATURE_DEFINES) $(ADDITIONAL_IDL_DEFINES) LANGUAGE_JAVASCRIPT" --generator JS --idlAttributesFile $(IDL_ATTRIBUTES_FILE) --supplementalDependencyFile $(SUPPLEMENTAL_DEPENDENCY_FILE) $<
+ $(PERL) $(WebCore)/bindings/scripts/generate-bindings.pl $(IDL_COMMON_ARGS) --defines "$(FEATURE_DEFINES) $(ADDITIONAL_IDL_DEFINES) LANGUAGE_JAVASCRIPT" --generator JS --idlAttributesFile $(IDL_ATTRIBUTES_FILE) --supplementalDependencyFile $(SUPPLEMENTAL_DEPENDENCY_FILE) $<
-include $(SUPPLEMENTAL_MAKEFILE_DEPS)
Modified: trunk/Source/WebCore/bindings/scripts/generate-bindings.pl (206903 => 206904)
--- trunk/Source/WebCore/bindings/scripts/generate-bindings.pl 2016-10-07 07:02:02 UTC (rev 206903)
+++ trunk/Source/WebCore/bindings/scripts/generate-bindings.pl 2016-10-07 07:56:29 UTC (rev 206904)
@@ -29,6 +29,8 @@
# <rdar://problems/4251781&4251785>
use strict;
+use FindBin;
+use lib '.', $FindBin::Bin;
use File::Path;
use File::Basename;
Modified: trunk/Source/WebCore/bindings/scripts/preprocess-idls.pl (206903 => 206904)
--- trunk/Source/WebCore/bindings/scripts/preprocess-idls.pl 2016-10-07 07:02:02 UTC (rev 206903)
+++ trunk/Source/WebCore/bindings/scripts/preprocess-idls.pl 2016-10-07 07:56:29 UTC (rev 206904)
@@ -19,6 +19,8 @@
#
use strict;
+use FindBin;
+use lib $FindBin::Bin;
use File::Basename;
use Getopt::Long;
Modified: trunk/Source/WebCore/css/make-css-file-arrays.pl (206903 => 206904)
--- trunk/Source/WebCore/css/make-css-file-arrays.pl 2016-10-07 07:02:02 UTC (rev 206903)
+++ trunk/Source/WebCore/css/make-css-file-arrays.pl 2016-10-07 07:56:29 UTC (rev 206904)
@@ -21,6 +21,9 @@
# Usage: make-css-file-arrays.pl <header> <output> <input> ...
use strict;
+use FindBin;
+use lib "$FindBin::Bin/../bindings/scripts";
+
use Getopt::Long;
my $defines;
Modified: trunk/Source/WebCore/css/makegrammar.pl (206903 => 206904)
--- trunk/Source/WebCore/css/makegrammar.pl 2016-10-07 07:02:02 UTC (rev 206903)
+++ trunk/Source/WebCore/css/makegrammar.pl 2016-10-07 07:56:29 UTC (rev 206904)
@@ -20,6 +20,8 @@
# Boston, MA 02110-1301, USA.
use strict;
use warnings;
+use FindBin;
+use lib "$FindBin::Bin/../bindings/scripts";
use File::Basename;
use File::Spec;
Modified: trunk/Source/WebCore/css/makeprop.pl (206903 => 206904)
--- trunk/Source/WebCore/css/makeprop.pl 2016-10-07 07:02:02 UTC (rev 206903)
+++ trunk/Source/WebCore/css/makeprop.pl 2016-10-07 07:56:29 UTC (rev 206904)
@@ -22,6 +22,9 @@
# along with this library; see the file COPYING.LIB. If not, write to
# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
# Boston, MA 02110-1301, USA.
+use FindBin;
+use lib "$FindBin::Bin/../bindings/scripts";
+
use Getopt::Long;
use preprocessor;
use strict;
Modified: trunk/Source/WebCore/css/makevalues.pl (206903 => 206904)
--- trunk/Source/WebCore/css/makevalues.pl 2016-10-07 07:02:02 UTC (rev 206903)
+++ trunk/Source/WebCore/css/makevalues.pl 2016-10-07 07:56:29 UTC (rev 206904)
@@ -21,6 +21,9 @@
# along with this library; see the file COPYING.LIB. If not, write to
# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
# Boston, MA 02110-1301, USA.
+use FindBin;
+use lib "$FindBin::Bin/../bindings/scripts";
+
use Getopt::Long;
use preprocessor;
use strict;
Modified: trunk/Source/WebCore/dom/make_dom_exceptions.pl (206903 => 206904)
--- trunk/Source/WebCore/dom/make_dom_exceptions.pl 2016-10-07 07:02:02 UTC (rev 206903)
+++ trunk/Source/WebCore/dom/make_dom_exceptions.pl 2016-10-07 07:56:29 UTC (rev 206904)
@@ -31,6 +31,8 @@
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
use strict;
+use FindBin;
+use lib "$FindBin::Bin/../bindings/scripts";
use InFilesCompiler;
Modified: trunk/Source/WebCore/dom/make_event_factory.pl (206903 => 206904)
--- trunk/Source/WebCore/dom/make_event_factory.pl 2016-10-07 07:02:02 UTC (rev 206903)
+++ trunk/Source/WebCore/dom/make_event_factory.pl 2016-10-07 07:56:29 UTC (rev 206904)
@@ -31,6 +31,8 @@
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
use strict;
+use FindBin;
+use lib "$FindBin::Bin/../bindings/scripts";
use InFilesCompiler;
Modified: trunk/Source/WebCore/dom/make_names.pl (206903 => 206904)
--- trunk/Source/WebCore/dom/make_names.pl 2016-10-07 07:02:02 UTC (rev 206903)
+++ trunk/Source/WebCore/dom/make_names.pl 2016-10-07 07:56:29 UTC (rev 206904)
@@ -30,6 +30,8 @@
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
use strict;
+use FindBin;
+use lib "$FindBin::Bin/../bindings/scripts";
use StaticString;
use Config;
Modified: trunk/Source/WebCore/page/make_settings.pl (206903 => 206904)
--- trunk/Source/WebCore/page/make_settings.pl 2016-10-07 07:02:02 UTC (rev 206903)
+++ trunk/Source/WebCore/page/make_settings.pl 2016-10-07 07:56:29 UTC (rev 206904)
@@ -24,6 +24,8 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
use strict;
+use FindBin;
+use lib "$FindBin::Bin/../bindings/scripts";
use InFilesCompiler;
Modified: trunk/Source/cmake/WebKitMacros.cmake (206903 => 206904)
--- trunk/Source/cmake/WebKitMacros.cmake 2016-10-07 07:02:02 UTC (rev 206903)
+++ trunk/Source/cmake/WebKitMacros.cmake 2016-10-07 07:56:29 UTC (rev 206904)
@@ -80,7 +80,7 @@
add_custom_command(
OUTPUT ${arg_SUPPLEMENTAL_DEPFILE} ${arg_PP_EXTRA_OUTPUT}
DEPENDS ${WEBCORE_DIR}/bindings/scripts/preprocess-idls.pl ${arg_INPUT_FILES}
- COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${WEBCORE_DIR}/bindings/scripts/preprocess-idls.pl --defines ${arg_FEATURES} --idlFilesList ${idl_files_list} --supplementalDependencyFile ${arg_SUPPLEMENTAL_DEPFILE} ${arg_PP_EXTRA_ARGS}
+ COMMAND ${PERL_EXECUTABLE} ${WEBCORE_DIR}/bindings/scripts/preprocess-idls.pl --defines ${arg_FEATURES} --idlFilesList ${idl_files_list} --supplementalDependencyFile ${arg_SUPPLEMENTAL_DEPFILE} ${arg_PP_EXTRA_ARGS}
VERBATIM)
endif ()
@@ -117,7 +117,7 @@
OUTPUT ${arg_DESTINATION}/JS${_name}.cpp ${arg_DESTINATION}/JS${_name}.h
MAIN_DEPENDENCY ${_file}
DEPENDS ${common_generator_dependencies}
- COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts -I${arg_BASE_DIR} ${binding_generator} --defines ${arg_FEATURES} --generator ${arg_GENERATOR} ${idl_includes} --outputDir ${arg_DESTINATION} --preprocessor ${CODE_GENERATOR_PREPROCESSOR} --idlAttributesFile ${idl_attributes_file} ${_supplemental_dependency} ${_file}
+ COMMAND ${PERL_EXECUTABLE} ${binding_generator} --defines ${arg_FEATURES} --generator ${arg_GENERATOR} ${idl_includes} --outputDir ${arg_DESTINATION} --preprocessor ${CODE_GENERATOR_PREPROCESSOR} --idlAttributesFile ${idl_attributes_file} ${_supplemental_dependency} ${_file}
WORKING_DIRECTORY ${arg_BASE_DIR}
VERBATIM)
list(APPEND gen_sources ${arg_DESTINATION}/JS${_name}.cpp)
@@ -134,7 +134,7 @@
OUTPUT ${_outputfiles}
MAIN_DEPENDENCY ${_infile}
DEPENDS ${MAKE_NAMES_DEPENDENCIES} ${NAMES_GENERATOR} ${SCRIPTS_BINDINGS}
- COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${NAMES_GENERATOR} --outputDir ${DERIVED_SOURCES_WEBCORE_DIR} ${_arguments}
+ COMMAND ${PERL_EXECUTABLE} ${NAMES_GENERATOR} --outputDir ${DERIVED_SOURCES_WEBCORE_DIR} ${_arguments}
VERBATIM)
endmacro()
@@ -146,7 +146,7 @@
OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/${_outfile}
MAIN_DEPENDENCY ${_infile}
DEPENDS ${NAMES_GENERATOR} ${SCRIPTS_BINDINGS}
- COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${NAMES_GENERATOR} --input ${_infile} --outputDir ${DERIVED_SOURCES_WEBCORE_DIR}
+ COMMAND ${PERL_EXECUTABLE} ${NAMES_GENERATOR} --input ${_infile} --outputDir ${DERIVED_SOURCES_WEBCORE_DIR}
VERBATIM)
endmacro()
@@ -158,7 +158,7 @@
OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/${_outfile}
MAIN_DEPENDENCY ${_infile}
DEPENDS ${NAMES_GENERATOR} ${SCRIPTS_BINDINGS}
- COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${NAMES_GENERATOR} --input ${_infile} --outputDir ${DERIVED_SOURCES_WEBCORE_DIR}
+ COMMAND ${PERL_EXECUTABLE} ${NAMES_GENERATOR} --input ${_infile} --outputDir ${DERIVED_SOURCES_WEBCORE_DIR}
VERBATIM)
endmacro()
@@ -170,7 +170,7 @@
OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/${_outfile} ${DERIVED_SOURCES_WEBCORE_DIR}/InternalSettingsGenerated.h ${DERIVED_SOURCES_WEBCORE_DIR}/InternalSettingsGenerated.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/InternalSettingsGenerated.idl
MAIN_DEPENDENCY ${_infile}
DEPENDS ${NAMES_GENERATOR} ${SCRIPTS_BINDINGS}
- COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${NAMES_GENERATOR} --input ${_infile} --outputDir ${DERIVED_SOURCES_WEBCORE_DIR}
+ COMMAND ${PERL_EXECUTABLE} ${NAMES_GENERATOR} --input ${_infile} --outputDir ${DERIVED_SOURCES_WEBCORE_DIR}
VERBATIM)
endmacro()
@@ -202,7 +202,7 @@
add_custom_command(
OUTPUT ${_outputfiles}
DEPENDS ${MAKE_NAMES_DEPENDENCIES} ${NAMES_GENERATOR} ${SCRIPTS_BINDINGS} ${_attrs} ${_tags}
- COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${NAMES_GENERATOR} --preprocessor "${CODE_GENERATOR_PREPROCESSOR_WITH_LINEMARKERS}" --outputDir ${DERIVED_SOURCES_WEBCORE_DIR} ${_arguments} ${_additionArguments}
+ COMMAND ${PERL_EXECUTABLE} ${NAMES_GENERATOR} --preprocessor "${CODE_GENERATOR_PREPROCESSOR_WITH_LINEMARKERS}" --outputDir ${DERIVED_SOURCES_WEBCORE_DIR} ${_arguments} ${_additionArguments}
VERBATIM)
endmacro()
@@ -216,7 +216,7 @@
OUTPUT ${_output_header} ${_output_source}
MAIN_DEPENDENCY ${_input}
DEPENDS ${_input}
- COMMAND ${PERL_EXECUTABLE} -I ${WEBCORE_DIR}/bindings/scripts ${WEBCORE_DIR}/css/makegrammar.pl --outputDir ${DERIVED_SOURCES_WEBCORE_DIR} --extraDefines "${_features}" --preprocessor "${CODE_GENERATOR_PREPROCESSOR}" --bison "${BISON_EXECUTABLE}" --symbolsPrefix ${_prefix} ${_input}
+ COMMAND ${PERL_EXECUTABLE} ${WEBCORE_DIR}/css/makegrammar.pl --outputDir ${DERIVED_SOURCES_WEBCORE_DIR} --extraDefines "${_features}" --preprocessor "${CODE_GENERATOR_PREPROCESSOR}" --bison "${BISON_EXECUTABLE}" --symbolsPrefix ${_prefix} ${_input}
WORKING_DIRECTORY ${_working_directory}
VERBATIM)
endmacro()
