plastichub/nodeguy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Adds working qt run looper

Browse Source
This commit is contained in:
Atul R 2020-02-15 23:52:44 +01:00
parent cc3bf2f632
commit 9b4730cb9f
11 changed files with 102 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -7,4 +7,5 @@ dist
coverage
.DS_Store
/.idea/
/prebuilds
/prebuilds
miniqt

3
.npmignore
View File

@ -7,4 +7,5 @@ extras/*
!extras/legal
src/*
!src/cpp
prebuilds/*
prebuilds/*
miniqt/

3
CMakeLists.txt
View File

@ -174,6 +174,9 @@ target_include_directories(${CORE_WIDGETS_ADDON} PRIVATE
target_link_libraries(${CORE_WIDGETS_ADDON} PRIVATE
"${CMAKE_JS_LIB}"
Qt5::Widgets
Qt5::Core
Qt5::Gui
)

2
config/common.cmake
View File

@ -1,3 +1,5 @@
set(CMAKE_INCLUDE_CURRENT_DIR ON)
find_program(CCACHE_PROGRAM ccache)
if(CCACHE_PROGRAM)
set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")

92
config/qt.cmake
View File

@ -1,79 +1,27 @@
# Adds Qt support
# make sure you include this at the top of whichever Cmakelist file you are going to use.
# Need for automatic moc. Moc executable path is set in qt.cmake
# Need for automatic moc.
set(CMAKE_AUTOMOC ON)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(QT_VERSION_MAJOR 5)
set(QT_VERSION_MINOR 13)
add_executable(Qt5::moc IMPORTED)
set(CMAKE_AUTORCC ON)
set(CMAKE_AUTOUIC ON)
function(AddQtSupport addonName)
execute_process(COMMAND node -p "require('@nodegui/qode').qtHome"
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
OUTPUT_VARIABLE QT_HOME_DIR
)
if(DEFINED ENV{QT_INSTALL_DIR})
# Allows to use custom Qt installation via QT_INSTALL_DIR env variable
message(STATUS "Using Custom QT installation for ${addonName} QT_INSTALL_DIR:$ENV{QT_INSTALL_DIR}")
set(QT_HOME_DIR "$ENV{QT_INSTALL_DIR}")
endif()
macro(AddQtSupport addonName)
# execute_process(COMMAND node -p "require('@nodegui/qode').qtHome"
# WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
# OUTPUT_VARIABLE QT_HOME_DIR
# )
string(REPLACE "\n" "" QT_HOME_DIR "${QT_HOME_DIR}")
string(REPLACE "\"" "" QT_HOME_DIR "${QT_HOME_DIR}")
# if(DEFINED ENV{QT_INSTALL_DIR})
# # Allows to use custom Qt installation via QT_INSTALL_DIR env variable
# message(STATUS "Using Custom QT installation for ${addonName} QT_INSTALL_DIR:$ENV{QT_INSTALL_DIR}")
# set(QT_HOME_DIR "$ENV{QT_INSTALL_DIR}")
# endif()
if(APPLE)
set(CUSTOM_QT_MOC_PATH "${QT_HOME_DIR}/bin/moc")
target_include_directories(${addonName} PRIVATE
"${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"
)
target_link_libraries(${addonName} PRIVATE
"${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"
)
endif()
if (WIN32)
set(CUSTOM_QT_MOC_PATH "${QT_HOME_DIR}\\bin\\moc.exe")
target_include_directories(${addonName} PRIVATE
"${QT_HOME_DIR}\\include"
"${QT_HOME_DIR}\\include\\QtCore"
"${QT_HOME_DIR}\\include\\QtGui"
"${QT_HOME_DIR}\\include\\QtWidgets"
)
target_link_libraries(${addonName} PRIVATE
"${QT_HOME_DIR}\\lib\\Qt5Core.lib"
"${QT_HOME_DIR}\\lib\\Qt5Gui.lib"
"${QT_HOME_DIR}\\lib\\Qt5Widgets.lib"
)
endif()
if(UNIX AND NOT APPLE)
set(LINUX TRUE)
endif()
if(LINUX)
set(CUSTOM_QT_MOC_PATH "${QT_HOME_DIR}/bin/moc")
target_include_directories(${addonName} PRIVATE
"${QT_HOME_DIR}/include"
"${QT_HOME_DIR}/include/QtCore"
"${QT_HOME_DIR}/include/QtGui"
"${QT_HOME_DIR}/include/QtWidgets"
)
target_link_libraries(${addonName} PRIVATE
"${QT_HOME_DIR}/lib/libQt5Core.so"
"${QT_HOME_DIR}/lib/libQt5Gui.so"
"${QT_HOME_DIR}/lib/libQt5Widgets.so"
)
endif()
# set custom moc executable location
set_target_properties(Qt5::moc PROPERTIES IMPORTED_LOCATION "${CUSTOM_QT_MOC_PATH}")
endfunction(AddQtSupport addonName)
# string(REPLACE "\n" "" QT_HOME_DIR "${QT_HOME_DIR}")
# string(REPLACE "\"" "" QT_HOME_DIR "${QT_HOME_DIR}")
set(Qt5_DIR "/Users/atulr/Project/nodegui/nodegui/miniqt/5.15.0/clang_64/lib/cmake/Qt5")
find_package(Qt5 COMPONENTS Widgets Gui Core REQUIRED)
endmacro(AddQtSupport addonName)

34
package-lock.json generated
View File

@ -4,6 +4,21 @@
"lockfileVersion": 1,
"requires": true,
"dependencies": {
"7zip-bin": {
"version": "5.0.3",
"resolved": "https://registry.npmjs.org/7zip-bin/-/7zip-bin-5.0.3.tgz",
"integrity": "sha512-GLyWIFBbGvpKPGo55JyRZAo4lVbnBiD52cKlw/0Vt+wnmKvWJkpZvsjVoaIolyBXDeAQKSicRtqFNPem9w0WYA==",
"dev": true
},
"7zip-min": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/7zip-min/-/7zip-min-1.1.1.tgz",
"integrity": "sha512-GPTk3xycxB0NjRM1SKAUL7TWXjgFAyzwXkamkk5YgSLd6OneeWBw+fxULctrVr4XqPBBh+LyqpHlyj9ryfpqoQ==",
"dev": true,
"requires": {
"7zip-bin": "^5.0.3"
}
},
"@babel/code-frame": {
"version": "7.5.5",
"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.5.5.tgz",
@ -1119,6 +1134,19 @@
"progress": "^2.0.3"
}
},
"@nodegui/qt-installer": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/@nodegui/qt-installer/-/qt-installer-1.0.0.tgz",
"integrity": "sha512-Sy8CVkOTgzPfzQ3O3Dsc0ZETYpUCJ5Rq/Sd89x094x34Oivqgppl/JUky03aGgg56I64BRfuzK2R4LjTYk3Zmw==",
"dev": true,
"requires": {
"7zip-min": "^1.1.1",
"env-paths": "^2.2.0",
"make-dir": "^3.0.0",
"node-fetch": "^2.6.0",
"progress": "^2.0.3"
}
},
"@sindresorhus/is": {
"version": "0.14.0",
"resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz",
@ -7295,6 +7323,12 @@
"resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-2.0.0.tgz",
"integrity": "sha512-ASCL5U13as7HhOExbT6OlWJJUV/lLzL2voOSP1UVehpRD8FbSrSDjfScK/KwAvVTI5AS6r4VwbOMlIqtvRidnA=="
},
"node-fetch": {
"version": "2.6.0",
"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz",
"integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==",
"dev": true
},
"node-gyp": {
"version": "6.1.0",
"resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-6.1.0.tgz",

2
package.json
View File

@ -10,6 +10,7 @@
"scripts": {
"dev": "npm run build && qode dist/demo.js",
"build": "tsc && npm run build:addon",
"preinstall": "node ./scripts/preinstall.js",
"postinstall": "cross-env node ./scripts/skip.js || npm run prebuild:install || npm run build:addon",
"build:addon": "cross-env CMAKE_BUILD_PARALLEL_LEVEL=8 cmake-js compile",
"prebuild:install": "prebuild-install --backend=cmake-js --runtime=napi --verbose",
@ -28,6 +29,7 @@
"prebuild-install": "^5.3.3"
},
"devDependencies": {
"@nodegui/qt-installer": "^1.0.0",
"@types/bindings": "^1.3.0",
"@types/jest": "^25.1.1",
"@types/node": "^13.1.2",

13
scripts/preinstall.js Normal file
View File

@ -0,0 +1,13 @@
const { setupQt } = require('@nodegui/qt-installer');
const path = require('path');
const qtDir = path.resolve(__dirname, '..', 'miniqt');
setupQt({
qtDir,
downloadLink:
'https://download.qt.io/online/qtsdkrepository/mac_x64/desktop/qt5_5150/qt.qt5.5150.clang_64/5.15.0-0-202002122005qtbase-MacOS-MacOS_10_13-Clang-MacOS-MacOS_10_13-X86_64.7z',
osType: 'darwin',
}).catch(err => {
throw err;
});

11
src/cpp/include/nodegui/core/Integration/integration.h
View File

@ -1,14 +1,5 @@
#pragma once
// From Qode headers
namespace qode {
typedef bool (*QodeInjectedRunLoopFunc)();
extern QodeInjectedRunLoopFunc qode_run_loop;
extern int qode_argc;
extern char **qode_argv;
extern void InjectQodeRunLoop(QodeInjectedRunLoopFunc runLoop);
} // namespace qode
#include "qode-api.h"
namespace qodeIntegration {
void integrate();
}

11
src/cpp/include/nodegui/core/Integration/qode-api.h Normal file
View File

@ -0,0 +1,11 @@
#pragma once
// From Qode headers
namespace qode {
extern int qode_argc;
extern char **qode_argv;
typedef bool (*QodeInjectedRunLoopFunc)();
extern QodeInjectedRunLoopFunc qode_run_uv_loop_once;
extern QodeInjectedRunLoopFunc qode_run_gui_loop;
extern void InjectQodeRunLoop(QodeInjectedRunLoopFunc runLoop);
extern void InjectQodeRunUvLoopOnce(QodeInjectedRunLoopFunc runUvLoopOnce);
} // namespace qode

18
src/cpp/lib/core/Integration/integration.cpp
View File

@ -7,8 +7,14 @@ namespace qodeIntegration {
static NApplication* app;
bool QtRunLoopWrapper() {
if(qode::qode_run_uv_loop_once){
// Run uv loop once to start all the node integration things
qode::qode_run_uv_loop_once();
}
int exitCode = app->exec();
exit(exitCode);
if(exitCode != 0){
exit(exitCode);
}
return false;
}
@ -17,10 +23,10 @@ void integrate() {
app = new NApplication(qode::qode_argc, qode::qode_argv);
qode::InjectQodeRunLoop(&QtRunLoopWrapper);
// Other init settings
QFont f = QApplication::font();
if (f.defaultFamily().isEmpty()) {
f.setFamily("Sans-Serif");
QApplication::setFont(f);
}
// QFont f = QApplication::font();
// if (f.defaultFamily().isEmpty()) {
// f.setFamily("Sans-Serif");
// QApplication::setFont(f);
// }
}
} // namespace qodeIntegration