From fd61d752e313bf91a09c85020b3fb50067c610c8 Mon Sep 17 00:00:00 2001 From: Jocelyn Turcotte Date: Tue, 19 Nov 2013 17:55:49 +0100 Subject: Moving sources to src part 1: Move files. This only move files without adjusting any paths. This moves: - lib/quick -> src/webengine/api (API files) lib/quick -> src/webengine (other files) This contains the main QtWebEngine module library since . - lib/widgets -> src/webenginewidgets Also rename this directory to match its module name and rename Api to api. - lib -> src/core - process -> src/process - resources -> src/core/resources - tools/* -> tools/scripts/ The build directory is spread as follow: - build/build.pro -> src/core/gyp_run.pro - build/qmake_extras/* -> src/core/ (for the host and target .pro files) - build/qmake -> tools/qmake - Build related scripts -> tools/buildscripts Change-Id: I0cded1de772c99c0c1da6536c9afea353236b4a1 Reviewed-by: Zeno Albisser Reviewed-by: Pierre Rossi Reviewed-by: Andras Becsi --- src/core/core_gyp_generator.pro | 98 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) create mode 100644 src/core/core_gyp_generator.pro (limited to 'src/core/core_gyp_generator.pro') diff --git a/src/core/core_gyp_generator.pro b/src/core/core_gyp_generator.pro new file mode 100644 index 000000000..76924ecd4 --- /dev/null +++ b/src/core/core_gyp_generator.pro @@ -0,0 +1,98 @@ +# This is a dummy .pro file used to extract some aspects of the used configuration and feed them to gyp +# 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 +GYPDEPENDENCIES += <(chromium_src_dir)/content/browser/devtools/devtools_resources.gyp:devtools_resources +GYPINCLUDES += ../qtwebengine.gypi + +TEMPLATE = lib + +TARGET = Qt5WebEngineCore + +# gyp sets the default install name to /usr/local/lib and we need the module libraries to +# know its install_name so that they can let the dynamic linker load the core library. +# FIXME: Remove this and put it in qtwebengine.gypi once we can use a relative path to @loader_path. +macx: GYP_DYLIB_INSTALL_NAME_BASE = $$getOutDir()/$$getConfigDir() + +QT += qml quick +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/ + +# Defining keywords such as 'signal' clashes with the chromium code base. +DEFINES += QT_NO_KEYWORDS \ + Q_FORWARD_DECLARE_OBJC_CLASS=QT_FORWARD_DECLARE_CLASS + +# We need a way to tap into gyp´s Debug vs. Release configuration +PER_CONFIG_DEFINES = QTWEBENGINEPROCESS_PATH=\\\"$$getOutDir()/%config/$$QTWEBENGINEPROCESS_NAME\\\" + +# Keep Skia happy +CONFIG(release, debug|release): DEFINES += NDEBUG + +RESOURCES += lib_resources.qrc devtools.qrc +# We need this to find the include files generated for the .pak resource files. +INCLUDEPATH += $$absolute_path(../resources, $$PWD) + +# something fishy with qmake in 5.2 ? +INCLUDEPATH += $$[QT_INSTALL_HEADERS] + +SOURCES = \ + backing_store_qt.cpp \ + chromium_overrides.cpp \ + content_client_qt.cpp \ + content_browser_client_qt.cpp \ + delegated_frame_node.cpp \ + dev_tools_http_handler_delegate_qt.cpp \ + download_manager_delegate_qt.cpp \ + chromium_gpu_helper.cpp \ + javascript_dialog_manager_qt.cpp \ + process_main.cpp \ + render_widget_host_view_qt.cpp \ + resource_bundle_qt.cpp \ + resource_context_qt.cpp \ + url_request_context_getter_qt.cpp \ + web_contents_adapter.cpp \ + web_contents_delegate_qt.cpp \ + web_contents_view_qt.cpp \ + web_engine_context.cpp \ + web_event_factory.cpp \ + yuv_video_node.cpp + +HEADERS = \ + backing_store_qt.h \ + browser_context_qt.h \ + chromium_overrides.h \ + content_client_qt.h \ + content_browser_client_qt.h \ + delegated_frame_node.h \ + dev_tools_http_handler_delegate_qt.h \ + download_manager_delegate_qt.h \ + chromium_gpu_helper.h \ + javascript_dialog_manager_qt.h \ + process_main.h \ + render_widget_host_view_qt.h \ + render_widget_host_view_qt_delegate.h \ + resource_context_qt.h \ + url_request_context_getter_qt.h \ + web_contents_adapter.h \ + web_contents_adapter_client.h \ + web_contents_delegate_qt.h \ + web_contents_view_qt.h \ + web_engine_context.h \ + web_event_factory.h \ + yuv_video_node.h + +# It's difficult to convince the gyp/ninja combination to install the +# output, so use qmake for that purpose. We need to use target.extra +# rather than target.files since qmake is not convinced this file will +# exist after the build completes. +# FIXME: Remove this once we get rid of libQt5WebEngineCore.so and fold +# the object files into libQt5WebEngine.so instead. +unix { + OUTPUT_DIR = $$getOutDir()/$$getConfigDir() + target.extra = $(INSTALL_FILE) $$OUTPUT_DIR/lib/lib$${TARGET}.so $$[QT_INSTALL_LIBS] + target.path = $$[QT_INSTALL_LIBS] + INSTALLS += target +} -- cgit v1.2.3