This is an archive of the discontinued LLVM Phabricator instance.

gn build: Make cmake sync script work on Windows if git is a bat file
ClosedPublic

Authored by thakis on Jan 28 2019, 9:25 AM.

Reviewers

Commits

hans added a subscriber: hans.

hans added inline comments.

llvm/utils/gn/build/sync_source_lists_from_cmake.py
22 ↗	(On Diff #183890)	Maybe worth a comment that shell=True is for the .bat file case?

This revision is now accepted and ready to land.Jan 28 2019, 11:34 AM

Thanks! Landed with the comment added.

This revision was automatically updated to reflect the committed changes.

Path

Size

llvm/

trunk/

utils/

gn/

build/

5 lines

	Show All 12 Lines
	from __future__ import print_function			from __future__ import print_function

	import os			import os
	import re			import re
	import subprocess			import subprocess


	def sync_source_lists():			def sync_source_lists():
	gn_files = subprocess.check_output(			# Use shell=True on Windows in case git is a bat file.
	['git', 'ls-files', '*BUILD.gn']).splitlines()			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.			# Matches e.g. \| "foo.cpp",\|, captures \|foo\| in group 1.
	gn_cpp_re = re.compile(r'^\s*"([^"]+\.(?:cpp\|h))",$', re.MULTILINE)			gn_cpp_re = re.compile(r'^\s*"([^"]+\.(?:cpp\|h))",$', re.MULTILINE)
	# Matches e.g. \| foo.cpp\|, captures \|foo\| in group 1.			# Matches e.g. \| foo.cpp\|, captures \|foo\| in group 1.
	cmake_cpp_re = re.compile(r'^\s*([A-Za-z_0-9/-]+\.(?:cpp\|h))$',			cmake_cpp_re = re.compile(r'^\s*([A-Za-z_0-9/-]+\.(?:cpp\|h))$',
	re.MULTILINE)			re.MULTILINE)

	for gn_file in gn_files:			for gn_file in gn_files:
	▲ Show 20 Lines • Show All 53 Lines • Show Last 20 Lines