From 78278ae57d254241a50abe0acf59b14c2a2fd85a Mon Sep 17 00:00:00 2001 From: LePresidente Date: Mon, 29 Apr 2019 10:30:47 +0200 Subject: [PATCH 1/2] Support Appveyor. --- appveyor.yml | 36 ++++++++++++++++++++++++++++++++++++ src/proxy/CMakeLists.txt | 4 ++-- src/runner/CMakeLists.txt | 2 +- 3 files changed, 39 insertions(+), 3 deletions(-) create mode 100644 appveyor.yml diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 0000000..4fb88d7 --- /dev/null +++ b/appveyor.yml @@ -0,0 +1,36 @@ +version: 1.0.{build} +skip_branch_with_pr: true +image: Visual Studio 2017 +environment: + WEBHOOK_URL: + secure: gOKbXaZM9ImtMD5XrYITvdyZUW/az082G9OIN1EC1Vbg57wBaeLhi49uGjxPw5GVujHku6kxN6ab89zhbS5GVeluR76GM83IbKV4Sh7udXzoYZZdg6YudtYHzdhCgUeiedpswbuczTq9ceIkkfSEWZuh/lMAAVVwvcGsJAnoPFw= +build_script: +- cmd: >- + git clone --depth=1 --branch=%APPVEYOR_REPO_BRANCH% https://github.com/ModOrganizer2/modorganizer-umbrella.git c:\projects\modorganizer-umbrella 2> $null + + mkdir c:\projects\modorganizer-build -type directory + + cd c:\projects\modorganizer-umbrella + + C:\Python37-x64\python.exe unimake.py -d c:\projects\modorganizer-build -s Appveyor_Build=True %APPVEYOR_PROJECT_NAME% +artifacts: +- path: vsbuild\src\proxy\RelWithDebInfo\uibase.dll + name: uibase_dll +- path: vsbuild\src\proxy\RelWithDebInfo\uibase.pdb + name: uibase_pdb +- path: vsbuild\src\proxy\RelWithDebInfo\uibase.lib + name: uibase_lib +- path: vsbuild\src\runner\RelWithDebInfo\pythonrunner.dll + name: pythonrunner_dll +- path: vsbuild\src\runner\RelWithDebInfo\pythonrunner.pdb + name: pythonrunner_pdb +- path: vsbuild\src\runner\RelWithDebInfo\pythonrunner.lib + name: pythonrunner_lib +on_success: + - ps: Set-Location -Path $env:APPVEYOR_BUILD_FOLDER + - ps: Invoke-RestMethod https://raw.githubusercontent.com/DiscordHooks/appveyor-discord-webhook/master/send.ps1 -o send.ps1 + - ps: ./send.ps1 success $env:WEBHOOK_URL +on_failure: + - ps: Set-Location -Path $env:APPVEYOR_BUILD_FOLDER + - ps: Invoke-RestMethod https://raw.githubusercontent.com/DiscordHooks/appveyor-discord-webhook/master/send.ps1 -o send.ps1 + - ps: ./send.ps1 failure $env:WEBHOOK_URL \ No newline at end of file diff --git a/src/proxy/CMakeLists.txt b/src/proxy/CMakeLists.txt index b5fb803..ff53fef 100644 --- a/src/proxy/CMakeLists.txt +++ b/src/proxy/CMakeLists.txt @@ -25,7 +25,7 @@ IF (Boost_FOUND) INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS}) ENDIF (Boost_FOUND) -SET(default_project_path "${CMAKE_SOURCE_DIR}/../..") +SET(default_project_path "${DEPENDENCIES_DIR}/modorganizer_super") GET_FILENAME_COMPONENT(${default_project_path} ${default_project_path} REALPATH) SET(project_path "${default_project_path}" CACHE PATH "path to the other mo projects") @@ -34,7 +34,7 @@ SET(lib_path "${project_path}/../../install/libs") ADD_DEFINITIONS(-DUNICODE -D_UNICODE) INCLUDE_DIRECTORIES(${project_path}/uibase/src - ${project_path}/plugin_python/src/runner/ + ${CMAKE_SOURCE_DIR}/src/runner/ ${PYTHON_ROOT}/Include) LINK_DIRECTORIES(${lib_path}) diff --git a/src/runner/CMakeLists.txt b/src/runner/CMakeLists.txt index 1c37997..e237e07 100644 --- a/src/runner/CMakeLists.txt +++ b/src/runner/CMakeLists.txt @@ -29,7 +29,7 @@ IF (Boost_FOUND) INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS}) ENDIF (Boost_FOUND) -SET(default_project_path "${CMAKE_SOURCE_DIR}/..") +SET(default_project_path "${DEPENDENCIES_DIR}/modorganizer_super") GET_FILENAME_COMPONENT(${default_project_path} ${default_project_path} REALPATH) SET(project_path "${default_project_path}" CACHE PATH "path to the other mo projects") From 352e5c2103a5666ad0b55bc3bc82a1bd0840d11c Mon Sep 17 00:00:00 2001 From: LePresidente Date: Mon, 29 Apr 2019 14:07:19 +0200 Subject: [PATCH 2/2] Fixed artifacts for proxy_python. --- appveyor.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 4fb88d7..6069403 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -14,12 +14,12 @@ build_script: C:\Python37-x64\python.exe unimake.py -d c:\projects\modorganizer-build -s Appveyor_Build=True %APPVEYOR_PROJECT_NAME% artifacts: -- path: vsbuild\src\proxy\RelWithDebInfo\uibase.dll - name: uibase_dll -- path: vsbuild\src\proxy\RelWithDebInfo\uibase.pdb - name: uibase_pdb -- path: vsbuild\src\proxy\RelWithDebInfo\uibase.lib - name: uibase_lib +- path: vsbuild\src\proxy\RelWithDebInfo\plugin_python.dll + name: plugin_python_dll +- path: vsbuild\src\proxy\RelWithDebInfo\plugin_python.pdb + name: plugin_python_pdb +- path: vsbuild\src\proxy\RelWithDebInfo\plugin_python.lib + name: plugin_python_lib - path: vsbuild\src\runner\RelWithDebInfo\pythonrunner.dll name: pythonrunner_dll - path: vsbuild\src\runner\RelWithDebInfo\pythonrunner.pdb