From c5d9fffa874ad6b949be74dc356e9871778c52cc Mon Sep 17 00:00:00 2001 From: x1nixmzeng Date: Tue, 13 Feb 2018 23:32:59 +0000 Subject: [PATCH 1/4] Fixed build configurations for ci --- build/win32/Cxbx.sln | 4 ---- 1 file changed, 4 deletions(-) diff --git a/build/win32/Cxbx.sln b/build/win32/Cxbx.sln index e6cbf0fc5..3f82208c0 100644 --- a/build/win32/Cxbx.sln +++ b/build/win32/Cxbx.sln @@ -52,25 +52,21 @@ Global {4A68E962-3805-4376-99D3-0AC59E9BEE69}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4A68E962-3805-4376-99D3-0AC59E9BEE69}.Debug|Any CPU.Build.0 = Debug|Any CPU {4A68E962-3805-4376-99D3-0AC59E9BEE69}.Debug|Win32.ActiveCfg = Debug|Any CPU - {4A68E962-3805-4376-99D3-0AC59E9BEE69}.Debug|Win32.Build.0 = Debug|Any CPU {4A68E962-3805-4376-99D3-0AC59E9BEE69}.Debug|x64.ActiveCfg = Debug|Any CPU {4A68E962-3805-4376-99D3-0AC59E9BEE69}.Debug|x64.Build.0 = Debug|Any CPU {4A68E962-3805-4376-99D3-0AC59E9BEE69}.Release|Any CPU.ActiveCfg = Release|Any CPU {4A68E962-3805-4376-99D3-0AC59E9BEE69}.Release|Any CPU.Build.0 = Release|Any CPU {4A68E962-3805-4376-99D3-0AC59E9BEE69}.Release|Win32.ActiveCfg = Release|Any CPU - {4A68E962-3805-4376-99D3-0AC59E9BEE69}.Release|Win32.Build.0 = Release|Any CPU {4A68E962-3805-4376-99D3-0AC59E9BEE69}.Release|x64.ActiveCfg = Release|Any CPU {4A68E962-3805-4376-99D3-0AC59E9BEE69}.Release|x64.Build.0 = Release|Any CPU {9131B025-5019-4DEE-84A3-86D2703A81C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9131B025-5019-4DEE-84A3-86D2703A81C0}.Debug|Any CPU.Build.0 = Debug|Any CPU {9131B025-5019-4DEE-84A3-86D2703A81C0}.Debug|Win32.ActiveCfg = Debug|Any CPU - {9131B025-5019-4DEE-84A3-86D2703A81C0}.Debug|Win32.Build.0 = Debug|Any CPU {9131B025-5019-4DEE-84A3-86D2703A81C0}.Debug|x64.ActiveCfg = Debug|Any CPU {9131B025-5019-4DEE-84A3-86D2703A81C0}.Debug|x64.Build.0 = Debug|Any CPU {9131B025-5019-4DEE-84A3-86D2703A81C0}.Release|Any CPU.ActiveCfg = Release|Any CPU {9131B025-5019-4DEE-84A3-86D2703A81C0}.Release|Any CPU.Build.0 = Release|Any CPU {9131B025-5019-4DEE-84A3-86D2703A81C0}.Release|Win32.ActiveCfg = Release|Any CPU - {9131B025-5019-4DEE-84A3-86D2703A81C0}.Release|Win32.Build.0 = Release|Any CPU {9131B025-5019-4DEE-84A3-86D2703A81C0}.Release|x64.ActiveCfg = Release|Any CPU {9131B025-5019-4DEE-84A3-86D2703A81C0}.Release|x64.Build.0 = Release|Any CPU {2171C0E8-4915-49B9-AC23-A484FA08C126}.Debug|Any CPU.ActiveCfg = Debug|Win32 From 3c12e74b5a9dc2027639c614c47543a0de3d5051 Mon Sep 17 00:00:00 2001 From: x1nixmzeng Date: Tue, 13 Feb 2018 23:43:45 +0000 Subject: [PATCH 2/4] Collect debugger files as build artifacts --- PackageBuild.bat | 1 + 1 file changed, 1 insertion(+) diff --git a/PackageBuild.bat b/PackageBuild.bat index 7bd370d0d..07d80eb12 100644 --- a/PackageBuild.bat +++ b/PackageBuild.bat @@ -16,6 +16,7 @@ set EXPORT_ZIP=export\%1.zip @call %ZIP_APP% a %EXPORT_ZIP% COPYING README.md cd %BUILD_PATH% @call ..\..\..\%ZIP_APP% u ..\..\..\%EXPORT_ZIP% Cxbx.exe glew32.dll subhook.dll +@call ..\..\..\%ZIP_APP% u ..\..\..\%EXPORT_ZIP% CxbxDebugger.exe capstone.dll cs_x86.dll cd /d %~dp0 echo Finished packaging %EXPORT_ZIP%! goto eof From ee64b50d6ece7d19e58c2ba40bfcc8817b526961 Mon Sep 17 00:00:00 2001 From: x1nixmzeng Date: Tue, 13 Feb 2018 23:44:39 +0000 Subject: [PATCH 3/4] Build all projects in the solution --- appveyor.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index eb47c60c3..29d9e6091 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -8,6 +8,9 @@ image: configuration: - Release - Debug +platform: + - Any CPU + - Win32 build: project: build/win32/Cxbx.sln parallel: true From b8a9d663b442f447eb3c820a34c3f38d9a475c76 Mon Sep 17 00:00:00 2001 From: x1nixmzeng Date: Wed, 14 Feb 2018 00:39:22 +0000 Subject: [PATCH 4/4] Updated the CI to package in a specific order --- PackageBuild.bat | 1 + appveyor.yml | 31 ++++++++++++++++++++++++------- 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/PackageBuild.bat b/PackageBuild.bat index 07d80eb12..7f7591120 100644 --- a/PackageBuild.bat +++ b/PackageBuild.bat @@ -1,6 +1,7 @@ @echo off @if "%1"=="" goto no_arg +@if "%~2"=="Any CPU" goto eof set BUILD_PATH=build\win32\%1\ diff --git a/appveyor.yml b/appveyor.yml index 29d9e6091..b583031e0 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,24 +1,41 @@ +# Documentation is here: https://www.appveyor.com/docs/appveyor-yml/ + init: - ps: Update-AppveyorBuild -Version "$env:appveyor_repo_commit" + branches: only: - - master + - master + image: -- Visual Studio 2017 + - Visual Studio 2017 + configuration: -- Release -- Debug + # The builds are run in this order + # Each configuration will compile all below platforms + - Release + - Debug + platform: + # Build the debugger and managed deps + # This must be done first! - Any CPU + # Build native binaries - Win32 + build: project: build/win32/Cxbx.sln parallel: true verbosity: minimal + after_build: - - cmd: PackageBuild.bat %CONFIGURATION% + # Pass in the build configuration and current platform + # The packager script does not need to gather during the "Any CPU" stage and will early-out + - cmd: PackageBuild.bat %CONFIGURATION% "%PLATFORM%" + artifacts: -- path: export/*.zip + - path: export/*.zip + install: - # Git clone happens between init and install + # Git clone happens between init and install - cmd: git submodule update --init --recursive