From 39352914d0d0c4d64bc1930332b99748a8fc5405 Mon Sep 17 00:00:00 2001
From: Mark Pizzolato <mark@infocomm.com>
Date: Sat, 7 Jan 2017 06:36:00 -0800
Subject: [PATCH] Visual Studio Projects: Make sure ROM checks used most recent
 BuildROMs

The BuildROMs project now runs the BuildROMs program that was most
recently built (Debug or Release).  This will identify ROM data inconsistencies
that may exist at build time.

When building other projects which may depend on ROM data, the BuildROMs
is run as a sanity check and if it fails we make sure that we hadn't run an out
of date Release build version of the BuildROMs binary.
---
 Visual Studio Projects/BuildROMs.vcproj    | 10 ++++++++++
 Visual Studio Projects/Pre-Build-Event.cmd |  7 ++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/Visual Studio Projects/BuildROMs.vcproj b/Visual Studio Projects/BuildROMs.vcproj
index 64c95129..d1967e99 100644
--- a/Visual Studio Projects/BuildROMs.vcproj	
+++ b/Visual Studio Projects/BuildROMs.vcproj	
@@ -35,6 +35,9 @@
 			<Tool
 				Name="VCXMLDataGeneratorTool"
 			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
 			<Tool
 				Name="VCMIDLTool"
 			/>
@@ -95,6 +98,8 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
+				Description="Verify ROM data"
+				CommandLine="pushd ..&#x0D;&#x0A;&quot;$(TargetPath)&quot;&#x0D;&#x0A;popd&#x0D;&#x0A;"
 			/>
 		</Configuration>
 		<Configuration
@@ -116,6 +121,9 @@
 			<Tool
 				Name="VCXMLDataGeneratorTool"
 			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
 			<Tool
 				Name="VCMIDLTool"
 			/>
@@ -178,6 +186,8 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
+				Description="Verify ROM data"
+				CommandLine="pushd ..&#x0D;&#x0A;&quot;$(TargetPath)&quot;&#x0D;&#x0A;popd&#x0D;&#x0A;"
 			/>
 		</Configuration>
 	</Configurations>
diff --git a/Visual Studio Projects/Pre-Build-Event.cmd b/Visual Studio Projects/Pre-Build-Event.cmd
index 5e616330..1f938fe2 100644
--- a/Visual Studio Projects/Pre-Build-Event.cmd	
+++ b/Visual Studio Projects/Pre-Build-Event.cmd	
@@ -123,8 +123,8 @@ if not "%_X_LIBPCRE%"   == "" set _X_BUILD=BUILD
 
 
 :_do_rom
-if "%_X_ROM%" == "" goto _done_rom
 pushd ..
+if "%_X_ROM%" == "" goto _done_rom
 SET _BLD=
 if exist BIN\NT\Win32-Debug\BuildROMs.exe SET _BLD=BIN\NT\Win32-Debug\BuildROMs.exe
 if exist BIN\NT\Win32-Release\BuildROMs.exe SET _BLD=BIN\NT\Win32-Release\BuildROMs.exe
@@ -136,8 +136,13 @@ if "%_BLD%" == "" echo ************************************************
 if "%_BLD%" == "" echo ************************************************
 if "%_BLD%" == "" exit 1
 %_BLD%
+if not errorlevel 1 goto _done_rom
+if not exist "BIN\NT\Win32-Release\BuildROMs.exe" exit 1
+del "BIN\NT\Win32-Release\BuildROMs.exe"
 popd
+goto _do_rom
 :_done_rom
+popd
 
 :_check_build
 if "%_X_BUILD%" == "" goto _done_build