Skip to content

Commit ef2a6a6

Browse files
authored
Merge pull request #2039 from jacob-carlborg/objc-refactor-glue
Remove `objc_glue.d` from the set of excluded files
2 parents 6194295 + ac639b3 commit ef2a6a6

File tree

1 file changed

+17
-5
lines changed

1 file changed

+17
-5
lines changed

posix.mak

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -205,9 +205,9 @@ MOD_EXCLUDES_PRERELEASE=$(addprefix --ex=, \
205205
std.experimental.ndslice.internal std.stdiobase \
206206
std.typetuple \
207207
tk. msvc_dmc msvc_lib \
208-
ddmd.libmach ddmd.libmscoff ddmd.objc_glue \
208+
ddmd.libmach ddmd.libmscoff \
209209
ddmd.scanmach ddmd.scanmscoff \
210-
dmd.libmach dmd.libmscoff dmd.objc_glue \
210+
dmd.libmach dmd.libmscoff \
211211
dmd.scanmach dmd.scanmscoff)
212212

213213
MOD_EXCLUDES_LATEST=$(MOD_EXCLUDES_PRERELEASE)
@@ -725,10 +725,16 @@ else
725725
DMD_EXCLUDE += -e /scanmach/d -e /libmach/d
726726
endif
727727

728+
# remove this after https://github.com/dlang/dmd/pull/7513 has been merged
729+
DMD_EXCLUDE_LATEST =
730+
ifneq (,$(wildcard $(DMD_DIR)/src/dmd/objc_glue_stubs.d))
731+
DMD_EXCLUDE_LATEST += -e /objc_glue.d/d
732+
endif
733+
728734
$G/docs-latest.json : ${DMD_LATEST} ${DMD_LATEST_DIR} \
729735
${DRUNTIME_LATEST_DIR} ${PHOBOS_LATEST_FILES_GENERATED} | dpl-docs
730736
find ${DMD_LATEST_DIR}/src -name '*.d' | \
731-
sed -e /mscoff/d -e /objc_glue.d/d ${DMD_EXCLUDE} \
737+
sed -e /mscoff/d ${DMD_EXCLUDE_LATEST} ${DMD_EXCLUDE} \
732738
> $G/.latest-files.txt
733739
find ${DRUNTIME_LATEST_DIR}/src -name '*.d' | \
734740
sed -e /unittest.d/d -e /gcstub/d >> $G/.latest-files.txt
@@ -741,13 +747,19 @@ $G/docs-latest.json : ${DMD_LATEST} ${DMD_LATEST_DIR} \
741747
--only-documented $(MOD_EXCLUDES_LATEST)
742748
rm -f $G/.latest-files.txt $G/.latest-dummy.html
743749

750+
# remove this after https://github.com/dlang/dmd/pull/7513 has been merged
751+
DMD_EXCLUDE_PRERELEASE =
752+
ifneq (,$(wildcard $(DMD_DIR)/src/dmd/objc_glue_stubs.d))
753+
DMD_EXCLUDE_PRERELEASE += -e /objc_glue.d/d
754+
endif
755+
744756
# DDox tries to generate the docs for all `.d` files. However for dmd this is tricky,
745757
# because the `{mach, elf, mscoff}` are platform dependent.
746-
# Thus the need to exclude these files (and the `objc_glue.d` file).
758+
# Thus the need to exclude these files.
747759
$G/docs-prerelease.json : ${DMD} ${DMD_DIR} ${DRUNTIME_DIR} \
748760
${PHOBOS_FILES_GENERATED} | dpl-docs
749761
find ${DMD_DIR}/src -name '*.d' | \
750-
sed -e /mscoff/d -e /objc_glue.d/d ${DMD_EXCLUDE} \
762+
sed -e /mscoff/d ${DMD_EXCLUDE_PRERELEASE} ${DMD_EXCLUDE} \
751763
> $G/.prerelease-files.txt
752764
find ${DRUNTIME_DIR}/src -name '*.d' | sed -e '/gcstub/d' \
753765
-e /unittest/d >> $G/.prerelease-files.txt

0 commit comments

Comments
 (0)