azbesthu

ninja: Entering directory `C:/cygwin/home/Administrator/jan20/qtwebengine/out/Release'
[1/3] ACTION packed_resources: repack_locales_989756ddacc2ae413f5ee17bc7ad2245
        cd process\ && ( if not exist Makefile C:\Qt5.2.0-qtwe\bin\qmake.exe C:\cygwin\home\Administrator\jan20\qtwebengine\src\process\proc
ess.pro -o Makefile ) && nmake -f Makefile

Microsoft (R) Program Maintenance Utility Version 10.00.30319.01
Copyright (C) Microsoft Corporation.  All rights reserved.

        nmake -f Makefile.Release

azbesthu

diff --git a/src/core/javascript_dialog_controller.h b/src/core/javascript_dialog_controller.h
index e92bc80..b0d598a 100644
--- a/src/core/javascript_dialog_controller.h
+++ b/src/core/javascript_dialog_controller.h
@@ -46,7 +46,7 @@

 QT_FORWARD_DECLARE_CLASS(QString)

-struct JavaScriptDialogControllerPrivate;
+class JavaScriptDialogControllerPrivate;

azbesthu

diff --git a/tools/qmake/mkspecs/features/gyp_generator.prf b/tools/qmake/mkspecs/features/gyp_generator.prf
index b1dcac1..20cde1d 100644
--- a/tools/qmake/mkspecs/features/gyp_generator.prf
+++ b/tools/qmake/mkspecs/features/gyp_generator.prf
@@ -11,7 +11,7 @@ defineReplace(mocAction) {
     OUTPUT_NAME = $$mocOutput($$INPUT_FILE)
     DEFINES_LIST = $$join(DEFINES, " -D", -D)
     INCPATH = $$join(INCLUDEPATH, " -I", -I)
-    MOC_COMMAND = $$mocCmdBase()
+    MOC_COMMAND = $$clean_path($$mocCmdBase())

azbesthu

diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf
index 0d0d379..7390722 100644
--- a/tools/qmake/mkspecs/features/functions.prf
+++ b/tools/qmake/mkspecs/features/functions.prf
@@ -29,7 +29,7 @@ defineReplace(findMocables) {
   for (file, input): \
       infiles += $$absolute_path($$file, $$_PRO_FILE_PWD_)
   mocables = $$system("python $$QTWEBENGINE_ROOT/tools/buildscripts/find-mocables $$infiles")
-  mocables = $$replace(mocables, $$_PRO_FILE_PWD_$${QMAKE_DIR_SEP}, '')
+  mocables = $$replace(mocables, $$_PRO_FILE_PWD_/, '')

azbesthu

diff --git a/patches/0001-GRIT-Allow-grd-files-outside-of-chromium-source-dir.patch b/patches/0001-GRIT-Allow-grd-files-outside-of-chromium-source-dir.patch
index 0816dae..dc03d58 100644
--- a/patches/0001-GRIT-Allow-grd-files-outside-of-chromium-source-dir.patch
+++ b/patches/0001-GRIT-Allow-grd-files-outside-of-chromium-source-dir.patch
@@ -30,7 +30,7 @@ index 734c57a..33848b2 100755
          return value
      return ''
  
-@@ -427,6 +427,10 @@ class GritNode(base.Node):
+@@ -427,6 +427,11 @@ class GritNode(base.Node):

azbesthu

Administrator@WIN-D75BP9Q8L77 ~/qtwebengine
$ ./init-repository.py --upstream
CHROMIUM_SRC_DIR not set, using Chromium in/home/Administrator/qtwebengine/src/3rdparty_upstream/chromium
The authenticity of host '[codereview.qt-project.org]:29418 ([87.238.53.162]:29418)' can't be established.
RSA key fingerprint is 11:24:25:51:5d:ab:4f:b1:15:49:10:3a:68:6d:ec:0f.
Are you sure you want to continue connecting (yes/no)? yes
Warning: Permanently added '[codereview.qt-project.org]:29418,[87.238.53.162]:29418' (RSA) to the list of known hosts.
Permission denied (publickey).
Configuring git to ignore all submodules. Submodule changes will not show up in "git diff"!
Cloning into 'src/3rdparty_upstream/ninja'...

azbesthu

Administrator@WIN-3JHJHNDHK84 ~/jan14/qtwebengine
$ ./init-repository.py --upstream
CHROMIUM_SRC_DIR not set, using Chromium in/home/Administrator/jan14/qtwebengine/src/3rdparty_upstream/chromium
Permission denied (publickey).
Configuring git to ignore all submodules. Submodule changes will not show up in "git diff"!
Cloning into 'src/3rdparty_upstream/ninja'...
remote: Reusing existing pack: 7164, done.
remote: Counting objects: 11, done.
remote: Compressing objects: 100% (11/11), done.

azbesthu

Cygwin Package Information
Package                   Version                        Status
_autorebase               000446-1                       OK
_update-info-dir          01199-1                        OK
alternatives              1.3.30c-10                     OK
archivemail               0.9.0-1                        OK
asciidoc                  8.6.3-1                        OK
base-cygwin               3.3-1                          OK
base-files                4.1-1                          OK
bash                      4.1.10-4                       OK

azbesthu

Also some workaround needed for build

    Git init-repository
        MSysGit can't handle long paths, it's limited to 260 character. https://github.com/msysgit/msysgit/issues/52
        CygWin's git fails on checkout. http://cygwin.com/ml/cygwin/2013-10/msg00403.html
        Current workaround: Hacking init-repository on linux and copying the result to Windows.
            Have to find a better way!: It seems running cygwin with "run as administrator" can work.
            32bit cygwin need all python package to be installed, otherwise some git dependencie is missing

    QMAKE bug, undefined LIBAPP in makefile generated from .pro that has target=aux and config=staticlib

azbesthu

diff --git a/libvpx.gyp b/libvpx.gyp
index 8d84817..88731da 100644
--- a/libvpx.gyp
+++ b/libvpx.gyp
@@ -404,6 +404,7 @@
                 '-s', '<(PRODUCT_DIR)/obj/libvpx_asm_offsets_vp8/vp8_asm_enc_offsets.obj',
                 '-s', '<(ninja_obj_dir)/encoder/libvpx_asm_offsets_vp8.vp8_asm_enc_offsets.obj',
                 '-s', '<(PRODUCT_DIR)/obj/Source/WebKit/chromium/third_party/libvpx/<(libvpx_source)/vp8/encoder/libvpx_asm_offsets_vp8.vp8_asm_enc_offsets.obj',
+                '-s', '<(PRODUCT_DIR)/obj/src/3rdparty_upstream/chromium/third_party/libvpx/<(libvpx_source)/vp8/encoder/libvpx_asm_offsets_vp8.vp8_asm_enc_offsets.obj',
               ],