Generate empty *Revision.inc files during the build process

Author: hughbe

lib/Basic/CMakeLists.txt

@@ -31,24 +31,27 @@ set(get_svn_script "${LLVM_MAIN_SRC_DIR}/cmake/modules/GetSVN.cmake")
 
 function(generate_revision_inc revision_inc_var name dir)
   find_first_existing_vc_file(dep_file "${dir}")
+  # Create custom target to generate the VC revision include.
+  set(revision_inc "${CMAKE_CURRENT_BINARY_DIR}/${name}Revision.inc")
+  string(TOUPPER ${name} upper_name)
   if(DEFINED dep_file)
-    # Create custom target to generate the VC revision include.
-    set(revision_inc "${CMAKE_CURRENT_BINARY_DIR}/${name}Revision.inc")
-    string(TOUPPER ${name} upper_name)
     add_custom_command(OUTPUT "${revision_inc}"
       DEPENDS "${dep_file}" "${get_svn_script}"
       COMMAND
       ${CMAKE_COMMAND} "-DFIRST_SOURCE_DIR=${dir}"
                        "-DFIRST_NAME=${upper_name}"
                        "-DHEADER_FILE=${revision_inc}"
                        -P "${get_svn_script}")
-
-    # Mark the generated header as being generated.
-    set_source_files_properties("${revision_inc}"
-      PROPERTIES GENERATED TRUE
-                 HEADER_FILE_ONLY TRUE)
-    set(${revision_inc_var} ${revision_inc} PARENT_SCOPE)
+  else()
+    # Generate an empty Revision.inc file if we are not using git or SVN.
+    file(WRITE "${revision_inc}" "")
   endif()
+
+  # Mark the generated header as being generated.
+  set_source_files_properties("${revision_inc}"
+    PROPERTIES GENERATED TRUE
+               HEADER_FILE_ONLY TRUE)
+  set(${revision_inc_var} ${revision_inc} PARENT_SCOPE)
 endfunction()
 
 generate_revision_inc(llvm_revision_inc LLVM "${LLVM_MAIN_SRC_DIR}")

lib/Basic/Version.cpp

@@ -43,22 +43,9 @@
   SWIFT_MAKE_VERSION_STRING(SWIFT_VERSION_MAJOR, SWIFT_VERSION_MINOR)
 #endif
 
-// MSVC doesn't support __has_include
-#if defined(_MSC_VER)
-# include "LLVMRevision.inc"
-# include "ClangRevision.inc"
-# include "SwiftRevision.inc"
-#else
-#if __has_include("LLVMRevision.inc")
-# include "LLVMRevision.inc"
-#endif
-#if __has_include("ClangRevision.inc")
-# include "ClangRevision.inc"
-#endif
-#if __has_include("SwiftRevision.inc")
-# include "SwiftRevision.inc"
-#endif
-#endif
+#include "LLVMRevision.inc"
+#include "ClangRevision.inc"
+#include "SwiftRevision.inc"
 
 namespace swift {
 namespace version {