1- @ echo off
1+ @ echo on
22
33setlocal enabledelayedexpansion
44
55set VERSIONTAG =
66
7- set VCVARSALL = " %ProgramFiles(x86)% \Microsoft Visual Studio 10 .0\VC\vcvarsall.bat"
7+ set VCVARSALL = " %ProgramFiles(x86)% \Microsoft Visual Studio 14 .0\VC\vcvarsall.bat"
88set DEVENV = " devenv.exe"
9- set MAKENSIS = " %ProgramFiles(x86)% \NSIS\Unicode\ makensis.exe"
10- set RAR = " %ProgramFiles% \WinRAR\WinRAR .exe"
11- set SIGNCMD = signtool.exe sign /n " Astrospark Technologies, LLC" /sha1 " 1cbd910dbd6e77f26506e7f600736972f700673f" /tr http://timestamp.comodoca.com/rfc3161
9+ set MAKENSIS = " %ProgramFiles(x86)% \NSIS\makensis.exe"
10+ set SEVENZIP = " %ProgramFiles% \7-Zip\7z .exe"
11+ rem set SIGNCMD=signtool.exe sign /n "Astrospark Technologies, LLC" /sha1 "1cbd910dbd6e77f26506e7f600736972f700673f" /tr http://timestamp.comodoca.com/rfc3161
1212
1313rem Windows Sysinternals Sigcheck from http://technet.microsoft.com/en-us/sysinternals/bb897441
1414set SIGCHECK = " %ProgramFiles(x86)% \Sigcheck\sigcheck.exe"
@@ -38,56 +38,56 @@ echo Building release version...
3838echo Building portable version...
3939%DEVENV% " %~dp0 \mRemoteV1.sln" /build " Release Portable"
4040
41- echo Signing binaries...
42- %SIGNCMD% ^
43- " %~dp0 \mRemoteV1\bin\Release\de\mRemoteNG .resources.dll" ^
44- " %~dp0 \mRemoteV1\bin\Release\el\mRemoteNG .resources.dll" ^
45- " %~dp0 \mRemoteV1\bin\Release\en-US\mRemoteNG .resources.dll" ^
46- " %~dp0 \mRemoteV1\bin\Release\es\mRemoteNG .resources.dll" ^
47- " %~dp0 \mRemoteV1\bin\Release\es-AR\mRemoteNG .resources.dll" ^
48- " %~dp0 \mRemoteV1\bin\Release\fr\mRemoteNG .resources.dll" ^
49- " %~dp0 \mRemoteV1\bin\Release\hu\mRemoteNG .resources.dll" ^
50- " %~dp0 \mRemoteV1\bin\Release\it\mRemoteNG .resources.dll" ^
51- " %~dp0 \mRemoteV1\bin\Release\nb-NO\mRemoteNG .resources.dll" ^
52- " %~dp0 \mRemoteV1\bin\Release\nl\mRemoteNG .resources.dll" ^
53- " %~dp0 \mRemoteV1\bin\Release\pl\mRemoteNG .resources.dll" ^
54- " %~dp0 \mRemoteV1\bin\Release\pt\mRemoteNG .resources.dll" ^
55- " %~dp0 \mRemoteV1\bin\Release\pt-BR\mRemoteNG .resources.dll" ^
56- " %~dp0 \mRemoteV1\bin\Release\ru\mRemoteNG .resources.dll" ^
57- " %~dp0 \mRemoteV1\bin\Release\uk\mRemoteNG .resources.dll" ^
58- " %~dp0 \mRemoteV1\bin\Release\zh-CN\mRemoteNG .resources.dll" ^
59- " %~dp0 \mRemoteV1\bin\Release\zh-TW\mRemoteNG .resources.dll" ^
60- " %~dp0 \mRemoteV1\bin\Release\AxInterop.MSTSCLib.dll" ^
61- " %~dp0 \mRemoteV1\bin\Release\AxInterop.WFICALib.dll" ^
62- " %~dp0 \mRemoteV1\bin\Release\Interop.EOLWTSCOM.dll" ^
63- " %~dp0 \mRemoteV1\bin\Release\Interop.MSTSCLib.dll" ^
64- " %~dp0 \mRemoteV1\bin\Release\Interop.ShDocVw.dll" ^
65- " %~dp0 \mRemoteV1\bin\Release\Interop.WFICALib.dll" ^
66- " %~dp0 \mRemoteV1\bin\Release\mRemoteNG .exe" ^
67- " %~dp0 \mRemoteV1\bin\Release Portable\de\mRemoteNG .resources.dll" ^
68- " %~dp0 \mRemoteV1\bin\Release Portable\el\mRemoteNG .resources.dll" ^
69- " %~dp0 \mRemoteV1\bin\Release Portable\en-US\mRemoteNG .resources.dll" ^
70- " %~dp0 \mRemoteV1\bin\Release Portable\es\mRemoteNG .resources.dll" ^
71- " %~dp0 \mRemoteV1\bin\Release Portable\es-AR\mRemoteNG .resources.dll" ^
72- " %~dp0 \mRemoteV1\bin\Release Portable\fr\mRemoteNG .resources.dll" ^
73- " %~dp0 \mRemoteV1\bin\Release Portable\hu\mRemoteNG .resources.dll" ^
74- " %~dp0 \mRemoteV1\bin\Release Portable\it\mRemoteNG .resources.dll" ^
75- " %~dp0 \mRemoteV1\bin\Release Portable\nb-NO\mRemoteNG .resources.dll" ^
76- " %~dp0 \mRemoteV1\bin\Release Portable\nl\mRemoteNG .resources.dll" ^
77- " %~dp0 \mRemoteV1\bin\Release Portable\pl\mRemoteNG .resources.dll" ^
78- " %~dp0 \mRemoteV1\bin\Release Portable\pt\mRemoteNG .resources.dll" ^
79- " %~dp0 \mRemoteV1\bin\Release Portable\pt-BR\mRemoteNG .resources.dll" ^
80- " %~dp0 \mRemoteV1\bin\Release Portable\ru\mRemoteNG .resources.dll" ^
81- " %~dp0 \mRemoteV1\bin\Release Portable\uk\mRemoteNG .resources.dll" ^
82- " %~dp0 \mRemoteV1\bin\Release Portable\zh-CN\mRemoteNG .resources.dll" ^
83- " %~dp0 \mRemoteV1\bin\Release Portable\zh-TW\mRemoteNG .resources.dll" ^
84- " %~dp0 \mRemoteV1\bin\Release Portable\AxInterop.MSTSCLib.dll" ^
85- " %~dp0 \mRemoteV1\bin\Release Portable\AxInterop.WFICALib.dll" ^
86- " %~dp0 \mRemoteV1\bin\Release Portable\Interop.EOLWTSCOM.dll" ^
87- " %~dp0 \mRemoteV1\bin\Release Portable\Interop.MSTSCLib.dll" ^
88- " %~dp0 \mRemoteV1\bin\Release Portable\Interop.ShDocVw.dll" ^
89- " %~dp0 \mRemoteV1\bin\Release Portable\Interop.WFICALib.dll" ^
90- " %~dp0 \mRemoteV1\bin\Release Portable\mRemoteNG .exe" ^
41+ rem echo Signing binaries...
42+ rem %SIGNCMD% ^
43+ rem "%~dp0\mRemoteV1\bin\Release\de\mRemote3G .resources.dll" ^
44+ rem "%~dp0\mRemoteV1\bin\Release\el\mRemote3G .resources.dll" ^
45+ rem "%~dp0\mRemoteV1\bin\Release\en-US\mRemote3G .resources.dll" ^
46+ rem "%~dp0\mRemoteV1\bin\Release\es\mRemote3G .resources.dll" ^
47+ rem "%~dp0\mRemoteV1\bin\Release\es-AR\mRemote3G .resources.dll" ^
48+ rem "%~dp0\mRemoteV1\bin\Release\fr\mRemote3G .resources.dll" ^
49+ rem "%~dp0\mRemoteV1\bin\Release\hu\mRemote3G .resources.dll" ^
50+ rem "%~dp0\mRemoteV1\bin\Release\it\mRemote3G .resources.dll" ^
51+ rem "%~dp0\mRemoteV1\bin\Release\nb-NO\mRemote3G .resources.dll" ^
52+ rem "%~dp0\mRemoteV1\bin\Release\nl\mRemote3G .resources.dll" ^
53+ rem "%~dp0\mRemoteV1\bin\Release\pl\mRemote3G .resources.dll" ^
54+ rem "%~dp0\mRemoteV1\bin\Release\pt\mRemote3G .resources.dll" ^
55+ rem "%~dp0\mRemoteV1\bin\Release\pt-BR\mRemote3G .resources.dll" ^
56+ rem "%~dp0\mRemoteV1\bin\Release\ru\mRemote3G .resources.dll" ^
57+ rem "%~dp0\mRemoteV1\bin\Release\uk\mRemote3G .resources.dll" ^
58+ rem "%~dp0\mRemoteV1\bin\Release\zh-CN\mRemote3G .resources.dll" ^
59+ rem "%~dp0\mRemoteV1\bin\Release\zh-TW\mRemote3G .resources.dll" ^
60+ rem "%~dp0\mRemoteV1\bin\Release\AxInterop.MSTSCLib.dll" ^
61+ rem "%~dp0\mRemoteV1\bin\Release\AxInterop.WFICALib.dll" ^
62+ rem "%~dp0\mRemoteV1\bin\Release\Interop.EOLWTSCOM.dll" ^
63+ rem "%~dp0\mRemoteV1\bin\Release\Interop.MSTSCLib.dll" ^
64+ rem "%~dp0\mRemoteV1\bin\Release\Interop.ShDocVw.dll" ^
65+ rem "%~dp0\mRemoteV1\bin\Release\Interop.WFICALib.dll" ^
66+ rem "%~dp0\mRemoteV1\bin\Release\mRemote3G .exe" ^
67+ rem "%~dp0\mRemoteV1\bin\Release Portable\de\mRemote3G .resources.dll" ^
68+ rem "%~dp0\mRemoteV1\bin\Release Portable\el\mRemote3G .resources.dll" ^
69+ rem "%~dp0\mRemoteV1\bin\Release Portable\en-US\mRemote3G .resources.dll" ^
70+ rem "%~dp0\mRemoteV1\bin\Release Portable\es\mRemote3G .resources.dll" ^
71+ rem "%~dp0\mRemoteV1\bin\Release Portable\es-AR\mRemote3G .resources.dll" ^
72+ rem "%~dp0\mRemoteV1\bin\Release Portable\fr\mRemote3G .resources.dll" ^
73+ rem "%~dp0\mRemoteV1\bin\Release Portable\hu\mRemote3G .resources.dll" ^
74+ rem "%~dp0\mRemoteV1\bin\Release Portable\it\mRemote3G .resources.dll" ^
75+ rem "%~dp0\mRemoteV1\bin\Release Portable\nb-NO\mRemote3G .resources.dll" ^
76+ rem "%~dp0\mRemoteV1\bin\Release Portable\nl\mRemote3G .resources.dll" ^
77+ rem "%~dp0\mRemoteV1\bin\Release Portable\pl\mRemote3G .resources.dll" ^
78+ rem "%~dp0\mRemoteV1\bin\Release Portable\pt\mRemote3G .resources.dll" ^
79+ rem "%~dp0\mRemoteV1\bin\Release Portable\pt-BR\mRemote3G .resources.dll" ^
80+ rem "%~dp0\mRemoteV1\bin\Release Portable\ru\mRemote3G .resources.dll" ^
81+ rem "%~dp0\mRemoteV1\bin\Release Portable\uk\mRemote3G .resources.dll" ^
82+ rem "%~dp0\mRemoteV1\bin\Release Portable\zh-CN\mRemote3G .resources.dll" ^
83+ rem "%~dp0\mRemoteV1\bin\Release Portable\zh-TW\mRemote3G .resources.dll" ^
84+ rem "%~dp0\mRemoteV1\bin\Release Portable\AxInterop.MSTSCLib.dll" ^
85+ rem "%~dp0\mRemoteV1\bin\Release Portable\AxInterop.WFICALib.dll" ^
86+ rem "%~dp0\mRemoteV1\bin\Release Portable\Interop.EOLWTSCOM.dll" ^
87+ rem "%~dp0\mRemoteV1\bin\Release Portable\Interop.MSTSCLib.dll" ^
88+ rem "%~dp0\mRemoteV1\bin\Release Portable\Interop.ShDocVw.dll" ^
89+ rem "%~dp0\mRemoteV1\bin\Release Portable\Interop.WFICALib.dll" ^
90+ rem "%~dp0\mRemoteV1\bin\Release Portable\mRemote3G .exe" ^
9191
9292
9393rem Do not remove the two blank lines above this line.
@@ -100,46 +100,49 @@ set SIGCHECK=!SIGCHECK:"=^"!
100100set SIGCHECK = !SIGCHECK: =^^ !
101101set SIGCHECK = !SIGCHECK:( =^^( !
102102set SIGCHECK = !SIGCHECK:) =^^) !
103- for /F " usebackq delims=. tokens=1-4" %%i in (`!SIGCHECK! /accepteula -q -n " %~dp0 \mRemoteV1\bin\Release\mRemoteNG .exe" `) do (
103+ for /F " usebackq delims=. tokens=1-4" %%i in (`!SIGCHECK! /accepteula -q -n " %~dp0 \mRemoteV1\bin\Release\mRemote3G .exe" `) do (
104104 set PRODUCT_VERSION_SHORT = %%i .%%j
105+ set PRODUCT_VERSION = %%i .%%j .%%k .%%l
105106 echo ^^! define PRODUCT_VERSION " %%i .%%j .%%k .%%l " > %VERSIONNSH%
106- echo ^^! define PRODUCT_VERSION_SHORT " %%i .%%j " >> %VERSIONNSH%
107+ echo ^^! define PRODUCT_VERSION_SHORT " %%i .%%j . %%k " >> %VERSIONNSH%
107108 echo ^^! define PRODUCT_VERSION_MAJOR " %%i " >> %VERSIONNSH%
108109 echo ^^! define PRODUCT_VERSION_MINOR " %%j " >> %VERSIONNSH%
109110)
110- echo Version is %PRODUCT_VERSION_SHORT %
111+ echo Version is %PRODUCT_VERSION %
111112
112113echo Creating installer package...
113114if defined VERSIONTAG (
114115 %MAKENSIS% /DPRODUCT_VERSION_TAG=%VERSIONTAG% " %~dp0 \Installer\mRemote.nsi"
115116
116- set INSTALLEREXE = " %~dp0 \Release\mRemoteNG -Installer-%PRODUCT_VERSION_SHORT % -%VERSIONTAG% .exe"
117- set BINARYZIP = " %~dp0 \Release\mRemoteNG- %PRODUCT_VERSION_SHORT % -%VERSIONTAG% .zip"
118- set PORTABLEZIP = " %~dp0 \Release\mRemoteNG -Portable-%PRODUCT_VERSION_SHORT % -%VERSIONTAG% .zip"
117+ set INSTALLEREXE = " %~dp0 \Release\mRemote3G -Installer-%PRODUCT_VERSION % -%VERSIONTAG% .exe"
118+ set BINARYZIP = " %~dp0 \Release\mRemote3G- %PRODUCT_VERSION % -%VERSIONTAG% .zip"
119+ set PORTABLEZIP = " %~dp0 \Release\mRemote3G -Portable-%PRODUCT_VERSION % -%VERSIONTAG% .zip"
119120) else (
120121 %MAKENSIS% " %~dp0 \Installer\mRemote.nsi"
121122
122- set INSTALLEREXE = " %~dp0 \Release\mRemoteNG -Installer-%PRODUCT_VERSION_SHORT % .exe"
123- set BINARYZIP = " %~dp0 \Release\mRemoteNG- %PRODUCT_VERSION_SHORT % .zip"
124- set PORTABLEZIP = " %~dp0 \Release\mRemoteNG -Portable-%PRODUCT_VERSION_SHORT % .zip"
123+ set INSTALLEREXE = " %~dp0 \Release\mRemote3G -Installer-%PRODUCT_VERSION % .exe"
124+ set BINARYZIP = " %~dp0 \Release\mRemote3G- %PRODUCT_VERSION % .zip"
125+ set PORTABLEZIP = " %~dp0 \Release\mRemote3G -Portable-%PRODUCT_VERSION % .zip"
125126)
126127
127128del %VERSIONNSH%
128129
129- echo Signing installer package...
130- %SIGNCMD% %INSTALLEREXE%
130+ rem echo Signing installer package...
131+ rem %SIGNCMD% %INSTALLEREXE%
131132
132133echo Creating release ZIP file...
134+ echo %BINARYZIP%
133135del /f /q %BINARYZIP% > nul 2 >& 1
134- %RAR % a -m5 - r -ep1 -afzip -inul %BINARYZIP% " %~dp0 \mRemoteV1\bin\Release\*.*"
135- %RAR % a -m5 - r -ep1 -afzip -inul %BINARYZIP% " %~dp0 \Installer\Dependencies\*.*"
136- %RAR % a -m5 -ep -afzip -inul %BINARYZIP% " %~dp0 \*.TXT"
136+ %SEVENZIP % a -r -tzip -y %BINARYZIP% " %~dp0 \mRemoteV1\bin\Release\*.*"
137+ %SEVENZIP % a -r -tzip -y %BINARYZIP% " %~dp0 \Installer\Dependencies\*.*"
138+ %SEVENZIP % a -r -tzip -y %BINARYZIP% " %~dp0 \*.TXT"
137139
138140echo Creating portable ZIP file...
141+ echo %PORTABLEZIP%
139142del /f /q %PORTABLEZIP% > nul 2 >& 1
140- %RAR % a -m5 - r -ep1 -afzip -inul %PORTABLEZIP% " %~dp0 \mRemoteV1\bin\Release Portable\*.*"
141- %RAR % a -m5 - r -ep1 -afzip -inul %PORTABLEZIP% " %~dp0 \Installer\Dependencies\*.*"
142- %RAR % a -m5 -ep -afzip -inul %PORTABLEZIP% " %~dp0 \*.TXT"
143+ %SEVENZIP % a -r -tzip -y %PORTABLEZIP% " %~dp0 \mRemoteV1\bin\Release Portable\*.*"
144+ %SEVENZIP % a -r -tzip -y %PORTABLEZIP% " %~dp0 \Installer\Dependencies\*.*"
145+ %SEVENZIP % a -r -tzip -y %PORTABLEZIP% " %~dp0 \*.TXT"
143146
144147echo .
145148echo Build process complete.
0 commit comments