torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'tor-github/pr/1657'

Browse Source
This commit is contained in:
Nick Mathewson
2020-01-15 13:10:14 -05:00
parent 5fa7c1b13f 73ac1add3f
commit 5e70c27e85
26 changed files with 611 additions and 457 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/maint/add_c_file.py
+2 -5
View File
@@ -192,12 +192,9 @@ def get_include_am_location(fname):
not (yet) consistent.
"""
td = topdir_file(fname)
m = re.match(r'^lib/([a-z0-9_]*)/', td)
m = re.match(r'^(lib|core|feature|app)/([a-z0-9_]*)/', td)
if m:
return "src/lib/{}/include.am".format(m.group(1))
if re.match(r'^(core|feature|app)/', td):
return "src/core/include.am"
return "src/{}/{}/include.am".format(m.group(1),m.group(2))
if re.match(r'^test/', td):
return "src/test/include.am"