Moving sources to src part 2: Adjust paths.

NOTE: To build after this you should rerun init-repository.py or run
$> git submodule sync
$> git submodule update
$> git config qtwebengine.chromiumsrcdir src/3rdparty

This makes everything build by adjusting paths.

Other mixed-in changes:
- Rename qtwebengine_src variables in scripts to qtwebengine_root to
  avoid confusion.
- Cleanup the release and debug extra targets that were in lib.pro.
  This file has also been split into src.pro and core.pro.

Change-Id: Ieee9158a65f526b15244eaca59e779b7069d337e
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>

9 files changed, 35 insertions, 15 deletions

diff --git a/src/core/core.pro b/src/core/core.pro
new file mode 100644
index 000000000..b6a856545
--- /dev/null
+++ b/src/core/core.pro
@@ -0,0 +1,22 @@
+TEMPLATE = subdirs
+
+# core_gyp_generator.pro is a dummy .pro file that is used by qmake
+# to generate our main .gyp file
+core_gyp_generator.file = core_gyp_generator.pro
+
+# gyp_configure_host.pro and gyp_configure_target.pro are phony pro files that
+# extract things like compiler and linker from qmake
+gyp_configure_host.file = gyp_configure_host.pro
+gyp_configure_target.file = gyp_configure_target.pro
+gyp_configure_target.depends = gyp_configure_host
+
+# gyp_run.pro calls gyp through gyp_qtwebengine on the qmake step, and ninja on the make step.
+gyp_run.file = gyp_run.pro
+
+gyp_run.depends = resources core_gyp_generator gyp_configure_host gyp_configure_target
+
+SUBDIRS += core_gyp_generator \
+           gyp_configure_host \
+           gyp_configure_target \
+           gyp_run \
+           resources \
diff --git a/src/core/core_gyp_generator.pro b/src/core/core_gyp_generator.pro
index 76924ecd4..a4128fc72 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.gyp
 GYPDEPENDENCIES += <(chromium_src_dir)/content/browser/devtools/devtools_resources.gyp:devtools_resources
-GYPINCLUDES += ../qtwebengine.gypi
+GYPINCLUDES += qtwebengine.gypi
 
 TEMPLATE = lib
 
@@ -19,7 +20,7 @@ QT_PRIVATE += qml-private quick-private gui-private core-private
 qtHaveModule(v8): QT_PRIVATE += v8-private
 
 COPY_FILES = <(SHARED_INTERMEDIATE_DIR)/webkit/devtools_resources.pak
-COPY_DESTINATIONS = ../resources/
+COPY_DESTINATIONS = resources/
 
 # Defining keywords such as 'signal' clashes with the chromium code base.
 DEFINES += QT_NO_KEYWORDS \
@@ -31,9 +32,9 @@ PER_CONFIG_DEFINES = QTWEBENGINEPROCESS_PATH=\\\"$$getOutDir()/%config/$$QTWEBEN
 # Keep Skia happy
 CONFIG(release, debug|release): DEFINES += NDEBUG
 
-RESOURCES += lib_resources.qrc devtools.qrc
+RESOURCES += core_resources.qrc devtools.qrc
 # We need this to find the include files generated for the .pak resource files.
-INCLUDEPATH += $$absolute_path(../resources, $$PWD)
+INCLUDEPATH += $$absolute_path(resources, $$PWD)
 
 # something fishy with qmake in 5.2 ?
 INCLUDEPATH += $$[QT_INSTALL_HEADERS]
diff --git a/src/core/core_resources.qrc b/src/core/core_resources.qrc
index af8448d2b..9dbdf90af 100644
--- a/src/core/core_resources.qrc
+++ b/src/core/core_resources.qrc
@@ -1,5 +1,5 @@
 <!DOCTYPE RCC><RCC version="1.0">
 <qresource prefix="data">
-    <file alias="resources.pak">../resources/net_resources.pak</file>
+    <file alias="resources.pak">resources/net_resources.pak</file>
 </qresource>
 </RCC>
diff --git a/src/core/devtools.qrc b/src/core/devtools.qrc
index 225f88f65..96d24761d 100644
--- a/src/core/devtools.qrc
+++ b/src/core/devtools.qrc
@@ -1,6 +1,6 @@
 <!DOCTYPE RCC><RCC version="1.0">
 <qresource prefix="data">
-    <file alias="devtools.pak">../resources/devtools_resources.pak</file>
-    <file alias="discovery_page.html">../resources/devtools_discovery_page.html</file>
+    <file alias="devtools.pak">resources/devtools_resources.pak</file>
+    <file alias="discovery_page.html">resources/devtools_discovery_page.html</file>
 </qresource>
 </RCC>
diff --git a/src/core/gyp_configure_host.pro b/src/core/gyp_configure_host.pro
index e99d1e7c5..3eb67389f 100644
--- a/src/core/gyp_configure_host.pro
+++ b/src/core/gyp_configure_host.pro
@@ -10,7 +10,7 @@ GYPI_CONTENTS = "{" \
                 "    ['CXX.host', '$$which($$QMAKE_CXX)']," \
                 "    ['LD.host', '$$which($$QMAKE_LINK)'],"
 
-GYPI_FILE = $$absolute_path('build/qmake_extras.gypi', $$QTWEBENGINE_ROOT)
+GYPI_FILE = $$absolute_path('qmake_extras.gypi')
 !build_pass {
     write_file($$GYPI_FILE, GYPI_CONTENTS)
 }
diff --git a/src/core/gyp_configure_target.pro b/src/core/gyp_configure_target.pro
index 6d9f414c3..4d5204407 100644
--- a/src/core/gyp_configure_target.pro
+++ b/src/core/gyp_configure_target.pro
@@ -26,9 +26,9 @@ GYPI_CONTENTS += "        ]," \
 
 GYPI_CONTENTS += "}"
 
-GYPI_FILE = $$absolute_path('build/qmake_extras.gypi', $$QTWEBENGINE_ROOT)
+GYPI_FILE = $$absolute_path('qmake_extras.gypi')
 
-!exists($$GYPI_FILE): error("-- $$GYPI not found --")
+!exists($$GYPI_FILE): error("-- $$GYPI_FILE not found --")
 
 # Append to the file already containing the host settings.
 !build_pass {
diff --git a/src/core/gyp_run.pro b/src/core/gyp_run.pro
index e0c8b4af1..1ee0b1bce 100644
--- a/src/core/gyp_run.pro
+++ b/src/core/gyp_run.pro
@@ -46,7 +46,7 @@ cross_compile {
 
 !build_pass {
   message(Running gyp_qtwebengine $${GYP_ARGS}...)
-  !system("python ./gyp_qtwebengine $${GYP_ARGS}"): error("-- running gyp_qtwebengine failed --")
+  !system("python $$QTWEBENGINE_ROOT/tools/buildscripts/gyp_qtwebengine $${GYP_ARGS}"): error("-- running gyp_qtwebengine failed --")
 }
 
 ninja.target = invoke_ninja
diff --git a/src/core/render_widget_host_view_qt.cpp b/src/core/render_widget_host_view_qt.cpp
index 91e9ab585..e2df54afe 100644
--- a/src/core/render_widget_host_view_qt.cpp
+++ b/src/core/render_widget_host_view_qt.cpp
@@ -53,7 +53,6 @@
 #include "content/browser/renderer_host/ui_events_helper.h"
 #include "content/common/gpu/gpu_messages.h"
 #include "content/common/view_messages.h"
-#include "lib/type_conversion.h"
 #include "third_party/WebKit/public/web/WebCursorInfo.h"
 #include "ui/base/events/event.h"
 #include "ui/gfx/size_conversions.h"
diff --git a/src/core/resources/resources.pro b/src/core/resources/resources.pro
index a9404f3ec..b0eba1246 100644
--- a/src/core/resources/resources.pro
+++ b/src/core/resources/resources.pro
@@ -2,6 +2,4 @@
 # These files will then be bundled using the Qt Resource System.
 TEMPLATE = aux
 
-system(python ../build/scripts/build_resources.py)
-
-
+system("python $$QTWEBENGINE_ROOT/tools/buildscripts/build_resources.py")