@@ -713,49 +713,45 @@ $W/library-prerelease/.htaccess : dpl_prerelease_htaccess
713
713
@mkdir -p $(dir $@ )
714
714
cp $< $@
715
715
716
- DMD_EXCLUDE =
716
+ # Can be removed after 2.079.0 (2018-03-01) (see https://github.com/dlang/dmd/pull/7567 for details)
717
+ DMD_EXCLUDE_LATEST = -e /mscoff/d
717
718
ifeq (osx,$(OS ) )
718
- DMD_EXCLUDE += -e /scanelf/d -e /libelf/d
719
+ DMD_EXCLUDE_LATEST += -e /scanelf/d -e /libelf/d
719
720
else
720
- DMD_EXCLUDE += -e /scanmach/d -e /libmach/d
721
+ DMD_EXCLUDE_LATEST += -e /scanmach/d -e /libmach/d
721
722
endif
722
723
723
724
$G/docs-latest.json : ${DMD_LATEST} ${DMD_LATEST_DIR} \
724
725
${DRUNTIME_LATEST_DIR} ${PHOBOS_LATEST_FILES_GENERATED} | dpl-docs
725
726
# remove this after https://github.com/dlang/dmd/pull/7513 has been merged
726
727
if [ -f $( DMD_LATEST_DIR) /src/* /objc_glue_stubs.d ] ; then \
727
- DMD_EXCLUDE_LATEST =" -e /objc_glue.d/d" ; \
728
+ DMD_EXCLUDE_LATEST_BASH =" -e /objc_glue.d/d" ; \
728
729
fi ; \
729
730
find ${DMD_LATEST_DIR} /src -name ' *.d' | \
730
- sed -e /mscoff/d $$ {DMD_EXCLUDE_LATEST} ${DMD_EXCLUDE} \
731
- > $G /.latest-files.txt
731
+ sed -e /mscoff/d $$ {DMD_EXCLUDE_LATEST_BASH} ${DMD_EXCLUDE_LATEST}
732
732
find ${DRUNTIME_LATEST_DIR} /src -name ' *.d' | \
733
733
sed -e /unittest.d/d -e /gcstub/d >> $G /.latest-files.txt
734
734
find ${PHOBOS_LATEST_DIR_GENERATED} -name ' *.d' | \
735
- sed -e /unittest.d/d -e /windows/d | sort >> $G /.latest-files.txt
735
+ sed -e /unittest.d/d | sort >> $G /.latest-files.txt
736
736
${DMD_LATEST} -J$(DMD_LATEST_DIR ) /res -J$(dir $(DMD_LATEST ) ) -c -o- -version=CoreDdoc \
737
737
-version=MARS -version=CoreDdoc -version=StdDdoc -Df$G /.latest-dummy.html \
738
738
-Xf$@ -I${PHOBOS_LATEST_DIR_GENERATED} @$G /.latest-files.txt
739
739
${DPL_DOCS} filter $@ --min-protection=Protected \
740
740
--only-documented $(MOD_EXCLUDES_LATEST )
741
741
rm -f $G /.latest-files.txt $G /.latest-dummy.html
742
742
743
- # DDox tries to generate the docs for all `.d` files. However for dmd this is tricky,
744
- # because the `{mach, elf, mscoff}` are platform dependent.
745
- # Thus the need to exclude these files.
746
743
$G/docs-prerelease.json : ${DMD} ${DMD_DIR} ${DRUNTIME_DIR} \
747
744
${PHOBOS_FILES_GENERATED} | dpl-docs
748
745
# remove this after https://github.com/dlang/dmd/pull/7513 has been merged
749
746
if [ -f $( DMD_DIR) /src/* /objc_glue_stubs.d ] ; then \
750
747
DMD_EXCLUDE_PRERELEASE=" -e /objc_glue.d/d" ; \
751
748
fi ; \
752
749
find ${DMD_DIR} /src -name ' *.d' | \
753
- sed -e /mscoff/d $$ {DMD_EXCLUDE_PRERELEASE} ${DMD_EXCLUDE} \
754
- > $G /.prerelease-files.txt
755
- find ${DRUNTIME_DIR} /src -name ' *.d' | sed -e ' /gcstub/d' \
756
- -e /unittest/d >> $G /.prerelease-files.txt
757
- find ${PHOBOS_DIR_GENERATED} -name ' *.d' | sed -e /unittest.d/d \
758
- -e /windows/d | sort >> $G /.prerelease-files.txt
750
+ sed -e /mscoff/d $$ {DMD_EXCLUDE_PRERELEASE} > $G /.prerelease-files.txt
751
+ find ${DRUNTIME_DIR} /src -name ' *.d' | \
752
+ sed -e /unittest/d >> $G /.prerelease-files.txt
753
+ find ${PHOBOS_DIR_GENERATED} -name ' *.d' | \
754
+ sed -e /unittest.d/d | sort >> $G /.prerelease-files.txt
759
755
${DMD} -J$(DMD_DIR ) /res -J$(dir $(DMD ) ) -c -o- -version=MARS -version=CoreDdoc \
760
756
-version=StdDdoc -Df$G /.prerelease-dummy.html \
761
757
-Xf$@ -I${PHOBOS_DIR_GENERATED} @$G /.prerelease-files.txt
0 commit comments