From ab510885c0d16a87879addaa67afbc49b75c91f8 Mon Sep 17 00:00:00 2001 From: Mark Pizzolato Date: Fri, 4 Sep 2015 11:36:24 -0700 Subject: [PATCH] Visual Studio Projects: Forced serialization of Visual Studio Project fixes by making all simulators dependent on BuildROMs project. --- Visual Studio Projects/ALTAIR.vcproj | 4 +- Visual Studio Projects/AltairZ80.vcproj | 4 +- Visual Studio Projects/BESM6.vcproj | 4 +- Visual Studio Projects/ECLIPSE.vcproj | 4 +- Visual Studio Projects/FrontPanelTest.vcproj | 4 +- Visual Studio Projects/GRI.vcproj | 4 +- Visual Studio Projects/H316.vcproj | 4 +- Visual Studio Projects/HP2100.vcproj | 4 +- Visual Studio Projects/I1401.vcproj | 4 +- Visual Studio Projects/I1620.vcproj | 4 +- Visual Studio Projects/I7094.vcproj | 4 +- Visual Studio Projects/IBM1130.vcproj | 4 +- Visual Studio Projects/ID16.vcproj | 4 +- Visual Studio Projects/ID32.vcproj | 4 +- Visual Studio Projects/MicroVAX1.vcproj | 4 +- Visual Studio Projects/MicroVAX2.vcproj | 4 +- Visual Studio Projects/NOVA.vcproj | 4 +- Visual Studio Projects/PDP1.vcproj | 4 +- Visual Studio Projects/PDP10.vcproj | 4 +- Visual Studio Projects/PDP11.vcproj | 4 +- Visual Studio Projects/PDP15.vcproj | 4 +- Visual Studio Projects/PDP4.vcproj | 4 +- Visual Studio Projects/PDP7.vcproj | 4 +- Visual Studio Projects/PDP8.vcproj | 4 +- Visual Studio Projects/PDP9.vcproj | 4 +- Visual Studio Projects/PDQ3.vcproj | 4 +- Visual Studio Projects/Pre-Build-Event.cmd | 21 ++-- Visual Studio Projects/S3.vcproj | 4 +- Visual Studio Projects/SAGE.vcproj | 4 +- Visual Studio Projects/SDS.vcproj | 4 +- Visual Studio Projects/SSEM.vcproj | 4 +- Visual Studio Projects/Simh.sln | 99 +++++++++++++++++++ Visual Studio Projects/TX-0.vcproj | 4 +- Visual Studio Projects/VAX.vcproj | 4 +- Visual Studio Projects/VAX730.vcproj | 4 +- Visual Studio Projects/VAX750.vcproj | 4 +- Visual Studio Projects/VAX780.vcproj | 4 +- Visual Studio Projects/VAX8600.vcproj | 4 +- .../Win32-Development-Binaries/BuildAll.cmd | 2 +- Visual Studio Projects/alpha.vcproj | 4 +- Visual Studio Projects/isys8010.vcproj | 4 +- Visual Studio Projects/isys8020.vcproj | 4 +- Visual Studio Projects/lgp.vcproj | 4 +- Visual Studio Projects/rtVAX1000.vcproj | 4 +- Visual Studio Projects/sigma.vcproj | 4 +- Visual Studio Projects/swtp6800mp-a.vcproj | 4 +- Visual Studio Projects/swtp6800mp-a2.vcproj | 4 +- 47 files changed, 203 insertions(+), 95 deletions(-) diff --git a/Visual Studio Projects/ALTAIR.vcproj b/Visual Studio Projects/ALTAIR.vcproj index 48368a9a..867eba94 100644 --- a/Visual Studio Projects/ALTAIR.vcproj +++ b/Visual Studio Projects/ALTAIR.vcproj @@ -27,7 +27,7 @@ NUL if ERRORLEVEL 1 goto _next_arg findstr PlatformToolset %1 | findstr _xp >NUL @@ -49,8 +54,6 @@ if "" == "%_XP_Support_Available%" goto _done_xp_check if exist PlatformToolset.fix exit /b 1 echo. >>PlatformToolset.fix if ERRORLEVEL 1 exit /B 1 -set /a _SleepTime= 4 + %RANDOM% %% %NUMBER_OF_PROCESSORS% -ping -n %_SleepTime% localhost > NUL echo warning: Adding Windows XP suppport to all project files at %TIME% echo Set objFSO = CreateObject("Scripting.FileSystemObject") >>%1.fix.vbs @@ -69,8 +72,6 @@ for %%f in (*.vcxproj) do call :_Fix_PlatformToolset %1 %%f call :_GitHooks del %1.fix.vbs rem wait a bit here to allow a parallel build of the to complete additional projects -ping -n 10 localhost > NUL -del PlatformToolset.fix echo Error: Reload the changed projects and start the build again exit /B 1 :_Fix_PlatformToolset @@ -83,6 +84,14 @@ cscript %1.fix.vbs %2 > NUL 2>&1 exit /B 0 :_done_xp_check shift +goto _done_project +:_project_cleanup +shift +del PlatformToolset.fix +:_done_project +if exist PlatformToolset.fix echo error: Reload any changed projects and rebuild again, +if exist PlatformToolset.fix exit /b 1 + :_next_arg if "%1" == "" goto _done_args diff --git a/Visual Studio Projects/S3.vcproj b/Visual Studio Projects/S3.vcproj index 3e3b7661..25f56fd7 100644 --- a/Visual Studio Projects/S3.vcproj +++ b/Visual Studio Projects/S3.vcproj @@ -27,7 +27,7 @@