Merge branch 'master' of https://github.com/albert-chang0/fio

[fio.git] / os / windows / dobuild.cmd

diff --git a/os/windows/dobuild.cmd b/os/windows/dobuild.cmd
index ef12d82d7a36c8eabdf9e8716ce782b3acc84a64..ea79dd03b4eb62ae04834641c0465f78ce5f1d62 100644 (file)
--- a/os/windows/dobuild.cmd
+++ b/os/windows/dobuild.cmd
@@ -1,5 +1,18 @@
 @echo off\r
 setlocal enabledelayedexpansion\r
+\r
+if "%1"=="x86" set FIO_ARCH=x86\r
+if "%1"=="x64" set FIO_ARCH=x64\r
+\r
+if not defined FIO_ARCH (\r
+  echo Error: must specify the architecture.\r
+  echo Usage: dobuild x86\r
+  echo Usage: dobuild x64\r
+  goto end\r
+)\r
+\r
+C:\Cygwin64\bin\bash -l %cd%/_domake.sh %FIO_ARCH% %cd%\r
+\r
 set /a counter=1\r
 for /f "tokens=3" %%i in (..\..\FIO-VERSION-FILE) do (\r
  if "!counter!"=="1" set FIO_VERSION=%%i\r
@@ -16,19 +29,27 @@ if not defined FIO_VERSION_NUMBERS (
   goto end\r
 )\r
 \r
-if "%1"=="x86" set FIO_ARCH=x86\r
-if "%1"=="x64" set FIO_ARCH=x64\r
+if defined SIGN_FIO (\r
+  signtool sign /n "%SIGNING_CN%" /t http://timestamp.digicert.com ..\..\fio.exe\r
+  signtool sign /as /n "%SIGNING_CN%" /tr http://timestamp.digicert.com /td sha256 /fd sha256 ..\..\fio.exe\r
 \r
-if not defined FIO_ARCH (\r
-  echo Error: must specify the architecture.\r
-  echo Usage: dobuild x86\r
-  echo Usage: dobuild x64\r
-  goto end\r
+  signtool sign /n "%SIGNING_CN%" /t http://timestamp.digicert.com ..\..\t\*.exe\r
+  signtool sign /as /n "%SIGNING_CN%" /tr http://timestamp.digicert.com /td sha256 /fd sha256 ..\..\t\*.exe\r
+)\r
+\r
+if exist ..\..\fio.pdb (\r
+  set FIO_PDB=true\r
+) else (\r
+  set FIO_PDB=false\r
 )\r
 \r
-"%WIX%bin\candle" -nologo -arch %FIO_ARCH% -dFioVersionNumbers="%FIO_VERSION_NUMBERS%" install.wxs\r
+"%WIX%bin\candle" -nologo -arch %FIO_ARCH% -dFioVersionNumbers="%FIO_VERSION_NUMBERS%" -dFioPDB="%FIO_PDB%" install.wxs\r
 @if ERRORLEVEL 1 goto end\r
 "%WIX%bin\candle" -nologo -arch %FIO_ARCH% examples.wxs\r
 @if ERRORLEVEL 1 goto end\r
 "%WIX%bin\light" -nologo -sice:ICE61 install.wixobj examples.wixobj -ext WixUIExtension -out %FIO_VERSION%-%FIO_ARCH%.msi\r
 :end\r
+\r
+if defined SIGN_FIO (\r
+  signtool sign /n "%SIGNING_CN%" /tr http://timestamp.digicert.com /td sha256 /fd sha256 %FIO_VERSION%-%FIO_ARCH%.msi\r
+)\r