[gn] Support dots in CMake paths in the sync script

[phosek]

Summary

Some file paths use dots to pick up sources from parent directories.

[bryant]

Drive-by.

llvm/utils/gn/build/sync_source_lists_from_cmake.py

28 ↗

(On Diff #195259)

\.?

[bryant]

llvm/utils/gn/build/sync_source_lists_from_cmake.py

28 ↗

(On Diff #195259)

My mistake, disregard.

[thakis]

Looks good, but I don't understand the CMake change.

compiler-rt/lib/sanitizer_common/CMakeLists.txt

122 ↗

(On Diff #195259)

Are you intentionally removing this?

[phosek]

compiler-rt/lib/sanitizer_common/CMakeLists.txt

122 ↗

(On Diff #195259)

After the sync_source_lists_from_cmake.py change, this one is being flagged, but there are other headers like this one for other architectures, e.g. sanitizer_common_interceptors_vfork_x86_64.inc.S, none of which are listed in the CMake file, so I figured it's better to remove this one to make this file self-consistent.

[phosek]

Ping?

[thakis]

compiler-rt/lib/sanitizer_common/CMakeLists.txt

122 ↗

(On Diff #195259)

Ok, looks like this file is included somewhere and removing it here shouldn't change the build. Maybe .S.inc would be a better name :)

compiler-rt/trunk/lib/sanitizer_common/CMakeLists.txt

set(SANITIZER_IMPL_HEADERS
   sanitizer_atomic_clang_x86.h
   sanitizer_atomic_msvc.h
   sanitizer_bitvector.h
   sanitizer_bvgraph.h
   sanitizer_common.h
   sanitizer_common_interceptors.inc
   sanitizer_common_interceptors_format.inc
   sanitizer_common_interceptors_ioctl.inc
-  sanitizer_common_interceptors_vfork_aarch64.inc.S
   sanitizer_common_interface.inc
   sanitizer_common_interface_posix.inc
   sanitizer_common_syscalls.inc
   sanitizer_coverage_interface.inc
   sanitizer_dbghelp.h
   sanitizer_deadlock_detector.h
   sanitizer_deadlock_detector_interface.h
   sanitizer_errno.h

llvm/trunk/utils/gn/build/sync_source_lists_from_cmake.py

 def sync_source_lists():
     # Use shell=True on Windows in case git is a bat file.
     gn_files = subprocess.check_output(['git', 'ls-files', '*BUILD.gn'],
                                        shell=os.name == 'nt').splitlines()
 
     # Matches e.g. |   "foo.cpp",|, captures |foo| in group 1.
     gn_cpp_re = re.compile(r'^\s*"([^"]+\.(?:cpp|c|h|S))",$', re.MULTILINE)
     # Matches e.g. |   foo.cpp|, captures |foo| in group 1.
-    cmake_cpp_re = re.compile(r'^\s*([A-Za-z_0-9/-]+\.(?:cpp|c|h|S))$',
+    cmake_cpp_re = re.compile(r'^\s*([A-Za-z_0-9./-]+\.(?:cpp|c|h|S))$',
                               re.MULTILINE)
 
     for gn_file in gn_files:
         # The CMakeLists.txt for llvm/utils/gn/secondary/foo/BUILD.gn is
         # directly at foo/CMakeLists.txt.
         strip_prefix = 'llvm/utils/gn/secondary/'
         if not gn_file.startswith(strip_prefix):
             continue

llvm/trunk/utils/gn/secondary/clang/tools/libclang/BUILD.gn

sources = [
     "CXStoredDiagnostic.cpp",
     "CXString.cpp",
     "CXString.h",
     "CXTranslationUnit.h",
     "CXType.cpp",
     "CXType.h",
     "Index_Internal.h",
     "Indexing.cpp",
+    "../../include/clang-c/Index.h",
   ]
   if (host_os == "mac") {
     ldflags = [
       "-Wl,-compatibility_version,1",
       "-Wl,-current_version,$llvm_version",
 
       # See llvm_setup_rpath() in CMake.
       "-Wl,-install_name,@rpath/libclang.dylib",
       "-Wl,-rpath,@loader_path/../lib",
     ]
   }
 
   # FIXME: Use libclang.exports
 }