Skip to content

Commit 4dc68b8

Browse files
authored
update-dmd-rewrite.sh: Deal with frontend headers having moved to compiler/include/ (#5124)
By leaving them as-is in our `dmd/` directory, so that the headers stay next to the D modules (locality is nice for e.g. frontend diffs), and our mods to the headers don't cause any conflicts.
1 parent d20bda5 commit 4dc68b8

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

tools/update-dmd-rewrite.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ fi
4545
# extract a subset of the dmd monorepo (druntime source + tests + Makefiles, dmd source + tests + osmodel.mak)
4646
git filter-repo --force \
4747
--path druntime/src --path druntime/test --path druntime/Makefile --path-glob 'druntime/*.mak' \
48-
--path compiler/src/dmd --path compiler/test --path compiler/src/osmodel.mak \
48+
--path compiler/src/dmd --path compiler/include/dmd --path compiler/test --path compiler/src/osmodel.mak \
4949
--path src --path test # required to keep git history before upstream druntime-merge (and associated directory movals)
5050
# remove unused files
5151
git filter-repo --invert-paths \
@@ -73,6 +73,7 @@ git filter-repo \
7373
`# move dirs/files` \
7474
--path-rename druntime/:runtime/druntime/ \
7575
--path-rename compiler/src/dmd/:dmd/ \
76+
--path-rename compiler/include/dmd/:dmd/ \
7677
--path-rename compiler/test/:tests/dmd/ \
7778
--path-rename compiler/src/osmodel.mak:dmd/osmodel.mak \
7879
`# prefix tags` \

0 commit comments

Comments
 (0)