Adjustments to build process

--HG--
branch : WDS-build

2 files changed, 38 insertions, 9 deletions

diff --git a/premake4.lua b/premake4.lua
index 2ab2fc6..f4887e7 100644
--- a/premake4.lua
+++ b/premake4.lua
@@ -1,8 +1,15 @@
---
--- Premake 4.x build configuration script
---
--- The below is used to insert the .vs(2005|2008|2010|2012|2013|2015) into the file names for projects and solutions
+--[[
+        This premake4.lua _requires_ windirstat/premake-stable to work properly.
+        If you don't want to use the code-signed build that can be found in the
+        download section of that project, you can build from the WDS-branch at:
+
+        https://bitbucket.org/windirstat/premake-stable
+--]]
 local action = _ACTION or ""
+if _OPTIONS["publish"] then
+    print "INFO: Creating 'Publish' build solution."
+    publish = true
+end
 do
 	-- This is mainly to support older premake4 builds
 	if not premake.project.getbasename then
diff --git a/release.cmd b/release.cmd
index 248fc7d..c9469fa 100644
--- a/release.cmd
+++ b/release.cmd
@@ -11,15 +11,37 @@ echo #define HG_TIP_REVNO "%HG_TIP_REVNO%" >> %HGTIPFILE%
 if exist %HGTIPFILE% type %HGTIPFILE%

 vcbuild /rebuild /time Premake4.vs8.sln "Publish|Win32"

 "%~dp0bin\release\premake4.exe" embed

-vcbuild /rebuild /time Premake4.vs8.sln "Publish|Win32"

-set NEWNAME=%~dp0premake4.rev-%HG_TIP_REVNO%-%HG_TIP_ID%.exe

-copy /y "%~dp0bin\release\premake4.exe" "%NEWNAME%"

-sigcheck -a "%NEWNAME%"

-gpg2 -bao "%NEWNAME%.asc" "%NEWNAME%"

+call :BuildSignCopyOne "%~dp0" "premake4" "bin\release" "%HG_TIP_REVNO%" "%HG_TIP_ID%" Premake4.vs8.sln Publish Win32

 popd & endlocal & goto :EOF

 goto :EOF

 

 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::

+::: / SignAndCopyOne subroutine

+:::   Copies a 

+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::

+:BuildSignCopyOne

+setlocal ENABLEEXTENSIONS

+set BASEPATH=%~1

+set BASENAME=%~2

+set BINDIR=%~3

+set HG_TIP_REVNO=%~4

+set HG_TIP_ID=%~5

+set SLNFILE=%~6

+set SLNCFGNAME=%~7

+set SLNCFGPLTF=%~8

+vcbuild /rebuild /time "%SLNFILE%" "%SLNCFGNAME%|%SLNCFGPLTF%"

+set NEWNAME=%BASEPATH%%BASENAME%.rev-%HG_TIP_REVNO%-%HG_TIP_ID%.exe

+copy /y "%BASEPATH%%BINDIR%\%BASENAME%.exe" "%NEWNAME%"

+sigcheck -a "%NEWNAME%"

+gpg2 --batch --yes -bao "%NEWNAME%.asc" "%NEWNAME%"

+copy /y "%BASEPATH%%BINDIR%\%BASENAME%.exe" "%BASEPATH%%BASENAME%.exe"

+endlocal

+goto :EOF

+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::

+::: \ SignAndCopyOne subroutine

+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::

+

+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::

 ::: / SetVar subroutine

 :::   Param1 == name of the variable, Param2 == value to be set for the variable

 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::