summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore1
m---------src/3rdparty0
-rw-r--r--src/core/core.gyp12
-rw-r--r--src/core/core_gyp_generator.pro6
-rw-r--r--src/core/gyp_run.pro2
-rw-r--r--src/core/qtwebengine.gypi2
-rw-r--r--src/core/resources/resources.gyp12
-rwxr-xr-xtools/buildscripts/gyp_qtwebengine5
-rw-r--r--tools/qmake/mkspecs/features/gyp_generator.prf24
9 files changed, 29 insertions, 35 deletions
diff --git a/.gitignore b/.gitignore
index 2a74d1302..21aab71d2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,7 +7,6 @@ src/core/Debug
src/core/Release
src/core/api/Release
src/core/api/Debug
-src/core/core_generated.gyp
src/core/gypfiles
examples/webengine/quicknanobrowser/quicknanobrowser
examples/webengine/quicknanobrowser/quicknanobrowser.app
diff --git a/src/3rdparty b/src/3rdparty
-Subproject 79930a541473b2e0f950d040c16ab6f22e4aeef
+Subproject 9d6566ee193e8996fb867cf776dc13f697400f2
diff --git a/src/core/core.gyp b/src/core/core.gyp
deleted file mode 100644
index ea5478cf1..000000000
--- a/src/core/core.gyp
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- 'targets': [
- {
- 'target_name': 'qtwebengine',
- 'type': 'none',
- 'dependencies': [
- 'core_generated.gyp:*',
- 'resources/resources.gyp:*',
- ],
- },
- ]
-}
diff --git a/src/core/core_gyp_generator.pro b/src/core/core_gyp_generator.pro
index 3fe66e41b..ec180d38e 100644
--- a/src/core/core_gyp_generator.pro
+++ b/src/core/core_gyp_generator.pro
@@ -2,8 +2,9 @@
# We want the gyp generation step to happen after all the other config steps. For that we need to prepend
# our gyp_generator.prf feature to the CONFIG variable since it is processed backwards
CONFIG = gyp_generator $$CONFIG
-GYPFILE = $$PWD/core_generated.gyp
-GYPINCLUDES += qtwebengine.gypi
+GYPFILE = $$OUT_PWD/core_generated.gyp
+GYPINCLUDES += $$PWD/qtwebengine.gypi
+GYPSRCDIR = $$PWD
TEMPLATE = lib
@@ -19,6 +20,7 @@ DEFINES += QT_NO_KEYWORDS \
# Ensure that response files, generated by qtbase/mkspecs/features/moc.prf, are found by moc.
MOC_DIR = $$OUT_PWD/$$getConfigDir()/.moc
+RCC_DIR = $$OUT_PWD/$$getConfigDir()/.rcc
# Assume that we want mobile touch and low-end hardware behaviors
# whenever we are cross compiling.
diff --git a/src/core/gyp_run.pro b/src/core/gyp_run.pro
index 36548ff6b..885df908c 100644
--- a/src/core/gyp_run.pro
+++ b/src/core/gyp_run.pro
@@ -120,7 +120,7 @@ contains(WEBENGINE_CONFIG, use_proprietary_codecs): GYP_CONFIG += proprietary_co
for (config, GYP_CONFIG): GYP_ARGS += "-D $$config"
!build_pass {
- message("Running gyp_qtwebengine \"$$OUT_PWD\" $${GYP_ARGS}...")
+ message("Running gyp_qtwebengine \"$$OUT_PWD\" $${GYP_ARGS}.")
!system("python $$QTWEBENGINE_ROOT/tools/buildscripts/gyp_qtwebengine \"$$OUT_PWD\" $${GYP_ARGS}"): error("-- running gyp_qtwebengine failed --")
}
diff --git a/src/core/qtwebengine.gypi b/src/core/qtwebengine.gypi
index fc5f17281..585f22324 100644
--- a/src/core/qtwebengine.gypi
+++ b/src/core/qtwebengine.gypi
@@ -36,7 +36,7 @@
'<(chromium_src_dir)/url/url.gyp:url_lib',
'<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8',
- 'chrome_qt.gyp:chrome_qt',
+ '<(qtwebengine_root)/src/core/chrome_qt.gyp:chrome_qt',
],
'include_dirs': [
'<(chromium_src_dir)',
diff --git a/src/core/resources/resources.gyp b/src/core/resources/resources.gyp
index c37172a5c..9dcdaf0d1 100644
--- a/src/core/resources/resources.gyp
+++ b/src/core/resources/resources.gyp
@@ -13,16 +13,16 @@
'qt_install_data%': '',
'qt_install_translations%': '',
},
- 'dependencies': [
- '<(chromium_src_dir)/content/app/strings/content_strings.gyp:content_strings',
- '<(chromium_src_dir)/blink/public/blink_resources.gyp:blink_resources',
- '<(chromium_src_dir)/content/browser/devtools/devtools_resources.gyp:devtools_resources',
- '../chrome_qt.gyp:chrome_resources',
- ],
'targets': [
{
'target_name': 'qtwebengine_resources',
'type': 'none',
+ 'dependencies': [
+ '<(chromium_src_dir)/content/app/strings/content_strings.gyp:content_strings',
+ '<(chromium_src_dir)/content/browser/devtools/devtools_resources.gyp:devtools_resources',
+ '<(chromium_src_dir)/third_party/WebKit/public/blink_resources.gyp:blink_resources',
+ '<(qtwebengine_root)/src/core/chrome_qt.gyp:chrome_resources',
+ ],
'actions' : [
{
'action_name': 'repack_resources',
diff --git a/tools/buildscripts/gyp_qtwebengine b/tools/buildscripts/gyp_qtwebengine
index ee09de973..d6f12ee2f 100755
--- a/tools/buildscripts/gyp_qtwebengine
+++ b/tools/buildscripts/gyp_qtwebengine
@@ -108,7 +108,8 @@ if __name__ == '__main__':
break
if not gyp_file_specified:
- args.append(os.path.join(root_dir, 'src/core/core.gyp'))
+ args.append(os.path.join(root_dir, 'src/core/resources/resources.gyp'))
+ args.append(os.path.join(output_dir, 'core_generated.gyp'))
args.extend(['-I' + i for i in additional_include_files(args)])
@@ -155,7 +156,7 @@ if __name__ == '__main__':
# Tweak the output location and format (hardcode ninja for now if not set)
args.extend(['--generator-output', '.'])
- args.extend(['-Goutput_dir='+ os.path.relpath(output_dir, qtwebengine_root)])
+ args.extend(['-Goutput_dir='+ purifyGypVarPath(os.path.relpath(output_dir, qtwebengine_root))])
# Tell gyp not to try finding cl.exe on Windows, Qt already requires the env to be set prior to the build.
args.extend(['-G', 'ninja_use_custom_environment_files'])
diff --git a/tools/qmake/mkspecs/features/gyp_generator.prf b/tools/qmake/mkspecs/features/gyp_generator.prf
index eea11ef09..b2be1bb2c 100644
--- a/tools/qmake/mkspecs/features/gyp_generator.prf
+++ b/tools/qmake/mkspecs/features/gyp_generator.prf
@@ -6,8 +6,8 @@ load(functions)
load(moc)
load(resources)
-MOC_GEN_DIR = <(SHARED_INTERMEDIATE_DIR)/moc
-RCC_GEN_DIR = <(SHARED_INTERMEDIATE_DIR)/rcc
+MOC_GEN_DIR = $$MOC_DIR
+RCC_GEN_DIR = $$RCC_DIR
defineReplace(mocAction) {
INPUT_FILE = $$1
@@ -21,11 +21,11 @@ defineReplace(mocAction) {
OUTPUT_FILE = $$MOC_GEN_DIR/$${OUTPUT_NAME}
contents = " {" \
" 'action_name':'$$OUTPUT_NAME'," \
- " 'inputs': ['$$INPUT_FILE',]," \
+ " 'inputs': ['$$GYPSRCDIR//$$INPUT_FILE',]," \
" 'outputs': ['$$OUTPUT_FILE',]," \
" 'action': ["
for(token, MOC_COMMAND): contents += " '$$replace(token,\',)',"
- contents += " '$$INPUT_FILE'," \
+ contents += " '$$GYPSRCDIR/$$INPUT_FILE'," \
" '-o'," \
" '$$OUTPUT_FILE'," \
" ]," \
@@ -42,14 +42,14 @@ defineReplace(rccAction) {
CLEAN_QMAKE_RCC = $$clean_path($$QMAKE_RCC)
contents = " {" \
" 'action_name':'$$OUTPUT_NAME'," \
- " 'inputs': ['$$INPUT_FILE',]," \
+ " 'inputs': ['$$GYPSRCDIR//$$INPUT_FILE',]," \
" 'outputs': ['$$OUTPUT_FILE',]," \
" 'action': [" \
" '$$replace(CLEAN_QMAKE_RCC,\',)',"
for(resource_flag, $$QMAKE_RESOURCE_FLAGS): contents += " '$$resource_flag',"
contents += " '-name'," \
" '$$EXTERN_FUNC'," \
- " '$$INPUT_FILE'," \
+ " '$$GYPSRCDIR/$$INPUT_FILE'," \
" '-o'," \
" '$$OUTPUT_FILE',"
contents += " ]," \
@@ -76,6 +76,12 @@ for (incl, GYPINCLUDES): GYP_CONTENTS += " '$$incl',"
GYP_CONTENTS += " ],"
}
+!isEmpty(GYPDEPENDENCIES) {
+GYP_CONTENTS += " 'dependencies': ["
+for (depend, GYPDEPENDENCIES): GYP_CONTENTS += " '$$depend',"
+GYP_CONTENTS += " ],"
+}
+
!isEmpty(QMAKE_FRAMEWORKPATH) {
GYP_CONTENTS += " 'mac_framework_dirs': ["
for(path, QMAKE_FRAMEWORKPATH): GYP_CONTENTS += " '$$path',"
@@ -107,8 +113,8 @@ GYP_CONTENTS += " ],"
# Source files to compile
GYP_CONTENTS += " 'sources': ["
-for (sourcefile, SOURCES): GYP_CONTENTS += " '$$sourcefile',"
-for (headerfile, HEADERS): GYP_CONTENTS += " '$$headerfile',"
+for (sourcefile, SOURCES): GYP_CONTENTS += " '$$GYPSRCDIR/$$sourcefile',"
+for (headerfile, HEADERS): GYP_CONTENTS += " '$$GYPSRCDIR/$$headerfile',"
# Add Sources generated by rcc from qrc files.
for (resourcefile, RESOURCES) {
@@ -128,8 +134,6 @@ for (mocable, MOCABLES) {
GYP_CONTENTS += " ],"
GYP_CONTENTS += " 'include_dirs': ["
for (path, INCLUDEPATH): GYP_CONTENTS += " '$$path',"
-# qmake already added MOC_DIR to INCLUDEPATH, but we're telling gyp to use a different one.
-GYP_CONTENTS += " '$$MOC_GEN_DIR',"
GYP_CONTENTS += " ],"
# Generate the actions for moc and rcc
View Lorry Controller Status