diff --git a/create_dmd_release/patches/dlang.org.patch b/create_dmd_release/patches/dlang.org.patch index 6a12bb7d..75ced8e2 100644 --- a/create_dmd_release/patches/dlang.org.patch +++ b/create_dmd_release/patches/dlang.org.patch @@ -11,19 +11,21 @@ index 7f0782a..58795e6 100644 $(MENU_W_SUBMENU_LINK $(ROOT_DIR)community.html, Community) $(NAVIGATION_COMMUNITY) diff --git a/posix.mak b/posix.mak -index f56832b..0787742 100644 +index ba5506e..64116db 100644 --- a/posix.mak +++ b/posix.mak -@@ -56,8 +56,6 @@ PHOBOS_STABLE_DIR_GENERATED=$(GENERATED)/phobos-release +@@ -56,10 +56,6 @@ PHOBOS_STABLE_DIR_GENERATED=$(GENERATED)/phobos-release # Makefile dependencies and rules PHOBOS_FILES := $(shell find $(PHOBOS_DIR) -name '*.d' -o -name '*.mak' -o -name '*.ddoc') PHOBOS_FILES_GENERATED := $(subst $(PHOBOS_DIR), $(PHOBOS_DIR_GENERATED), $(PHOBOS_FILES)) +-$(shell [ ! -d $(PHOBOS_DIR) ] && git clone --depth=1 ${GIT_HOME}/phobos $(PHOBOS_DIR)) +-$(shell [ ! -d $(PHOBOS_STABLE_DIR) ] && git clone -b v${LATEST} --depth=1 ${GIT_HOME}/phobos $(PHOBOS_STABLE_DIR)) -PHOBOS_STABLE_FILES := $(shell find $(PHOBOS_STABLE_DIR) -name '*.d' -o -name '*.mak' -o -name '*.ddoc') -PHOBOS_STABLE_FILES_GENERATED := $(subst $(PHOBOS_STABLE_DIR), $(PHOBOS_STABLE_DIR_GENERATED), $(PHOBOS_STABLE_FILES)) ################################################################################ # stable dub and dmd versions used to build dpl-docs -@@ -161,8 +159,7 @@ SPEC_ROOT=$(addprefix spec/, \ +@@ -163,8 +159,7 @@ SPEC_ROOT=$(addprefix spec/, \ abi simd) SPEC_DD=$(addsuffix .dd,$(SPEC_ROOT)) @@ -33,7 +35,7 @@ index f56832b..0787742 100644 # Website root filenames. They have extension .dd in the source # and .html in the generated HTML. Save for the expansion of -@@ -191,7 +188,7 @@ ALL_FILES = $(ALL_FILES_BUT_SITEMAP) $(DOC_OUTPUT_DIR)/sitemap.html +@@ -193,7 +188,7 @@ ALL_FILES = $(ALL_FILES_BUT_SITEMAP) $(DOC_OUTPUT_DIR)/sitemap.html # Rulez ################################################################################ @@ -42,19 +44,19 @@ index f56832b..0787742 100644 docs : dmd-release dmd-prerelease phobos-prerelease druntime-prerelease \ druntime-release phobos-release apidocs-release apidocs-prerelease -@@ -217,9 +214,9 @@ ${GENERATED}/${LATEST}.ddoc : +@@ -219,9 +214,9 @@ ${GENERATED}/${LATEST}.ddoc : mkdir -p $(dir $@) echo "LATEST=${LATEST}" >$@ --${GENERATED}/modlist-${LATEST}.ddoc : modlist.d ${STABLE_DMD} $(DRUNTIME_STABLE_DIR) $(PHOBOS_STABLE_DIR) $(DMD_STABLE_DIR) -+${GENERATED}/modlist-${LATEST}.ddoc : modlist.d ${STABLE_DMD} $(DRUNTIME_DIR) $(PHOBOS_DIR) $(DMD_DIR) +-${GENERATED}/modlist-${LATEST}.ddoc : modlist.d ${STABLE_DMD} $(DRUNTIME_STABLE_DIR) $(PHOBOS_STABLE_DIR) ++${GENERATED}/modlist-${LATEST}.ddoc : modlist.d ${STABLE_DMD} $(DRUNTIME_DIR) $(PHOBOS_DIR) mkdir -p $(dir $@) -- $(STABLE_RDMD) modlist.d $(DRUNTIME_STABLE_DIR) $(PHOBOS_STABLE_DIR) $(DMD_STABLE_DIR) $(MOD_EXCLUDES_RELEASE) \ -+ $(STABLE_RDMD) modlist.d $(DRUNTIME_DIR) $(PHOBOS_DIR) $(DMD_DIR) $(MOD_EXCLUDES_RELEASE) \ - $(addprefix --dump , object std etc core ddmd) >$@ +- $(STABLE_RDMD) modlist.d $(DRUNTIME_STABLE_DIR) $(PHOBOS_STABLE_DIR) $(MOD_EXCLUDES_RELEASE) \ ++ $(STABLE_RDMD) modlist.d $(DRUNTIME_DIR) $(PHOBOS_DIR) $(MOD_EXCLUDES_RELEASE) \ + $(addprefix --dump , object std etc core) >$@ ${GENERATED}/modlist-prerelease.ddoc : modlist.d ${STABLE_DMD} $(DRUNTIME_DIR) $(PHOBOS_DIR) -@@ -366,14 +363,14 @@ ${DMD_DIR} ${DRUNTIME_DIR} ${PHOBOS_DIR} ${TOOLS_DIR} ${INSTALLER_DIR}: +@@ -368,8 +363,8 @@ ${DMD_DIR} ${DRUNTIME_DIR} ${PHOBOS_DIR} ${TOOLS_DIR} ${INSTALLER_DIR}: # dmd compiler, latest released build and current build ################################################################################ @@ -63,40 +65,33 @@ index f56832b..0787742 100644 +#$(DMD) : ${DMD_DIR} +# ${MAKE} --directory=${DMD_DIR}/src -f posix.mak AUTO_BOOTSTRAP=1 - $(DMD_REL) : ${DMD_STABLE_DIR} + $(DMD_STABLE) : ${DMD_STABLE_DIR} ${MAKE} --directory=${DMD_STABLE_DIR}/src -f posix.mak AUTO_BOOTSTRAP=1 - - dmd-release : $(STD_DDOC) $(DMD_DIR) $(DMD) -- $(MAKE) AUTO_BOOTSTRAP=1 --directory=$(DMD_STABLE_DIR) -f posix.mak html \ -+ $(MAKE) AUTO_BOOTSTRAP=1 --directory=$(DMD_DIR) -f posix.mak html \ - STDDOC="$(addprefix `pwd`/, $(STD_DDOC))" \ - DOC_OUTPUT_DIR="${DOC_OUTPUT_DIR}/phobos" \ - DOCSRC="$(realpath .)" -@@ -405,9 +402,9 @@ druntime-prerelease : ${DRUNTIME_DIR} $(DMD) $(STD_DDOC_PRE) +@@ -407,9 +402,9 @@ druntime-prerelease : ${DRUNTIME_DIR} $(DMD) $(STD_DDOC_PRE) DOCDIR=${DOC_OUTPUT_DIR}/phobos-prerelease \ DOCFMT="$(addprefix `pwd`/, $(STD_DDOC_PRE))" --druntime-release : ${DRUNTIME_STABLE_DIR} $(DMD_REL) $(STD_DDOC) +-druntime-release : ${DRUNTIME_STABLE_DIR} $(DMD_STABLE) $(STD_DDOC) - ${MAKE} --directory=${DRUNTIME_STABLE_DIR} -f posix.mak target doc \ -- DMD=$(DMD_REL) \ +- DMD=$(DMD_STABLE) \ +druntime-release : ${DRUNTIME_DIR} $(DMD) $(STD_DDOC) + ${MAKE} --directory=${DRUNTIME_DIR} -f posix.mak target doc \ + DMD=$(DMD) \ DOCDIR=${DOC_OUTPUT_DIR}/phobos \ DOCFMT="$(addprefix `pwd`/, $(STD_DDOC))" -@@ -437,11 +434,11 @@ phobos-prerelease : ${PHOBOS_FILES_GENERATED} $(STD_DDOC_PRE) druntime-prereleas +@@ -439,11 +434,11 @@ phobos-prerelease : ${PHOBOS_FILES_GENERATED} $(STD_DDOC_PRE) druntime-prereleas VERSION="$(realpath ${DMD_DIR}/VERSION)" \ html --phobos-release : ${PHOBOS_STABLE_FILES_GENERATED} $(DMD_REL) $(STD_DDOC) \ +-phobos-release : ${PHOBOS_STABLE_FILES_GENERATED} $(DMD_STABLE) $(STD_DDOC) \ +phobos-release : ${PHOBOS_FILES_GENERATED} $(DMD) $(STD_DDOC) \ - druntime-release dmd-release + druntime-release - ${MAKE} --directory=${PHOBOS_STABLE_DIR_GENERATED} -f posix.mak \ -- DMD=$(realpath ${DMD_REL}) \ +- DMD=$(DMD_STABLE) \ - DRUNTIME_PATH=${DRUNTIME_STABLE_DIR} \ + ${MAKE} --directory=${PHOBOS_DIR_GENERATED} -f posix.mak \ -+ DMD=$(realpath ${DMD}) \ ++ DMD=$(DMD) \ + DRUNTIME_PATH=${DRUNTIME_DIR} \ DOC_OUTPUT_DIR=${DOC_OUTPUT_DIR}/phobos \ STDDOC="$(addprefix `pwd`/, $(STD_DDOC))" \