Standardize Various Visual Studio File Names

.gitignore

@@ -1,23 +1,23 @@
-Testing/GoogleTest/UnitTests/x64Release
-Testing/GoogleTest/UnitTests/x64Debug
-Testing/GoogleTest/UnitTests/Release
-Testing/GoogleTest/UnitTests/Debug/
-Externals/poco/Foundation/obj64
-Externals/poco/Foundation/obj
-Externals/poco/Util/obj64
-Externals/poco/Util/obj
-Externals/poco/XML/obj64
-Externals/poco/XML/obj
-Externals/poco/lib
-Externals/poco/lib64
-BuildTmp
-Build
-Testing/GoogleTest/UnitTests/UnitTests.exe
-Testing/GoogleTest/UnitTests/*.pdb
-Testing/Data/ShellFileOpTest/File1.txt
-Translations/WinMerge/MergeLang.rc
-.vs/
+
+**/.vs
+**/ipch
+
+**/BuildTmp
+**/Build
+**/obj64
+**/obj
+**/lib64
+**/lib
+**/x64Release
+**/Release
+**/x64Debug
+**/Debug
+
+*.exe
+*.pdb
 *.bak
 *.VC.db
 *.VC.VC.opendb
-ipch/*
+
+Testing/Data/ShellFileOpTest/File1.txt
+Translations/WinMerge/MergeLang.rc

BuildAll.vs2015.cmd

@@ -0,0 +1,4 @@
+cd /d "%~dp0"
+call BuildManual.cmd
+call BuildBin.vs2015.cmd
+call BuildArc.cmd

BuildBin.vs2015.cmd

@@ -0,0 +1,34 @@
+cd /d "%~dp0"
+
+del /s Build\*.exe
+del /s BuildTmp\*.res
+
+call SetVersion.cmd
+cscript /nologo ExpandEnvironmenStrings.vbs Version.in > Version.h
+
+setlocal
+set VisualStudioVersion=14.0
+call "%VS140COMNTOOLS%vsvars32.bat"
+MSBuild WinMerge.vs2015.sln /t:Rebuild /p:Configuration="Release Unicode" /p:Platform="Win32" || pause
+MSBuild WinMerge.vs2015.sln /t:Rebuild /p:Configuration="Release Unicode" /p:Platform="x64" || pause
+endlocal
+
+if exist "%SIGNBAT_PATH%" (
+  call "%SIGNBAT_PATH%" Build\MergeUnicodeRelease\WinMergeU.exe
+  call "%SIGNBAT_PATH%" Build\MergeUnicodeRelease\MergeLang.dll
+  call "%SIGNBAT_PATH%" Build\x64\MergeUnicodeRelease\WinMergeU.exe
+  call "%SIGNBAT_PATH%" Build\x64\MergeUnicodeRelease\MergeLang.dll
+)
+
+mkdir Build\MergeUnicodeRelease\%APPVER% 2> NUL
+mkdir Build\x64\MergeUnicodeRelease\%APPVER% 2> NUL
+copy Build\MergeUnicodeRelease\*.pdb "Build\MergeUnicodeRelease\%APPVER%\"
+copy Build\x64\MergeUnicodeRelease\*.pdb "Build\x64\MergeUnicodeRelease\%APPVER%\"
+
+for %%i in ("%ProgramFiles(x86)%" "%ProgramFiles%") do (
+  if exist "%%~i\Inno Setup 5\iscc.exe" (
+    "%%~i\Inno Setup 5\iscc.exe" "Installer\innosetup\WinMerge.iss" || pause
+    "%%~i\Inno Setup 5\iscc.exe" "Installer\innosetup\WinMergeX64.iss" || pause
+  )
+)
+