Showing with 15 additions and 17 deletions.
  1. +15 −17 create_dmd_release/patches/dlang.org.patch
32 changes: 15 additions & 17 deletions create_dmd_release/patches/dlang.org.patch
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/dlang.org.ddoc b/dlang.org.ddoc
index eb80220..0ef227d 100644
index 8bd9368..777081f 100644
--- a/dlang.org.ddoc
+++ b/dlang.org.ddoc
@@ -214,7 +214,6 @@ $(DIVID cssmenu, $(UL
Expand All @@ -11,10 +11,10 @@ index eb80220..0ef227d 100644
$(MENU_W_SUBMENU_LINK $(ROOT_DIR)community.html, Community)
$(NAVIGATION_COMMUNITY)
diff --git a/posix.mak b/posix.mak
index 30e6a3f..e03b5f0 100644
index b9b0786..03b94c4 100644
--- a/posix.mak
+++ b/posix.mak
@@ -230,7 +230,7 @@ $(DOC_OUTPUT_DIR)/dmd-%.verbatim : %.ddoc dcompiler.dd verbatim.ddoc $(DMD)
@@ -232,7 +232,7 @@ $(DOC_OUTPUT_DIR)/dmd-%.verbatim : %.ddoc dcompiler.dd verbatim.ddoc $(DMD)
# Rulez
################################################################################

Expand All @@ -23,7 +23,7 @@ index 30e6a3f..e03b5f0 100644

docs : dmd-prerelease phobos-prerelease druntime-prerelease druntime-release \
phobos-release apidocs-release apidocs-prerelease
@@ -256,9 +256,9 @@ ${GENERATED}/${LATEST}.ddoc :
@@ -258,9 +258,9 @@ ${GENERATED}/${LATEST}.ddoc :
mkdir -p $(dir $@)
echo "LATEST=${LATEST}" >$@

Expand All @@ -35,7 +35,7 @@ index 30e6a3f..e03b5f0 100644

${GENERATED}/modlist-prerelease.ddoc : modlist.d ${STABLE_DMD} $(DRUNTIME_DIR) $(PHOBOS_DIR)
mkdir -p $(dir $@)
@@ -351,8 +351,8 @@ ${DMD_DIR} ${DRUNTIME_DIR} ${PHOBOS_DIR} :
@@ -353,8 +353,8 @@ ${DMD_DIR} ${DRUNTIME_DIR} ${PHOBOS_DIR} :
# dmd compiler, latest released build and current build
################################################################################

Expand All @@ -46,7 +46,7 @@ index 30e6a3f..e03b5f0 100644

$(DMD_REL) : ${DMD_DIR}-${LATEST}
${MAKE} --directory=${DMD_DIR}-${LATEST}/src -f posix.mak -j 4
@@ -371,9 +371,9 @@ druntime-prerelease : ${DRUNTIME_DIR} $(DMD) $(STD_DDOC_PRE)
@@ -373,9 +373,9 @@ druntime-prerelease : ${DRUNTIME_DIR} $(DMD) $(STD_DDOC_PRE)
DOCDIR=${DOC_OUTPUT_DIR}/phobos-prerelease \
DOCFMT="$(addprefix `pwd`/, $(STD_DDOC_PRE))"

Expand All @@ -59,7 +59,7 @@ index 30e6a3f..e03b5f0 100644
DOCDIR=${DOC_OUTPUT_DIR}/phobos \
DOCFMT="$(addprefix `pwd`/, $(STD_DDOC))"

@@ -398,12 +398,12 @@ phobos-prerelease : ${PHOBOS_DIR} $(STD_DDOC_PRE) druntime-prerelease
@@ -400,12 +400,12 @@ phobos-prerelease : ${PHOBOS_DIR} $(STD_DDOC_PRE) druntime-prerelease
STDDOC="$(addprefix `pwd`/, $(STD_DDOC_PRE))" \
DOC_OUTPUT_DIR=${DOC_OUTPUT_DIR}/phobos-prerelease html -j 4

Expand All @@ -77,16 +77,14 @@ index 30e6a3f..e03b5f0 100644
STDDOC="$(addprefix `pwd`/, $(STD_DDOC))"

diff --git a/std_navbar-release.ddoc b/std_navbar-release.ddoc
index 8ca9f75..2f0ea44 100644
index 7899a22..42af129 100644
--- a/std_navbar-release.ddoc
+++ b/std_navbar-release.ddoc
@@ -2,9 +2,6 @@ SUBNAV=
$(SUBNAV_TEMPLATE
$(DIVC head,
@@ -4,7 +4,6 @@ $(SUBNAV_TEMPLATE
$(H2 Library Reference)
- $(P $(SPANC smallprint, version $(LATEST) $(SPANC separator, $(BR))
- $(LINK2 ../phobos-prerelease/index.html, switch to pre-release
- version)))
$(P $(LINK2 index.html, overview))
)
$(UL $(MODULE_MENU))
$(P $(SPANC smallprint, version $(LATEST) $(SPANC separator, $(BR))
switch to
- $(LINK2 ../phobos-prerelease/index.html, pre-release). $(BR)
$(LINK2 ../library/index.html, preview) beta library reference.
)
)