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

* Adapt WinMerge.vs2015.sln to new *.vs2015.vcxproj file names
* Adapt new BuildBin.vs2015.cmd to proper .sln name
* Adapt new BuildAll.vs2015.cmd to new BuildBin.vs2015 name
* Adapt BuildAll.vs2015.cmd to use VS140 (i.e. VS2015)
* Add new BuildBin.vs2015.cmd and BuildAll.vs2015.cmd added
	to WinMerge.vs2015.sln file

diff --git a/BuildAll.vs2015.cmd b/BuildAll.vs2015.cmd
index efda0dc..5181d7d 100644 (file)
--- a/BuildAll.vs2015.cmd
+++ b/BuildAll.vs2015.cmd
@@ -1,4 +1,4 @@
 cd /d "%~dp0"
-call buildmanual.cmd
-call buildbin.cmd
-call buildarc.cmd
+call BuildManual.cmd
+call BuildBin.vs2015.cmd
+call BuildArc.cmd

diff --git a/BuildBin.vs2015.cmd b/BuildBin.vs2015.cmd
index ecaec84..ed212f4 100644 (file)
--- a/BuildBin.vs2015.cmd
+++ b/BuildBin.vs2015.cmd
@@ -7,9 +7,10 @@ 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
+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%" (

diff --git a/WinMerge.vs2015.sln b/WinMerge.vs2015.sln
index ac9906d..770049e 100644 (file)
--- a/WinMerge.vs2015.sln
+++ b/WinMerge.vs2015.sln
@@ -2,22 +2,22 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
 VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Merge", "Src\Merge_vs2015.vcxproj", "{9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Merge", "Src\Merge.vs2015.vcxproj", "{9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}"
        ProjectSection(ProjectDependencies) = postProject
                {8164D41D-B053-405B-826C-CF37AC0EF176} = {8164D41D-B053-405B-826C-CF37AC0EF176}
                {9E211743-85FE-4977-82F3-4F04B40C912D} = {9E211743-85FE-4977-82F3-4F04B40C912D}
                {6FF56CDB-787A-4714-A28C-919003F9FA6C} = {6FF56CDB-787A-4714-A28C-919003F9FA6C}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MergeLang", "Src\MergeLang_vs2015.vcxproj", "{4B011DDA-2279-437D-903C-8028913AF31B}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MergeLang", "Src\MergeLang.vs2015.vcxproj", "{4B011DDA-2279-437D-903C-8028913AF31B}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Foundation", "Externals\poco\Foundation\Foundation_vs2015.vcxproj", "{8164D41D-B053-405B-826C-CF37AC0EF176}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Foundation", "Externals\poco\Foundation\Foundation.vs2015.vcxproj", "{8164D41D-B053-405B-826C-CF37AC0EF176}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XML", "Externals\poco\XML\XML_vs2015.vcxproj", "{9E211743-85FE-4977-82F3-4F04B40C912D}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XML", "Externals\poco\XML\XML.vs2015.vcxproj", "{9E211743-85FE-4977-82F3-4F04B40C912D}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Util", "Externals\poco\Util\Util_vs2015.vcxproj", "{6FF56CDB-787A-4714-A28C-919003F9FA6C}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Util", "Externals\poco\Util\Util.vs2015.vcxproj", "{6FF56CDB-787A-4714-A28C-919003F9FA6C}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UnitTests", "Testing\GoogleTest\UnitTests\UnitTests_vs2015.vcxproj", "{733E7C0B-AC3D-47AC-A8DA-E13644D6294D}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UnitTests", "Testing\GoogleTest\UnitTests\UnitTests.vs2015.vcxproj", "{733E7C0B-AC3D-47AC-A8DA-E13644D6294D}"
        ProjectSection(ProjectDependencies) = postProject
                {8164D41D-B053-405B-826C-CF37AC0EF176} = {8164D41D-B053-405B-826C-CF37AC0EF176}
                {9E211743-85FE-4977-82F3-4F04B40C912D} = {9E211743-85FE-4977-82F3-4F04B40C912D}
@@ -28,9 +28,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Poco", "Poco", "{220B870C-D
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Batch Files", "Batch Files", "{DC3B258E-444F-460D-8FD9-09A8165212FA}"
        ProjectSection(SolutionItems) = preProject
+               BuildAll.vs2015.cmd = BuildAll.vs2015.cmd
                BuildAll2.cmd = BuildAll2.cmd
                BuildArc.cmd = BuildArc.cmd
                BuildBin.cmd = BuildBin.cmd
+               BuildBin.vs2015.cmd = BuildBin.vs2015.cmd
                BuildInstaller.cmd = BuildInstaller.cmd
                BuildManual.cmd = BuildManual.cmd
                SetVersion.cmd = SetVersion.cmd