diff options
| author | Josip Medved <jmedved@jmedved.com> | 2015-12-23 15:52:10 -0800 |
|---|---|---|
| committer | Josip Medved <jmedved@jmedved.com> | 2015-12-23 15:52:10 -0800 |
| commit | 7d11f07870c6e2417c3022fe30f77934a8fbf773 (patch) | |
| tree | 98d2c53aee066c025b0fb65b45829dd766781707 | |
| parent | 05adac867b41709254899dd1ce16aa6b99f0028c (diff) | |
| parent | 03fb92b3914e8ddfa0e0f4c06ff9c98c565bc066 (diff) | |
| download | WrtSettings-7d11f07870c6e2417c3022fe30f77934a8fbf773.zip WrtSettings-7d11f07870c6e2417c3022fe30f77934a8fbf773.tar.gz WrtSettings-7d11f07870c6e2417c3022fe30f77934a8fbf773.tar.bz2 | |
Merge branch '1.10'
| -rw-r--r-- | Setup/Publish.cmd | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/Setup/Publish.cmd b/Setup/Publish.cmd index 605eb16..8317937 100644 --- a/Setup/Publish.cmd +++ b/Setup/Publish.cmd @@ -10,8 +10,9 @@ SET COMPILE_TOOL_1="%PROGRAMFILES(X86)%\Microsoft Visual Studio 14.0\Common7\ SET COMPILE_TOOL_2="%PROGRAMFILES(X86)%\Microsoft Visual Studio 14.0\Common7\IDE\WDExpress.exe"
SET SETUP_TOOL="%PROGRAMFILES(x86)%\Inno Setup 5\iscc.exe"
-SET SIGN_TOOL_1="%PROGRAMFILES(X86)%\Windows Kits\8.1\bin\x86\signtool.exe"
-SET SIGN_TOOL_2="%PROGRAMFILES(X86)%\Windows Kits\8.0\bin\x86\signtool.exe"
+SET SIGN_TOOL_1="%PROGRAMFILES(X86)%\Windows Kits\10\bin\x86\signtool.exe"
+SET SIGN_TOOL_2="%PROGRAMFILES(X86)%\Windows Kits\8.1\bin\x86\signtool.exe"
+SET SIGN_TOOL_3="%PROGRAMFILES(X86)%\Windows Kits\8.0\bin\x86\signtool.exe"
SET SIGN_HASH="C02FF227D5EE9F555C13D4C622697DF15C6FF871"
SET SIGN_TIMESTAMPURL="http://timestamp.comodoca.com/rfc3161"
@@ -42,15 +43,20 @@ IF EXIST %SETUP_TOOL% ( )
IF EXIST %SIGN_TOOL_1% (
- ECHO Windows SignTool 8.1
+ ECHO Windows SignTool 10
SET SIGN_TOOL=%SIGN_TOOL_1%
) ELSE (
IF EXIST %SIGN_TOOL_2% (
- ECHO Windows SignTool 8.0
+ ECHO Windows SignTool 8.1
SET SIGN_TOOL=%SIGN_TOOL_2%
) ELSE (
- ECHO Cannot find Windows SignTool^^!
- PAUSE && EXIT /B 255
+ IF EXIST %SIGN_TOOL_3% (
+ ECHO Windows SignTool 8.0
+ SET SIGN_TOOL=%SIGN_TOOL_3%
+ ) ELSE (
+ ECHO Cannot find Windows SignTool^^!
+ PAUSE && EXIT /B 255
+ )
)
)
@@ -176,7 +182,7 @@ ECHO --- BUILD ZIP ECHO.
ECHO Zipping into %_SETUPEXE:.exe=.zip%
-"%PROGRAMFILES%\WinRAR\WinRAR.exe" a -afzip -ep -m5 ".\Temp\%_SETUPEXE:.exe=.zip%" %FILE_EXECUTABLE% %FILES_OTHER%
+"%PROGRAMFILES%\WinRAR\WinRAR.exe" a -afzip -ep -m5 ".\Temp\%_SETUPEXE:.exe=.zip%" %FILES_EXECUTABLE% %FILES_OTHER%
IF ERRORLEVEL 1 PAUSE && EXIT /B %ERRORLEVEL%
ECHO.
|