@@ -155,7 +155,7 @@ DUB_DIR=../dub
155
155
156
156
# Auto-cloning missing directories
157
157
$(shell [ ! -d $(DMD_DIR) ] && git clone --depth=1 ${GIT_HOME}/dmd $(DMD_DIR))
158
- include $(DMD_DIR ) /src/osmodel.mak
158
+ include $(DMD_DIR ) /compiler/ src/osmodel.mak
159
159
160
160
# External binaries
161
161
DMD =$(DMD_DIR ) /generated/$(OS ) /release/$(MODEL ) /dmd
@@ -593,10 +593,10 @@ ${DMD_DIR}/VERSION : ${DMD_DIR}
593
593
# ###############################################################################
594
594
595
595
$(DMD ) : ${DMD_DIR}
596
- ${MAKE} --directory=${DMD_DIR} /src -f posix.mak AUTO_BOOTSTRAP=1
596
+ ${MAKE} --directory=${DMD_DIR} /compiler/ src -f posix.mak AUTO_BOOTSTRAP=1
597
597
598
598
$(DMD_LATEST ) : ${DMD_LATEST_DIR}
599
- ${MAKE} --directory=${DMD_LATEST_DIR} /src -f posix.mak AUTO_BOOTSTRAP=1
599
+ ${MAKE} --directory=${DMD_LATEST_DIR} /compiler/ src -f posix.mak AUTO_BOOTSTRAP=1
600
600
sed -i -e " s|../druntime/import |../../dmd-${LATEST} /druntime/import |" -e " s|../phobos |../phobos-${LATEST} |" $@ .conf
601
601
602
602
dmd-prerelease : $(STD_DDOC_PRERELEASE ) druntime-target $G/changelog/next-version
@@ -719,21 +719,21 @@ $W/library-prerelease/.htaccess : dpl_prerelease_htaccess
719
719
720
720
$G/docs-latest.json : ${DMD_LATEST} ${DMD_LATEST_DIR} \
721
721
${DRUNTIME_LATEST_DIR} | dpl-docs
722
- find ${DMD_LATEST_DIR} /src -name ' *.d' -o -name ' *.di' | sort -r | \
722
+ find ${DMD_LATEST_DIR} /compiler/ src -name ' *.d' -o -name ' *.di' | sort -r | \
723
723
gawk ' !n[gensub(/\.di?$$/, "", 1)]++' > $G /.latest-files.txt
724
724
find ${DRUNTIME_LATEST_DIR} /src -name ' *.d' | \
725
725
sed -e /unittest.d/d -e /gcstub/d >> $G /.latest-files.txt
726
726
find ${PHOBOS_LATEST_DIR} /etc ${PHOBOS_LATEST_DIR} /std -name ' *.d' | \
727
727
sed -e /unittest.d/d | sort >> $G /.latest-files.txt
728
- ${DMD_LATEST} -J$(DMD_LATEST_DIR ) /src/dmd/res -J$(dir $(DMD_LATEST ) ) -c -o- -version=CoreDdoc \
728
+ ${DMD_LATEST} -J$(DMD_LATEST_DIR ) /compiler/ src/dmd/res -J$(dir $(DMD_LATEST ) ) -c -o- -version=CoreDdoc \
729
729
-version=MARS -version=CoreDdoc -version=StdDdoc -Df$G /.latest-dummy.html \
730
730
-Xf$@ -I${PHOBOS_LATEST_DIR} @$G /.latest-files.txt
731
731
${DPL_DOCS} ${DPL_DOCS_FLAGS} filter $@ --min-protection=Protected \
732
732
--only-documented $(MOD_EXCLUDES_LATEST )
733
733
rm -f $G /.latest-files.txt $G /.latest-dummy.html
734
734
735
735
$G/docs-prerelease.json : ${DMD} ${DMD_DIR} ${DRUNTIME_DIR} | dpl-docs
736
- find ${DMD_DIR} /src -name ' *.d' -o -name ' *.di' | sort -r | \
736
+ find ${DMD_DIR} /compiler/ src -name ' *.d' -o -name ' *.di' | sort -r | \
737
737
gawk ' !n[gensub(/\.di?$$/, "", 1)]++' > $G /.prerelease-files.txt
738
738
find ${DRUNTIME_DIR} /src -name ' *.d' | \
739
739
sed -e /unittest/d >> $G /.prerelease-files.txt
0 commit comments