Move intermediate file into intermediate dir (#5981)

The intermediate file, cmake.definitions, is moved into the intermediate directory: bin/obj/OS.Arch.Conf/ The script won't emit error for not having the cmake results because some systems (Windows) do not use Cmake and users might use "skipnative". Fixes #5976 Signed-off-by: MyungJoo Ham <[email protected]>
dotnet · 5acbced129024a38aec530f1bb9cd85b7568e05a · myungjoo committed with janvorli Jun 28, 2016 · Jun 28, 2016 · 5acbced
1 parent 4f134e6
commit 5acbced129024a38aec530f1bb9cd85b7568e05a
Unified Split

Showing with 11 additions and 5 deletions.

+3 −3 definitionsconsistencycheck.cmake

+2 −1 src/mscorlib/System.Private.CoreLib.csproj

+6 −1 src/scripts/check-definitions.py
diff --git a/definitionsconsistencycheck.cmake b/definitionsconsistencycheck.cmake
@@ -1,11 +1,11 @@
 get_directory_property( DirDefs COMPILE_DEFINITIONS )
 
 # Reset the definition file
-file(WRITE cmake.definitions "")
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/cmake.definitions "")
 foreach( d ${DirDefs} )
     if($ENV{VERBOSE})
         message( STATUS "Compiler Definition: " ${d} )
     endif($ENV{VERBOSE})
-    file(APPEND cmake.definitions ${d})
-    file(APPEND cmake.definitions "\n")
+    file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/cmake.definitions ${d})
+    file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/cmake.definitions "\n")
 endforeach()
diff --git a/src/mscorlib/System.Private.CoreLib.csproj b/src/mscorlib/System.Private.CoreLib.csproj
@@ -183,8 +183,9 @@
     <Message Importance="High" Text="============" />
     <PropertyGroup>
       <IgnoreDefineConstants>FEATURE_IMPLICIT_TLS;FEATURE_HIJACK</IgnoreDefineConstants>
+      <CMakeDefinitionSaveFile>$(IntermediateOutputPath)\cmake.definitions</CMakeDefinitionSaveFile>
     </PropertyGroup>
-    <Exec Command='python $(MSBuildThisFileDirectory)../scripts/check-definitions.py $(MSBuildThisFileDirectory)../../cmake.definitions "$(DefineConstants)" "$(IgnoreDefineConstants)" ' />
+    <Exec Command='python $(MSBuildThisFileDirectory)..\scripts\check-definitions.py "$(CMakeDefinitionSaveFile)" "$(DefineConstants)" "$(IgnoreDefineConstants)" ' />
     <Message Importance="High" Text="============" />
   </Target>
 
diff --git a/src/scripts/check-definitions.py b/src/scripts/check-definitions.py
@@ -33,7 +33,12 @@
 # For the native part, return the sorted definition array.
 def loadDefinitionFile(filename):
     result = []
-    f = open(filename, 'r')
+    try:
+        f = open(filename, 'r')
+    except:
+        sys.exit(0)
+    # if cmake was not used (because of skipnative or systems that do not use cmake), this script won't work.
+
     for line in f:
         theLine = line.rstrip("\r\n").strip()
         if (len(theLine) > 0):