azbesthu

FAILED: ninja -t msvc -e environment.x86 -- "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\cl.exe" /nologo /showIncludes /FC @o
bj\src\core\Qt5WebEngineCore.web_engine_library_info.obj.rsp /c ..\..\src\core\web_engine_library_info.cpp /Foobj\src\core\Qt5WebEngineCore.
web_engine_library_info.obj /Fdobj\src\core\Qt5WebEngineCore.pdb
c:\cygwin\home\administrator\febr11\qtwebengine\src\core\web_engine_library_info.cpp(160) : error C2039: 'DIR_CACHE' : is not a member of 'b
ase'
c:\cygwin\home\administrator\febr11\qtwebengine\src\core\web_engine_library_info.cpp(160) : error C2065: 'DIR_CACHE' : undeclared identifier

c:\cygwin\home\administrator\febr11\qtwebengine\src\core\web_engine_library_info.cpp(160) : error C2051: case expression not constant
c:\cygwin\home\administrator\febr11\qtwebengine\src\core\web_engine_library_info.cpp(163) : error C2039: 'DIR_HOME' : is not a member of 'ba
se'

azbesthu

https://groups.google.com/forum/#!topic/gyp-developer/qbz_Tx-tDAo
"I suspect it probably had to do with chrome.exe and chrome.dll having the same base name, but I can't find a comment/test to that effect."

https://chromiumcodereview.appspot.com/9424042/diff/9001/pylib/gyp/generator/ninja.py
"Support import libraries for Windows ninja"

.dll.lib used by intentionally

azbesthu

diff --git a/src/core/core_gyp_generator.pro b/src/core/core_gyp_generator.pro
index f067895..9d06eba 100644
--- a/src/core/core_gyp_generator.pro
+++ b/src/core/core_gyp_generator.pro
@@ -1,7 +1,8 @@
 # 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
+CONFIG = gyp_generator $$CONFIG

azbesthu

    default_variables.setdefault('SHARED_LIB_DIR',
                                 os.path.join('$!PRODUCT_DIR', 'lib'))

azbesthu

diff --git a/src/core/core_gyp_generator.pro b/src/core/core_gyp_generator.pro
index 53ce2db..fffdeb2 100644
--- a/src/core/core_gyp_generator.pro
+++ b/src/core/core_gyp_generator.pro
@@ -104,6 +104,13 @@ load(resolve_target)
 TARGET_NAME = $$basename(QMAKE_RESOLVED_TARGET)
 TARGET_NAME = $$replace(TARGET_NAME, .$${VERSION},)
 
+win32 {
+# Copy library to the location where other projects are looking for it.

azbesthu

$ git diff .
diff --git a/tools/qmake/mkspecs/features/gyp_generator.prf b/tools/qmake/mkspecs/features/gyp_generator.prf
index 20cde1d..ed87270 100644
--- a/tools/qmake/mkspecs/features/gyp_generator.prf
+++ b/tools/qmake/mkspecs/features/gyp_generator.prf
@@ -166,6 +166,42 @@ for(resourcefile, RESOURCES): GYP_CONTENTS += $$rccAction($$resourcefile)
 for(header, MOCABLE_HEADERS): GYP_CONTENTS += $$mocAction($$header)
 GYP_CONTENTS += "    ]," \
                 "  },"
+macx {

azbesthu

diff --git a/tools/qmake/mkspecs/features/gyp_generator.prf b/tools/qmake/mkspecs/features/gyp_generator.prf
index 20cde1d..1366244 100644
--- a/tools/qmake/mkspecs/features/gyp_generator.prf
+++ b/tools/qmake/mkspecs/features/gyp_generator.prf
@@ -164,10 +164,40 @@ GYP_CONTENTS += "    ],"
 GYP_CONTENTS += "    'actions': ["
 for(resourcefile, RESOURCES): GYP_CONTENTS += $$rccAction($$resourcefile)
 for(header, MOCABLE_HEADERS): GYP_CONTENTS += $$mocAction($$header)
-GYP_CONTENTS += "    ]," \
-                "  },"

azbesthu

diff --git a/src/process/process.pro b/src/process/process.pro
index cc68e3d..50a20e2 100644
--- a/src/process/process.pro
+++ b/src/process/process.pro
@@ -4,8 +4,12 @@ TEMPLATE = app
 macx {
     LIBPATH = $$getOutDir()/$$getConfigDir()
     CONFIG -= app_bundle
-} else:LIBPATH = $$getOutDir()/$$getConfigDir()/lib
-LIBS_PRIVATE += -L$$LIBPATH -lQt5WebEngineCore

azbesthu

diff --git a/src/core/gyp_run.pro b/src/core/gyp_run.pro
index 9ab8ff6..e88d97a 100644
--- a/src/core/gyp_run.pro
+++ b/src/core/gyp_run.pro
@@ -67,8 +67,25 @@ ninja.target = invoke_ninja
 ninja.commands = $$findOrBuildNinja() \$\(NINJAFLAGS\) -C $$getOutDir()/$$getConfigDir()
 QMAKE_EXTRA_TARGETS += ninja

+handle_lib.target = handle_core_library
+TARGETLIB = Qt5WebEngineCore

azbesthu

diff --git a/tools/scripts/git_submodule.py b/tools/scripts/git_submodule.py
index 6d2fbd1..1332184 100644
--- a/tools/scripts/git_submodule.py
+++ b/tools/scripts/git_submodule.py
@@ -45,7 +45,7 @@ import subprocess
 import sys
 import version_resolver as resolver
 
-extra_os = ['android', 'mac']
+extra_os = ['android', 'mac', 'win']