diff options
| author | Josip Medved <jmedved@jmedved.com> | 2015-12-19 23:11:54 -0800 |
|---|---|---|
| committer | Josip Medved <jmedved@jmedved.com> | 2015-12-19 23:11:54 -0800 |
| commit | b5cff3524869f1023a9cd07dc04f3a8441318b70 (patch) | |
| tree | b1dfba1194883967e29f498aafee481231d3bcda | |
| parent | 08d8e9dc12cf0502c3784131bb5b7e454c141721 (diff) | |
| download | WrtSettings-b5cff3524869f1023a9cd07dc04f3a8441318b70.zip WrtSettings-b5cff3524869f1023a9cd07dc04f3a8441318b70.tar.gz WrtSettings-b5cff3524869f1023a9cd07dc04f3a8441318b70.tar.bz2 | |
Adjusting for Visual Studio 2015.
| -rw-r--r-- | Setup/Publish.cmd | 85 | ||||
| -rw-r--r-- | Source/WrtSettings.sln | 5 |
2 files changed, 73 insertions, 17 deletions
diff --git a/Setup/Publish.cmd b/Setup/Publish.cmd index dd3257c..605eb16 100644 --- a/Setup/Publish.cmd +++ b/Setup/Publish.cmd @@ -6,39 +6,97 @@ SET FILE_SOLUTION="..\Source\WrtSettings.sln" SET FILES_EXECUTABLE="..\Binaries\WrtSettings.exe"
SET FILES_OTHER="..\Binaries\ReadMe.txt"
-SET COMPILE_TOOL_1="%PROGRAMFILES(X86)%\Microsoft Visual Studio 12.0\Common7\IDE\devenv.exe"
-SET COMPILE_TOOL_2="%PROGRAMFILES(X86)%\Microsoft Visual Studio 12.0\Common7\IDE\WDExpress.exe"
+SET COMPILE_TOOL_1="%PROGRAMFILES(X86)%\Microsoft Visual Studio 14.0\Common7\IDE\devenv.exe"
+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="%PROGRAMFILES(X86)%\Windows Kits\8.0\bin\x86\signtool.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_HASH="C02FF227D5EE9F555C13D4C622697DF15C6FF871"
SET SIGN_TIMESTAMPURL="http://timestamp.comodoca.com/rfc3161"
-FOR /F "delims=" %%N IN ('git rev-list --count HEAD') DO @SET VERSION_NUMBER=%%N%
-FOR /F "delims=" %%N IN ('git log -n 1 --format^=%%h') DO @SET VERSION_HASH=%%N%
+SET GIT_TOOL_1="%PROGRAMFILES%\Git\mingw64\bin\git.exe"
-ECHO --- BUILD SOLUTION
+ECHO --- DISCOVER TOOLS
ECHO.
IF EXIST %COMPILE_TOOL_1% (
- ECHO Using Visual Studio
+ ECHO Visual Studio 2015
SET COMPILE_TOOL=%COMPILE_TOOL_1%
) ELSE (
IF EXIST %COMPILE_TOOL_2% (
- ECHO Using Visual Studio Express
+ ECHO Visual Studio Express 2015
SET COMPILE_TOOL=%COMPILE_TOOL_2%
) ELSE (
- ECHO Cannot find Visual Studio!
+ ECHO Cannot find Visual Studio^^!
+ PAUSE && EXIT /B 255
+ )
+)
+
+IF EXIST %SETUP_TOOL% (
+ ECHO Inno Setup 5
+) ELSE (
+ ECHO Cannot find Inno Setup 5^^!
+ PAUSE && EXIT /B 255
+)
+
+IF EXIST %SIGN_TOOL_1% (
+ ECHO Windows SignTool 8.1
+ SET SIGN_TOOL=%SIGN_TOOL_1%
+) ELSE (
+ IF EXIST %SIGN_TOOL_2% (
+ ECHO Windows SignTool 8.0
+ SET SIGN_TOOL=%SIGN_TOOL_2%
+ ) ELSE (
+ ECHO Cannot find Windows SignTool^^!
PAUSE && EXIT /B 255
)
)
+IF EXIST %GIT_TOOL_1% (
+ ECHO Git
+ SET GIT_TOOL=%GIT_TOOL_1%
+) ELSE (
+ GIT_TOOL="git"
+)
+
+ECHO.
+ECHO.
+
+
+ECHO --- DISCOVER VERSION
+ECHO.
+
+FOR /F "delims=" %%N IN ('%GIT_TOOL% log -n 1 --format^=%%h') DO @SET VERSION_HASH=%%N%
+
+IF NOT [%VERSION_HASH%]==[] (
+ FOR /F "delims=" %%N IN ('%GIT_TOOL% rev-list --count HEAD') DO @SET VERSION_NUMBER=%%N%
+ %GIT_TOOL% diff --exit-code --quiet
+ IF ERRORLEVEL 1 SET VERSION_HASH=%VERSION_HASH%+
+ ECHO %VERSION_HASH%
+)
+
+ECHO.
+ECHO.
+
+
+ECHO --- BUILD SOLUTION
+ECHO.
+
RMDIR /Q /S "..\Binaries" 2> NUL
%COMPILE_TOOL% /Build "Release" %FILE_SOLUTION%
-COPY ..\README.md ..\Binaries\ReadMe.txt
IF ERRORLEVEL 1 PAUSE && EXIT /B %ERRORLEVEL%
+COPY ..\README.md ..\Binaries\ReadMe.txt > NUL
+IF ERRORLEVEL 1 PAUSE && EXIT /B %ERRORLEVEL%
+
+COPY ..\LICENSE.md ..\Binaries\License.txt > NUL
+IF ERRORLEVEL 1 PAUSE && EXIT /B %ERRORLEVEL%
+
+ECHO Completed.
+
+ECHO.
ECHO.
@@ -117,9 +175,8 @@ ECHO. ECHO --- BUILD ZIP
ECHO.
-SET _SETUPZIP=%_SETUPEXE:.exe=.zip%
-ECHO Zipping into %_SETUPZIP%
-"%PROGRAMFILES%\WinRAR\WinRAR.exe" a -afzip -ep -m5 ".\Temp\%_SETUPZIP%" %FILES_EXECUTABLE% %FILES_OTHER%
+ECHO Zipping into %_SETUPEXE:.exe=.zip%
+"%PROGRAMFILES%\WinRAR\WinRAR.exe" a -afzip -ep -m5 ".\Temp\%_SETUPEXE:.exe=.zip%" %FILE_EXECUTABLE% %FILES_OTHER%
IF ERRORLEVEL 1 PAUSE && EXIT /B %ERRORLEVEL%
ECHO.
@@ -140,4 +197,4 @@ ECHO. ECHO --- DONE
ECHO.
-PAUSE
+explorer /select,"..\Releases\%_SETUPEXE%"
diff --git a/Source/WrtSettings.sln b/Source/WrtSettings.sln index b7f060a..e20c4dd 100644 --- a/Source/WrtSettings.sln +++ b/Source/WrtSettings.sln @@ -1,7 +1,6 @@ -
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.30110.0
+# Visual Studio 14
+VisualStudioVersion = 14.0.22823.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WrtSettings", "WrtSettings\WrtSettings.csproj", "{7D43DB74-7DE3-4EE4-8591-D520DD1AB0BF}"
EndProject
|