Merge pull request #919 from x1nixmzeng/package-debugger

Added debugger to published build artifacts
This commit is contained in:
PatrickvL 2018-02-14 22:22:05 +01:00 committed by GitHub
commit 87c57c942a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 50 additions and 45 deletions

39
GatherArtifacts.bat Normal file
View File

@ -0,0 +1,39 @@
:: Cxbx-Reloaded artifact script
@if "%1"=="" goto no_arg
@set ZIP_APP=%cd%\import\7za\7za.exe
@set BUILD_PATH=%cd%\build\win32\%1\
@set ARTIFACT_PATH=%cd%\export\%1.zip
:: Add generic resources
@call %ZIP_APP% u %ARTIFACT_PATH% COPYING 1> nul
@call %ZIP_APP% u %ARTIFACT_PATH% README.md 1> nul
:: Check for build resources
@if not exist %BUILD_PATH% goto missing_build
@pushd %BUILD_PATH%
:: Add Cxbx binaries
@call %ZIP_APP% u %ARTIFACT_PATH% Cxbx.exe 1> nul
@call %ZIP_APP% u %ARTIFACT_PATH% glew32.dll 1> nul
@call %ZIP_APP% u %ARTIFACT_PATH% subhook.dll 1> nul
:: Add debugger binaries
@call %ZIP_APP% u %ARTIFACT_PATH% CxbxDebugger.exe 1> nul
@call %ZIP_APP% u %ARTIFACT_PATH% capstone.dll 1> nul
@call %ZIP_APP% u %ARTIFACT_PATH% cs_x86.dll 1> nul
@popd
@goto eof
:missing_build
@echo Missing build directory %BUILD_PATH%
@goto eof
:no_arg
@echo Usage: %0 build_configuration
@goto eof
:eof

View File

@ -1,37 +0,0 @@
@echo off
@if "%1"=="" goto no_arg
@if "%~2"=="Any CPU" goto eof
set BUILD_PATH=build\win32\%1\
if not exist COPYING goto no_preq
if not exist README.md goto no_preq
if not exist %BUILD_PATH%Cxbx.exe goto no_build
if not exist %BUILD_PATH%glew32.dll goto no_build
if not exist %BUILD_PATH%subhook.dll goto no_build
set ZIP_APP="import\7za\7za.exe"
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
:no_preq
echo Missing files from repo
goto eof
:no_build
echo Missing build at path %BUILD_PATH%
goto eof
:no_arg
echo "Usage: %0 <build_configuration>"
goto eof
:eof

View File

@ -17,7 +17,11 @@ Cxbx-Reloaded is early in development and still pretty unstable, so don't expect
* Visual C++ 2015 and 2017 redistributables may be required. Download them [here](https://support.microsoft.com/en-gb/help/2977003/the-latest-supported-visual-c-downloads).
## Automated Builds
Cxbx-Reloaded is not yet ready for general release, but the latest development build can always be downloaded from our [AppVeyor](https://ci.appveyor.com/project/SoullessSentinel/cxbx-reloaded/branch/master) (navigate to Configuration: Release => Artifacts => export\Release.zip). Also, a history of AppVeyor builds is [available here](https://ci.appveyor.com/project/SoullessSentinel/cxbx-reloaded/history).
Cxbx-Reloaded is not yet ready for general release, but the latest development builds can always be downloaded from our [AppVeyor](https://ci.appveyor.com/project/SoullessSentinel/cxbx-reloaded/branch/master) service:
* [Latest build (Release-mode)](https://ci.appveyor.com/api/projects/SoullessSentinel/cxbx-reloaded/artifacts/export/Release.zip?branch=master&job=Configuration:%20Release;%20Platform:%20Win32)
* [Latest build (Debug-mode)](https://ci.appveyor.com/api/projects/SoullessSentinel/cxbx-reloaded/artifacts/export/Debug.zip?branch=master&job=Configuration:%20Debug;%20Platform:%20Win322)
* [Full build history](https://ci.appveyor.com/project/SoullessSentinel/cxbx-reloaded/history)
## Compatibility
Cxbx-Reloaded has a separate [compatibility list](https://github.com/Cxbx-Reloaded/game-compatibility/issues). If you have something to report on a title, please create or update the issue for it over there. (Please, read the [Read-me file](https://github.com/Cxbx-Reloaded/game-compatibility/blob/master/README.md) first!)

View File

@ -28,10 +28,9 @@ build:
parallel: true
verbosity: minimal
after_build:
# 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%"
before_package:
# Pass in the build configuration
- cmd: GatherArtifacts.bat %CONFIGURATION%
artifacts:
- path: export/*.zip

View File

@ -4,6 +4,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Cxbx", "Cxbx.vcxproj", "{E7A72D3D-5810-4078-A243-348B59726365}"
ProjectSection(ProjectDependencies) = postProject
{2171C0E8-4915-49B9-AC23-A484FA08C126} = {2171C0E8-4915-49B9-AC23-A484FA08C126}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "subhook", "subhook.vcxproj", "{CD2DDE93-B45E-4D11-876D-D0056C3DD407}"
EndProject
@ -13,9 +16,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CxbxDebugger", "..\..\src\C
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "cs_x86", "..\..\import\cs_x86\cs_x86\cs_x86.csproj", "{9131B025-5019-4DEE-84A3-86D2703A81C0}"
ProjectSection(ProjectDependencies) = postProject
{2171C0E8-4915-49B9-AC23-A484FA08C126} = {2171C0E8-4915-49B9-AC23-A484FA08C126}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "capstone_dll_2015", "..\..\import\cs_x86\capstone_2015\capstone_dll_2015.vcxproj", "{2171C0E8-4915-49B9-AC23-A484FA08C126}"
EndProject