From 279b00e19559eb2e632ea70c6151d7f031d91e2d Mon Sep 17 00:00:00 2001 From: Bill Zissimopoulos Date: Sun, 16 Feb 2020 22:36:10 +0200 Subject: [PATCH] tools: build.bat: add choco prerelease support --- build/choco/winfsp.nuspec | 2 +- tools/build-choco.bat | 10 +++++++++- tools/build.bat | 10 +++++++++- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/build/choco/winfsp.nuspec b/build/choco/winfsp.nuspec index 075d2c1a..2e7bfd6f 100644 --- a/build/choco/winfsp.nuspec +++ b/build/choco/winfsp.nuspec @@ -52,6 +52,6 @@ To verify installation: - + diff --git a/tools/build-choco.bat b/tools/build-choco.bat index d8cd27ca..ba6b04a1 100644 --- a/tools/build-choco.bat +++ b/tools/build-choco.bat @@ -103,12 +103,20 @@ if not exist "build\%Configuration%\winfsp-*.msi" (echo installer msi not found set Version= for %%f in (build\%Configuration%\winfsp-*.msi) do set Version=%%~nf set Version=!Version:winfsp-=! +set ProductStage= +for /f "delims=<> tokens=3" %%i in ('findstr "" version.properties') do ( + set MyProductStage=%%i +) +set PackageVersion=!Version! +if not X!MyProductStage!==XGold ( + set PackageVersion=!Version!-pre +) where /q choco.exe if %ERRORLEVEL% equ 0 ( copy ..\choco\* build\%Configuration% copy ..\choco\LICENSE.TXT /B + ..\..\License.txt /B build\%Configuration%\LICENSE.txt /B certutil -hashfile build\%Configuration%\winfsp-!Version!.msi SHA256 >>build\%Configuration%\VERIFICATION.txt - choco pack build\%Configuration%\winfsp.nuspec --version=!Version! --outputdirectory=build\%Configuration% + choco pack build\%Configuration%\winfsp.nuspec --version=!PackageVersion! --outputdirectory=build\%Configuration% MsiVersion=!Version! if errorlevel 1 goto fail ) diff --git a/tools/build.bat b/tools/build.bat index d8cd27ca..ba6b04a1 100755 --- a/tools/build.bat +++ b/tools/build.bat @@ -103,12 +103,20 @@ if not exist "build\%Configuration%\winfsp-*.msi" (echo installer msi not found set Version= for %%f in (build\%Configuration%\winfsp-*.msi) do set Version=%%~nf set Version=!Version:winfsp-=! +set ProductStage= +for /f "delims=<> tokens=3" %%i in ('findstr "" version.properties') do ( + set MyProductStage=%%i +) +set PackageVersion=!Version! +if not X!MyProductStage!==XGold ( + set PackageVersion=!Version!-pre +) where /q choco.exe if %ERRORLEVEL% equ 0 ( copy ..\choco\* build\%Configuration% copy ..\choco\LICENSE.TXT /B + ..\..\License.txt /B build\%Configuration%\LICENSE.txt /B certutil -hashfile build\%Configuration%\winfsp-!Version!.msi SHA256 >>build\%Configuration%\VERIFICATION.txt - choco pack build\%Configuration%\winfsp.nuspec --version=!Version! --outputdirectory=build\%Configuration% + choco pack build\%Configuration%\winfsp.nuspec --version=!PackageVersion! --outputdirectory=build\%Configuration% MsiVersion=!Version! if errorlevel 1 goto fail )