Removing old buildinfo.h files hanging around

microsoft · Jun 6, 2018 · 5d92880 · 5d92880
1 parent c42a444
commit 5d92880
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -189,6 +189,8 @@ core
 *.lyx~
 
 # prebuild file
+Source/CNTK/buildinfo.h
+Source/CNTKv2LibraryDll/buildinfo.h
 Source/CNTKv2LibraryDll/Generated
 Source/CNTKv2LibraryDll/tensorboard/tensorboard.pb.h
 Source/CNTKv2LibraryDll/tensorboard/tensorboard.pb.cc

diff --git a/Source/CNTKv2LibraryDll/prebuild.bat b/Source/CNTKv2LibraryDll/prebuild.bat
@@ -10,6 +10,10 @@ setlocal enableDelayedexpansion
 ::: This is called as a pre-build step for the CNTK executable, taking parameters below.
 ::: It creates Generated\Windows\buildinfo.h, which makes version information available to the executable itself.
 
+:: Delete the old versions of the buildinfo file, as they can break the build in some scenarios if left hanging around
+if exist "..\CNTK\buildinfo.h" del "..\CNTK\buildinfo.h"
+if exist "buildinfo.h" del "buildinfo.h"
+
 if not exist "Generated\Windows" mkdir "Generated\Windows"
 set _outfile=Generated\Windows\buildinfo.h
 

diff --git a/Tools/generate_build_info b/Tools/generate_build_info
@@ -154,6 +154,10 @@ BUILDER=$USER
 BUILDMACHINE=`hostname`
 BUILDPATH=`pwd`
 
+# Delete the old versions of the buildinfo file, as they can break the build in some scenarios if left hanging around
+[ ! -e Source/CNTK/buildinfo.h ] || rm Source/CNTK/buildinfo.h
+[ ! -e Source/CNTKv2LibraryDll/buildinfo.h ] || rm Source/CNTKv2LibraryDll/buildinfo.h
+
 target=Source/CNTKv2LibraryDll/Generated/Linux/buildinfo.h
 if [ ! -d Source ] ; then
     usage