From 9f259be8661360d09e3ab3e8235b0927eae0082c Mon Sep 17 00:00:00 2001 From: Insineer Date: Mon, 9 Sep 2019 05:45:59 +0300 Subject: [PATCH] fix(build): add python lib to artifacts --- CI/appveyor/appveyor-release.yml | 8 ++++++-- CI/appveyor/vcpkg-patch/x64-windows-static.cmake | 8 ++++++++ CI/appveyor/vcpkg-patch/x86-windows-static.cmake | 8 ++++++++ 3 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 CI/appveyor/vcpkg-patch/x64-windows-static.cmake create mode 100644 CI/appveyor/vcpkg-patch/x86-windows-static.cmake diff --git a/CI/appveyor/appveyor-release.yml b/CI/appveyor/appveyor-release.yml index 1ad53df..f3c0124 100644 --- a/CI/appveyor/appveyor-release.yml +++ b/CI/appveyor/appveyor-release.yml @@ -31,17 +31,20 @@ install: - vcpkg integrate install - cd %APPVEYOR_BUILD_FOLDER% + - move /Y CI\appveyor\vcpkg-patch\*.* C:\Tools\vcpkg\triplets\ + + - vcpkg install "python3:%platform%-windows" - vcpkg install "python3:%platform%-windows-static" - vcpkg install "sfml:%platform%-windows-static" - vcpkg install "gtest:%platform%-windows-static" -cache: c:\tools\vcpkg\installed\ +cache: c:\tools\vcpkg\ after_build: - set BIN_FOLDER_SUFFIX=%platform% - if "%BIN_FOLDER_SUFFIX%"=="x86" (set BIN_FOLDER_SUFFIX=Win32) - - 7z a "OSS13-%platform%-%appveyor_build_version%.zip" "%APPVEYOR_BUILD_FOLDER%\bin\Release-%BIN_FOLDER_SUFFIX%\OSS13 Client.exe" "%APPVEYOR_BUILD_FOLDER%\bin\Release-%BIN_FOLDER_SUFFIX%\OSS13 Server.exe" Resources -ir!GameLogic\*.py Arialuni.ttf LICENSE README.md UsersDB + - 7z a "OSS13-%platform%-%appveyor_build_version%.zip" "%APPVEYOR_BUILD_FOLDER%\bin\Release-%BIN_FOLDER_SUFFIX%\OSS13 Client.exe" "%APPVEYOR_BUILD_FOLDER%\bin\Release-%BIN_FOLDER_SUFFIX%\OSS13 Server.exe" "C:\Tools\vcpkg\installed\%platform%-windows\bin\python37.dll" Resources -ir!GameLogic\*.py Arialuni.ttf LICENSE README.md UsersDB artifacts: - path: "OSS13-$(platform)-%appveyor_build_version%.zip" @@ -52,4 +55,5 @@ deploy: auth_token: secure: ZcnounehZDOonSsgvbGJvqxU+3N+s8nY6TvkQldbw7OWOjWujaExqvYoHsqsapgf force_update: true + prerelease: true artifacts: /.*\.zip diff --git a/CI/appveyor/vcpkg-patch/x64-windows-static.cmake b/CI/appveyor/vcpkg-patch/x64-windows-static.cmake new file mode 100644 index 0000000..674e77f --- /dev/null +++ b/CI/appveyor/vcpkg-patch/x64-windows-static.cmake @@ -0,0 +1,8 @@ +set(VCPKG_TARGET_ARCHITECTURE x64) +set(VCPKG_CRT_LINKAGE static) +set(VCPKG_LIBRARY_LINKAGE static) + +if("${PORT}" STREQUAL "python3") + set(VCPKG_CRT_LINKAGE dynamic) + set(VCPKG_LIBRARY_LINKAGE dynamic) +endif() diff --git a/CI/appveyor/vcpkg-patch/x86-windows-static.cmake b/CI/appveyor/vcpkg-patch/x86-windows-static.cmake new file mode 100644 index 0000000..674e77f --- /dev/null +++ b/CI/appveyor/vcpkg-patch/x86-windows-static.cmake @@ -0,0 +1,8 @@ +set(VCPKG_TARGET_ARCHITECTURE x64) +set(VCPKG_CRT_LINKAGE static) +set(VCPKG_LIBRARY_LINKAGE static) + +if("${PORT}" STREQUAL "python3") + set(VCPKG_CRT_LINKAGE dynamic) + set(VCPKG_LIBRARY_LINKAGE dynamic) +endif()