From 00bae1f5ca76d6dd8775b35a9b2e0188b7b0146d Mon Sep 17 00:00:00 2001 From: Simon Judd Date: Wed, 18 Jan 2017 00:55:52 +1030 Subject: [PATCH] Update makebuild script Added option to rebuild SLADE (both Release and Release - WinXP builds) Also now makes a winxp build zip --- build/msvc/SLADE.sln | 4 +- build/msvc/SLADE.vcxproj | 81 ++++++---------------------------------- dist/makebuild.ps1 | 25 +++++++++++++ 3 files changed, 39 insertions(+), 71 deletions(-) diff --git a/build/msvc/SLADE.sln b/build/msvc/SLADE.sln index 33069ee33..51679c6f7 100644 --- a/build/msvc/SLADE.sln +++ b/build/msvc/SLADE.sln @@ -14,8 +14,8 @@ Global GlobalSection(ProjectConfigurationPlatforms) = postSolution {33CC5FBD-4EB0-48A9-9069-0EC0B5FF5A46}.Debug|Win32.ActiveCfg = Debug|Win32 {33CC5FBD-4EB0-48A9-9069-0EC0B5FF5A46}.Debug|Win32.Build.0 = Debug|Win32 - {33CC5FBD-4EB0-48A9-9069-0EC0B5FF5A46}.Release - WinXP|Win32.ActiveCfg = Release - No CURL|Win32 - {33CC5FBD-4EB0-48A9-9069-0EC0B5FF5A46}.Release - WinXP|Win32.Build.0 = Release - No CURL|Win32 + {33CC5FBD-4EB0-48A9-9069-0EC0B5FF5A46}.Release - WinXP|Win32.ActiveCfg = Release - WinXP|Win32 + {33CC5FBD-4EB0-48A9-9069-0EC0B5FF5A46}.Release - WinXP|Win32.Build.0 = Release - WinXP|Win32 {33CC5FBD-4EB0-48A9-9069-0EC0B5FF5A46}.Release|Win32.ActiveCfg = Release|Win32 {33CC5FBD-4EB0-48A9-9069-0EC0B5FF5A46}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection diff --git a/build/msvc/SLADE.vcxproj b/build/msvc/SLADE.vcxproj index d6fafd9cc..8a1d30675 100644 --- a/build/msvc/SLADE.vcxproj +++ b/build/msvc/SLADE.vcxproj @@ -5,12 +5,8 @@ Debug Win32 - - Release - FTGL - Win32 - - - Release - No CURL + + Release - WinXP Win32 @@ -30,16 +26,11 @@ Unicode v140_xp - + Application Unicode v140_xp - - Application - Unicode - v110_xp - Application Unicode @@ -51,10 +42,7 @@ - - - - + @@ -67,23 +55,17 @@ $(Configuration)\ true ..\..\dist\ - ..\..\dist\ - .\dist\ + ..\..\dist\WinXP\ $(Configuration)\ - $(Configuration)\ - $(Configuration)\ + $(Configuration)\ false - false - false + false true - true - true + true $(ProjectDir)..\..\src;$(ProjectDir)\fluidsynth\include;$(ProjectDir)..\..\src\External\dumb;$(WXWIN)\lib\vc_lib\mswu;$(WXWIN)\include;$(FREEIMAGE)\Dist\x32;$(SFML)\include;$(ProjectDir)..\..\src\Application;$(CURL)\include;$(IncludePath) - $(ProjectDir)..\..\src;$(ProjectDir)\fluidsynth\include;$(ProjectDir)..\..\src\External\dumb;$(WXWIN)\lib\vc_lib\mswu;$(WXWIN)\include;$(FREEIMAGE)\Dist\x32;$(SFML)\include;$(ProjectDir)..\..\src\Application;$(CURL)\include;$(IncludePath) - $(ProjectDir)src;$(FLUIDSYNTH)\include;$(WXWIN)\lib\vc_lib\mswu;$(WXWIN)\include;$(FREEIMAGE)\Dist;$(SFML)\include;$(FTGL)\src;$(FREETYPE)\include;$(IncludePath) + $(ProjectDir)..\..\src;$(ProjectDir)\fluidsynth\include;$(ProjectDir)..\..\src\External\dumb;$(WXWIN)\lib\vc_lib\mswu;$(WXWIN)\include;$(FREEIMAGE)\Dist\x32;$(SFML)\include;$(ProjectDir)..\..\src\Application;$(CURL)\include;$(IncludePath) $(ProjectDir)\fluidsynth\lib;$(SolutionDir)$(Configuration)\;$(WXWIN)\lib\vc_lib;$(FREEIMAGE)\Dist\x32;$(SFML)\lib;$(CURL)\lib\static-release-x86;$(LibraryPath) - $(ProjectDir)\fluidsynth\lib;$(SolutionDir)$(Configuration)\;$(WXWIN)\lib\vc_lib;$(FREEIMAGE)\Dist\x32;$(SFML)\lib;$(CURL)\lib\static-release-x86;$(LibraryPath) - $(FLUIDSYNTH)\lib;$(WXWIN)\lib\vc_lib;$(FREEIMAGE)\Dist;$(SFML)\lib;$(FTGL)\msvc\build;$(FREETYPE)\objs\win32;$(SolutionDir)$(Configuration)\;$(LibraryPath) + $(ProjectDir)\fluidsynth\lib;$(SolutionDir)$(Configuration)\;$(WXWIN)\lib\vc_lib;$(FREEIMAGE)\Dist\x32;$(SFML)\lib;$(CURL)\lib\static-release-x86;$(LibraryPath) $(ProjectDir)..\..\src;$(ProjectDir)\fluidsynth\include;$(ProjectDir)..\..\src\External\dumb;$(WXWIN)\lib\vc_lib\mswu;$(WXWIN)\include;$(FREEIMAGE)\Dist\x32;$(SFML)\include;$(ProjectDir)..\..\src\Application;$(CURL)\include;$(IncludePath) $(ProjectDir)\fluidsynth\lib;$(SolutionDir)$(Configuration)\;$(WXWIN)\lib\vc_lib;$(FREEIMAGE)\Dist\x32;$(SFML)\lib;$(CURL)\lib\static-release-x86;$(LibraryPath) SLADE-dbg @@ -96,7 +78,7 @@ static static - + AllRules.ruleset MultiThreadedDLL static @@ -104,9 +86,6 @@ static static - - MixedRecommendedRules.ruleset - static static @@ -172,7 +151,7 @@ SLADE.manifest %(AdditionalManifestFiles) - + MaxSpeed true @@ -206,42 +185,6 @@ SLADE.manifest %(AdditionalManifestFiles) - - - MaxSpeed - true - false - WIN32;SFML_STATIC;__WXMSW__;_WINDOWS;NOPCH;_CRT_SECURE_NO_WARNINGS;NDEBUG;GLEW_STATIC;FTGL_STATIC_LIB;%(PreprocessorDefinitions) - false - false - true - MultiThreadedDLL - true - - - Level3 - ProgramDatabase - Speed - Fast - true - StreamingSIMDExtensions - - - fluidsynth.lib;ftgl_static.lib;freetype2411.lib;FreeImage.lib;wxbase30u.lib;wxmsw30u_core.lib;wxmsw30u_aui.lib;wxmsw30u_gl.lib;wxmsw30u_webview.lib;wxmsw30u_adv.lib;wxmsw30u_stc.lib;wxmsw30u_propgrid.lib;wxmsw30u_media.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;wxscintilla.lib;sfml-window-s.lib;sfml-audio-s.lib;sfml-system-s.lib;sfml-main.lib;openal32.lib;sndfile.lib;winmm.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;%(AdditionalDependencies) - false - true - Windows - true - true - Default - MachineX86 - true - true - - - SLADE.manifest %(AdditionalManifestFiles) - - diff --git a/dist/makebuild.ps1 b/dist/makebuild.ps1 index 9d7432167..d81aa72d1 100644 --- a/dist/makebuild.ps1 +++ b/dist/makebuild.ps1 @@ -21,12 +21,25 @@ if (-not (Test-Path $7zpath)) # $versionstring = $version+"_b"+$beta #} +# Prompt to build SLADE +Write-Host "`nRebuild SLADE? (y/n) " -foregroundcolor cyan -nonewline +$buildbinaries = Read-Host + +# Build SLADE +if ($buildbinaries.ToLower() -eq "y") +{ + $devenvpath = "${env:ProgramFiles(x86)}\Microsoft Visual Studio 14.0\Common7\IDE\devenv.com" + & $devenvpath (resolve-path ..\build\msvc\SLADE.sln).Path /rebuild Release /project SLADE.vcxproj + & $devenvpath (resolve-path ..\build\msvc\SLADE.sln).Path /rebuild "Release - WinXP" /project SLADE.vcxproj +} + # Determine release directory $releasedir = "$PSScriptRoot\$version" # Create release directory if needed Write-Host "`nCreate directory $releasedir" -foregroundcolor yellow New-Item -ItemType directory -Force -Path $releasedir | out-null +New-Item -ItemType directory -Force -Path "$releasedir\XP" | out-null # Remove existing pk3 if it exists $pk3path = ".\slade.pk3" @@ -53,6 +66,8 @@ Copy-Item (resolve-path ".\libfluidsynth.dll") "$releasedir" -Force Copy-Item (resolve-path ".\openal32.dll") "$releasedir" -Force Copy-Item (resolve-path ".\SLADE.exe") "$releasedir" -Force Copy-Item (resolve-path ".\SLADE.pdb") "$releasedir" -Force +Copy-Item (resolve-path ".\WinXP\SLADE.exe") "$releasedir\XP" -Force +Copy-Item (resolve-path ".\WinXP\SLADE.pdb") "$releasedir\XP" -Force Copy-Item (resolve-path ".\slade.pk3") "$releasedir" -Force Write-Host "Done" -foregroundcolor green @@ -72,6 +87,16 @@ if ($buildbinaries.ToLower() -eq "y") "$releasedir\SLADE.pdb" ` "$releasedir\slade.pk3" Write-Host "Done" -foregroundcolor green + + Write-Host "`nBuilding XP binary 7z..." -ForegroundColor Yellow + & $7zpath a -t7z "$releasedir\slade_${version}_winxp.7z" ` + "$releasedir\FreeImage.dll" ` + "$releasedir\libfluidsynth.dll" ` + "$releasedir\openal32.dll" ` + "$releasedir\XP\SLADE.exe" ` + "$releasedir\XP\SLADE.pdb" ` + "$releasedir\slade.pk3" + Write-Host "Done" -ForegroundColor Green } # Prompt to build installer