From 9a4ed0da0d5285f2e1918d55a6d14420b7f45d97 Mon Sep 17 00:00:00 2001 From: Koen Schmeets Date: Wed, 22 Mar 2017 21:33:42 +0100 Subject: [PATCH 1/3] Testing different appveyor.yml --- appveyor.yml | 43 ++++++++++++++++++------------------------- 1 file changed, 18 insertions(+), 25 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 95ecf6e..e56eaa3 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,32 +1,25 @@ -# http://www.appveyor.com/docs/appveyor-yml +os: Visual Studio 2015 +version: "{build}" +build: off +skip_tags: true -# Test against these versions of Io.js and Node.js. environment: - os: Visual Studio 2013 matrix: - # node.js - - nodejs_version: "6" -os: Previous Visual Studio 2013 + - nodejs_version: "7" + +platform: + - x86 + - x64 -# Install scripts. (runs after repo cloning) install: + - ps: Install-Product node $env:nodejs_version $env:platform + - npm -g i npm@latest + - set PATH=%APPDATA%\npm;%APPVEYOR_BUILD_FOLDER%\node_modules\.bin;%PATH% - set PATH=C:\Program Files (x86)\MSBuild\12.0\Bin;%PATH% - # Get the latest stable version of Node 0.STABLE.latest - - git submodule update --init - - ps: Install-Product node $env:nodejs_version - - npm -g install npm - # Typical npm stuff. - - npm install - -# Post-install test scripts. -test_script: - # Output useful info for debugging. - - node --version - - npm --version - - npm test - -# Don't actually build. -build: off + - npm i --ignore-scripts + - for /f %%i in ('node -v') do set exact_nodejs_version=%%i + - git submodule update --init --recursive + - cmake-js.cmd compile -# Set build version format here instead of in the admin panel. -version: "{build}" \ No newline at end of file +on_success: + - for %%i in (prebuilds\*) do appveyor PushArtifact %%i From d9521fbdff25c64b0a723089250010a9f18500b7 Mon Sep 17 00:00:00 2001 From: Koen Schmeets Date: Wed, 22 Mar 2017 21:35:48 +0100 Subject: [PATCH 2/3] Update CMakeLists.txt --- CMakeLists.txt | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9d67374..12f44d8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,8 +17,17 @@ project(node-iohook) if(WIN32 OR WIN64) #add libuihook project - add_subdirectory(libuiohook ${CMAKE_CURRENT_SOURCE_DIR}/build/libuiohook) - + set(_config_headers "${CMAKE_CURRENT_SOURCE_DIR}/libuiohook/include/config.h") + file(GLOB SOURCE_UIHOOK_FILES "${CMAKE_CURRENT_SOURCE_DIR}/libuiohook/src/logger.c" + "${CMAKE_CURRENT_SOURCE_DIR}/libuiohook/src/logger.h" + "${CMAKE_CURRENT_SOURCE_DIR}/src/windows/input_helper.h" + "${CMAKE_CURRENT_SOURCE_DIR}/src/windows/input_helper.c" + "${CMAKE_CURRENT_SOURCE_DIR}/src/windows/input_hook.c" + "${CMAKE_CURRENT_SOURCE_DIR}/src/windows/post_event.c" + "${CMAKE_CURRENT_SOURCE_DIR}/src/windows/system_properties.c") + add_library( "uiohook" STATIC ${SOURCE_UIHOOK_FILES} ) + set_target_properties("uiohook" PROPERTIES COMPILE_FLAGS "-Dinline=__inline -D_CRT_SECURE_NO_WARNINGS") + target_include_directories("uiohook" PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/libuiohook/include" "${CMAKE_CURRENT_SOURCE_DIR}/libuiohook/src" "${CMAKE_CURRENT_SOURCE_DIR}/libuiohook/windows") elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") #bootstrap and configure From 3194536102e84cadb749f1ed79d8e4901957f37f Mon Sep 17 00:00:00 2001 From: Koen Schmeets Date: Wed, 22 Mar 2017 21:50:05 +0100 Subject: [PATCH 3/3] Add uiohook.h --- CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 12f44d8..8b525a5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,7 +18,8 @@ project(node-iohook) if(WIN32 OR WIN64) #add libuihook project set(_config_headers "${CMAKE_CURRENT_SOURCE_DIR}/libuiohook/include/config.h") - file(GLOB SOURCE_UIHOOK_FILES "${CMAKE_CURRENT_SOURCE_DIR}/libuiohook/src/logger.c" + file(GLOB SOURCE_UIHOOK_FILES "${CMAKE_CURRENT_SOURCE_DIR}/libuiohook/include/uiohook.h" + "${CMAKE_CURRENT_SOURCE_DIR}/libuiohook/src/logger.c" "${CMAKE_CURRENT_SOURCE_DIR}/libuiohook/src/logger.h" "${CMAKE_CURRENT_SOURCE_DIR}/src/windows/input_helper.h" "${CMAKE_CURRENT_SOURCE_DIR}/src/windows/input_helper.c"