Standardize .cmd, .sln and .vcprojx file names (1)

* copy BuildBin.cmd as BuildBin.vs2015.cmd
* copy BuildAll2.cmd as BuildAll.vs2015.cmd
* change all *_vs2015.vcxproj to *.vs2015.vcxproj
* change WinMerge_vs2015.sln to WinMerge.vs2015.sln
* using *.vs2015.* file names from related projects and solutions.

* This commit simply handles file name changes, detailed content
	changes will be applied in the next commit

diff --git a/BuildAll.vs2015.cmd b/BuildAll.vs2015.cmd
new file mode 100644 (file)
index 0000000..efda0dc
--- /dev/null
+++ b/BuildAll.vs2015.cmd
@@ -0,0 +1,4 @@
+cd /d "%~dp0"
+call buildmanual.cmd
+call buildbin.cmd
+call buildarc.cmd

diff --git a/BuildBin.vs2015.cmd b/BuildBin.vs2015.cmd
new file mode 100644 (file)
index 0000000..ecaec84
--- /dev/null
+++ b/BuildBin.vs2015.cmd
@@ -0,0 +1,33 @@
+cd /d "%~dp0"
+
+del /s Build\*.exe
+del /s BuildTmp\*.res
+
+call SetVersion.cmd
+cscript /nologo ExpandEnvironmenStrings.vbs Version.in > Version.h
+
+setlocal
+call "%VS120COMNTOOLS%vsvars32.bat"
+MSBuild WinMerge.sln /t:Rebuild /p:Configuration="Release Unicode" /p:Platform="Win32" || pause
+MSBuild WinMerge.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
+  )
+)
+

diff --git a/Externals/poco/Foundation/Foundation_vs2015.vcxproj b/Externals/poco/Foundation/Foundation.vs2015.vcxproj
similarity index 100%
rename from Externals/poco/Foundation/Foundation_vs2015.vcxproj
rename to Externals/poco/Foundation/Foundation.vs2015.vcxproj

diff --git a/Externals/poco/Util/Util_vs2015.vcxproj b/Externals/poco/Util/Util.vs2015.vcxproj
similarity index 100%
rename from Externals/poco/Util/Util_vs2015.vcxproj
rename to Externals/poco/Util/Util.vs2015.vcxproj

diff --git a/Externals/poco/XML/XML_vs2015.vcxproj b/Externals/poco/XML/XML.vs2015.vcxproj
similarity index 100%
rename from Externals/poco/XML/XML_vs2015.vcxproj
rename to Externals/poco/XML/XML.vs2015.vcxproj

diff --git a/Src/Merge_vs2015.vcxproj b/Src/Merge.vs2015.vcxproj
similarity index 100%
rename from Src/Merge_vs2015.vcxproj
rename to Src/Merge.vs2015.vcxproj

diff --git a/Src/MergeLang_vs2015.vcxproj b/Src/MergeLang.vs2015.vcxproj
similarity index 100%
rename from Src/MergeLang_vs2015.vcxproj
rename to Src/MergeLang.vs2015.vcxproj

diff --git a/Testing/GoogleTest/UnitTests/UnitTests_vs2015.vcxproj b/Testing/GoogleTest/UnitTests/UnitTests.vs2015.vcxproj
similarity index 100%
rename from Testing/GoogleTest/UnitTests/UnitTests_vs2015.vcxproj
rename to Testing/GoogleTest/UnitTests/UnitTests.vs2015.vcxproj

diff --git a/WinMerge_vs2015.sln b/WinMerge.vs2015.sln
similarity index 100%
rename from WinMerge_vs2015.sln
rename to WinMerge.vs2015.sln