From a566b01b7a52c7b581e6eb45b035027a75fdd997 Mon Sep 17 00:00:00 2001
From: Atul R <atulanand94@gmail.com>
Date: Sat, 20 Jul 2019 00:03:35 +0200
Subject: [PATCH] Adds symlink step so that qt builds nicely

---
 config/common.gypi | 38 ++++++++++++++++++++++++++------------
 package.json       | 10 +++++-----
 yarn.lock          |  8 ++++----
 3 files changed, 35 insertions(+), 21 deletions(-)

diff --git a/config/common.gypi b/config/common.gypi
index 5f0761320..7807dc383 100644
--- a/config/common.gypi
+++ b/config/common.gypi
@@ -2,7 +2,7 @@
     'includes': [],
     'type': 'shared_library',
     'variables': {
-        'qt_home_dir%': "<!(node -p \"require('@nodegui/test').include\")",
+        'qt_home_dir%': "<!(node -p \"require('@nodegui/test').qtHome\")",
     },
     'target_defaults': {
         'cflags!': ['-fno-exceptions'],
@@ -26,20 +26,34 @@
                     'MACOSX_DEPLOYMENT_TARGET': '10.7',
                     'OTHER_CFLAGS': ['-std=c++14'],
                 },
+                'actions':[
+                    {
+                        'action_name': 'symlink_qt_headers',
+                        'inputs': [],
+                        'outputs': [
+                            '<(qt_home_dir)/include/QtCore',
+                            '<(qt_home_dir)/include/QtGui',
+                            '<(qt_home_dir)/include/QtWidgets',
+                        ],
+                        'action': [
+                            'sh', '-c',
+                            'mkdir -p <(qt_home_dir)/include && \
+                            ln -sfn <(qt_home_dir)/lib/QtCore.framework/Versions/5/Headers <(qt_home_dir)/include/QtCore && \
+                            ln -sfn <(qt_home_dir)/lib/QtGui.framework/Versions/5/Headers <(qt_home_dir)/include/QtGui && \
+                            ln -sfn <(qt_home_dir)/lib/QtWidgets.framework/Versions/5/Headers <(qt_home_dir)/include/QtWidgets'
+                        ],
+                    }
+                ],
                 'include_dirs': [
-                    # install qt via homebrew only
-                    # '<(qt_home_dir)/include',
-                    # '<(qt_home_dir)/include/QtCore',
-                    # '<(qt_home_dir)/include/QtGui',
-                    # '<(qt_home_dir)/include/QtWidgets',
-                    '<(qt_home_dir)/lib/QtCore.framework/Headers',
-                    '<(qt_home_dir)/lib/QtGui.framework/Headers',
-                    '<(qt_home_dir)/lib/QtWidgets.framework/Headers',
+                    '<(qt_home_dir)/include',
+                    '<(qt_home_dir)/lib/QtCore.framework/Versions/5/Headers',
+                    '<(qt_home_dir)/lib/QtGui.framework/Versions/5/Headers',
+                    '<(qt_home_dir)/lib/QtWidgets.framework/Versions/5/Headers',
                 ],
                 'libraries': [
-                    '<(qt_home_dir)/lib/QtCore.framework/QtCore',
-                    '<(qt_home_dir)/lib/QtGui.framework/QtGui',
-                    '<(qt_home_dir)/lib/QtWidgets.framework/QtWidgets',
+                    '<(qt_home_dir)/lib/QtCore.framework/Versions/5/QtCore',
+                    '<(qt_home_dir)/lib/QtGui.framework/Versions/5/QtGui',
+                    '<(qt_home_dir)/lib/QtWidgets.framework/Versions/5/QtWidgets',
                 ],
             }],
             ['OS=="linux"', {
diff --git a/package.json b/package.json
index 742cf7484..bb9cc1c8c 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
   "license": "MIT",
   "private": false,
   "devDependencies": {
-    "@nodegui/test": "^0.0.8",
+    "@nodegui/test": "^0.0.9",
     "@types/bindings": "^1.3.0",
     "@types/lodash": "^4.14.130",
     "@types/node": "^12.0.2",
@@ -19,13 +19,13 @@
     "typescript": "^3.4.5"
   },
   "scripts": {
-    "build": "npm run build:addon && npm run build:lib",
+    "dev": "npm run build && qode dist/demo.js",
+    "postinstall": "npm run build",
+    "build": "npm run build:lib && npm run build:addon",
     "build:lib": "tsc",
     "build:addon": "node-gyp -j 8 build",
     "rebuild:addon": "node-gyp -j 8 rebuild",
-    "clean": "rm -rf ./dist ./build",
-    "automoc": "node ./scripts/automoc.js",
-    "dev": "tsc && qode dist/demo.js"
+    "automoc": "node ./scripts/automoc.js"
   },
   "dependencies": {
     "bindings": "^1.5.0",
diff --git a/yarn.lock b/yarn.lock
index cda4f9417..3125522c8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@nodegui/test@^0.0.8":
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/@nodegui/test/-/test-0.0.8.tgz#a67e261700d635668b2b5a9d6572fedab9dcb037"
-  integrity sha512-3+xlopDrZBATp3Fj4MheJJV+xvYH0erftb5PP65UTZELPDDp4PnTygcTrSvKz0vPn68sa7AbkFM69hoEqMH/Sg==
+"@nodegui/test@^0.0.9":
+  version "0.0.9"
+  resolved "https://registry.yarnpkg.com/@nodegui/test/-/test-0.0.9.tgz#5ec1d94d3f41531973b44f2a455f8c5afa3c4b11"
+  integrity sha512-0LN0XmP/flS9m/YjXJMiwOZyLjCuaoY/Sl0dseMZKRmLK5L55yyAA2DZxXmtqwiwjOoJXXjDBpqIvFflxSaKLA==
   dependencies:
     extract-zip "^1.6.7"
     fs-extra "^8.1.0"