From d76220d6a991364925ec148c3b83cbf02e2404de Mon Sep 17 00:00:00 2001 From: Christian Prochaska Date: Thu, 5 Mar 2015 16:41:19 +0100 Subject: [PATCH] qt5: save generated source files in the contrib directory Fixes #1436 --- .gitignore | 3 --- repos/libports/lib/mk/qt5.inc | 2 ++ repos/libports/lib/mk/qt5_jscore.mk | 4 ++-- repos/libports/lib/mk/qt5_v8.mk | 4 ++-- repos/libports/lib/mk/qt5_webcore.mk | 6 +++--- 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index a50aa65a5..cada4e03d 100644 --- a/.gitignore +++ b/.gitignore @@ -19,9 +19,6 @@ /repos/dde_rump/include/rump /repos/libports/contrib /repos/libports/download -/repos/libports/src/lib/qt5/qtjsbackend -/repos/libports/src/lib/qt5/qtwebkit/Source/JavaScriptCore -/repos/libports/src/lib/qt5/qtwebkit/Source/WebCore/generated /repos/ports-foc/contrib /repos/ports-okl4/contrib /repos/ports-okl4/download diff --git a/repos/libports/lib/mk/qt5.inc b/repos/libports/lib/mk/qt5.inc index 6eb0d4c55..c77cc9e03 100644 --- a/repos/libports/lib/mk/qt5.inc +++ b/repos/libports/lib/mk/qt5.inc @@ -14,7 +14,9 @@ $(addsuffix .o,$(basename $(SRC_CC))): $(COMPILER_MOC_SOURCE_MAKE_ALL_FILES_FILT QT5_INC_DIR += $(REP_DIR)/src/lib/qt5/qtbase/src/corelib/global QT5_INC_DIR += $(addprefix $(REP_DIR)/src/lib/qt5/, $(QT_INCPATH)) +QT5_INC_DIR += $(addprefix $(QT5_PORT_DIR)/src/lib/qt5/, $(QT_INCPATH)) QT5_INC_DIR += $(addprefix $(QT5_CONTRIB_DIR)/, $(QT_INCPATH)) vpath % $(addprefix $(REP_DIR)/src/lib/qt5/, $(QT_VPATH)) +vpath % $(addprefix $(QT5_PORT_DIR)/src/lib/qt5/, $(QT_VPATH)) vpath % $(addprefix $(QT5_CONTRIB_DIR)/, $(QT_VPATH)) diff --git a/repos/libports/lib/mk/qt5_jscore.mk b/repos/libports/lib/mk/qt5_jscore.mk index 9867e6262..aea6cc889 100644 --- a/repos/libports/lib/mk/qt5_jscore.mk +++ b/repos/libports/lib/mk/qt5_jscore.mk @@ -18,11 +18,11 @@ CC_WARN = # that's why they can be quite long # -all: $(REP_DIR)/src/lib/qt5/qtwebkit/Source/JavaScriptCore/generated/generated.tag +all: $(QT5_PORT_DIR)/src/lib/qt5/qtwebkit/Source/JavaScriptCore/generated/generated.tag JAVASCRIPTCORE_DIR = $(QT5_CONTRIB_DIR)/qtwebkit/Source/JavaScriptCore -$(REP_DIR)/src/lib/qt5/qtwebkit/Source/JavaScriptCore/generated/generated.tag: +$(QT5_PORT_DIR)/src/lib/qt5/qtwebkit/Source/JavaScriptCore/generated/generated.tag: $(VERBOSE)mkdir -p $(dir $@) diff --git a/repos/libports/lib/mk/qt5_v8.mk b/repos/libports/lib/mk/qt5_v8.mk index dde245017..a2c300431 100644 --- a/repos/libports/lib/mk/qt5_v8.mk +++ b/repos/libports/lib/mk/qt5_v8.mk @@ -6,11 +6,11 @@ SHARED_LIB = yes # Generated files # -all: $(REP_DIR)/src/lib/qt5/qtjsbackend/generated/generated.tag +all: $(QT5_PORT_DIR)/src/lib/qt5/qtjsbackend/generated/generated.tag V8_DIR = $(QT5_CONTRIB_DIR)/qtjsbackend/src/v8/../3rdparty/v8 -$(REP_DIR)/src/lib/qt5/qtjsbackend/generated/generated.tag: +$(QT5_PORT_DIR)/src/lib/qt5/qtjsbackend/generated/generated.tag: $(VERBOSE)mkdir -p $(dir $@) $(VERBOSE)python $(V8_DIR)/tools/js2c.py $(dir $@)/experimental-libraries.cpp EXPERIMENTAL off $(V8_DIR)/src/macros.py $(V8_DIR)/src/proxy.js $(VERBOSE)python $(V8_DIR)/tools/js2c.py $(dir $@)/libraries.cpp CORE off $(V8_DIR)/src/macros.py $(V8_DIR)/src/runtime.js $(V8_DIR)/src/v8natives.js $(V8_DIR)/src/array.js $(V8_DIR)/src/string.js $(V8_DIR)/src/uri.js $(V8_DIR)/src/math.js $(V8_DIR)/src/messages.js $(V8_DIR)/src/apinatives.js $(V8_DIR)/src/date.js $(V8_DIR)/src/regexp.js $(V8_DIR)/src/json.js $(V8_DIR)/src/liveedit-debugger.js $(V8_DIR)/src/mirror-debugger.js $(V8_DIR)/src/debug-debugger.js diff --git a/repos/libports/lib/mk/qt5_webcore.mk b/repos/libports/lib/mk/qt5_webcore.mk index bcaaf6f77..97def54cf 100644 --- a/repos/libports/lib/mk/qt5_webcore.mk +++ b/repos/libports/lib/mk/qt5_webcore.mk @@ -23,7 +23,7 @@ QT_INCPATH := qtwebkit/Source/WebCore/dom # that's why they can be quite long # -all: $(REP_DIR)/src/lib/qt5/qtwebkit/Source/WebCore/generated/generated.tag +all: $(QT5_PORT_DIR)/src/lib/qt5/qtwebkit/Source/WebCore/generated/generated.tag # command names used by some of the extracted generator commands DEL_FILE := rm @@ -38,14 +38,14 @@ WEBCORE_DIR = $(QT5_CONTRIB_DIR)/qtwebkit/Source/WebCore # make the 'HOST_TOOLS' variable known include $(REP_DIR)/lib/mk/qt5_host_tools.mk -$(REP_DIR)/src/lib/qt5/qtwebkit/Source/WebCore/generated/generated.tag: $(HOST_TOOLS) +$(QT5_PORT_DIR)/src/lib/qt5/qtwebkit/Source/WebCore/generated/generated.tag: $(HOST_TOOLS) $(VERBOSE)mkdir -p $(dir $@) $(VERBOSE)bison -d -p xpathyy $(WEBCORE_DIR)/xml/XPathGrammar.y -o $(dir $@)/XPathGrammar.tab.c && $(MOVE) $(dir $@)/XPathGrammar.tab.c $(dir $@)/XPathGrammar.cpp && $(MOVE) $(dir $@)/XPathGrammar.tab.h $(dir $@)/XPathGrammar.h @# preprocess-idls.pl - $(VERBOSE)sed -e "s,^,$(QT5_CONTRIB_DIR)/,g" $(dir $@)/../idl_files > $(dir $@)/idl_files.tmp + $(VERBOSE)sed -e "s,^,$(QT5_CONTRIB_DIR)/,g" $(REP_DIR)/src/lib/qt5/qtwebkit/Source/WebCore/idl_files > $(dir $@)/idl_files.tmp $(VERBOSE)touch $(dir $@)/supplemental_dependency.tmp $(VERBOSE)export "QT5_CONTRIB_DIR=$(QT5_CONTRIB_DIR)" && perl -I$(WEBCORE_DIR)/bindings/scripts $(WEBCORE_DIR)/bindings/scripts/preprocess-idls.pl --defines $(DEFINES) --idlFilesList $(dir $@)/idl_files.tmp --supplementalDependencyFile $(dir $@)/supplemental_dependency.tmp --idlAttributesFile $(WEBCORE_DIR)/bindings/scripts/IDLAttributes.txt --preprocessor "$(MOC) -E"