Skip to content

Commit 189d7aa

Browse files
authored
Merge pull request #2213 from CyberShadow/pull-20180217-162030
posix.mak: Add DMan tags to dautotest target merged-on-behalf-of: Sebastian Wilzbach <sebi.wilzbach@gmail.com>
2 parents cb44110 + 214097f commit 189d7aa

File tree

10 files changed

+23
-15
lines changed

10 files changed

+23
-15
lines changed

chmgen.d

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -585,6 +585,9 @@ string absoluteUrl(string base, string url)
585585
while (urlSegments.startsWith([`..`]))
586586
{
587587
urlSegments = urlSegments[1..$];
588+
enforce(pathSegments.length,
589+
"Attempting to escape site root (dereferencing %s from %s)"
590+
.format(url, base));
588591
pathSegments = pathSegments[0..$-1];
589592
}
590593
return (pathSegments ~ urlSegments).join(`/`);

dlang.org.ddoc

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,12 @@ DMDSRC=$(HTTPS github.com/dlang/dmd/blob/master/src/dmd/$0, $0)
159159
DOT_PREFIXED=.$1$(DOT_PREFIXED $+)
160160
DOT_PREFIXED_SKIP=$(DOT_PREFIXED $+)
161161
DRUNTIMESRC=$(HTTPS github.com/dlang/druntime/blob/master/src/$0, $0)
162-
DPLLINK=$(LINK2 $1,$+)
162+
_=
163+
164+
$(COMMENT URL prefix for the site root.
165+
Relative (e.g. "../") for dlang.org pages;
166+
absolute ("https://dlang.org/") for the ebook/pdf.)
167+
DPLLINK=$(LINK2 $(ROOT_DIR)$1,$+)
163168
_=
164169

165170
ELABORATE_HEADER=$(TR <th rowspan="2">D</th><th colspan="2">C</th>)

posix.mak

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -455,7 +455,7 @@ rsync : all kindle pdf
455455
rsync-only :
456456
rsync -avzO --chmod=u=rwX,g=rwX,o=rX --delete $(RSYNC_FILTER) $W/ $(REMOTE_DIR)/
457457

458-
dautotest: all verbatim pdf diffable-intermediaries
458+
dautotest: all verbatim pdf diffable-intermediaries d-latest.tag d-prerelease.tag
459459

460460
################################################################################
461461
# Pattern rulez

spec/contracts.dd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ $(HEADERNAV_TOC)
2020
$(LI handling of contract inheritance)
2121
)
2222

23-
$(HTMLTAG3V img, src="../images/d4.gif" style="max-width:100%" alt="Contracts make D bug resistant" border="0")
23+
$(HTMLTAG3V img, src="$(ROOT_DIR)images/d4.gif" style="max-width:100%" alt="Contracts make D bug resistant" border="0")
2424

2525
$(P The idea of a contract is simple - it's just an expression that must evaluate to true.
2626
If it does not, the contract is broken, and by definition, the program has a bug in it.

spec/ddoc.dd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -674,7 +674,7 @@ $(P
674674
$(OL
675675
$(LI Predefined macros.)
676676
$(LI Definitions from file specified by
677-
$(DPLLINK $(ROOT_DIR)dmd-windows.html, sc.ini)'s
677+
$(DPLLINK dmd-windows.html, sc.ini)'s
678678
or $(DDSUBLINK dmd-linux, dmd_conf, dmd.conf) DDOCFILE setting.)
679679
$(LI Definitions from *.ddoc files specified on the command line.)
680680
$(LI Runtime definitions generated by Ddoc.)
@@ -925,7 +925,7 @@ unittest
925925
------
926926

927927
$(P For more information please see the full section on
928-
$(DPLLINK unittest.html#documented-unittests, documented unit tests).
928+
$(LINK2 unittest.html#documented-unittests, documented unit tests).
929929
)
930930

931931
$(H2 $(LNAME2 using_ddoc_for_other_documentation, Using Ddoc for other Documentation))

spec/errors.dd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ $(DL
175175
)
176176

177177
Using exceptions to handle errors leads to another issue - how to write
178-
exception safe programs. $(DPLLINK $(ROOT_DIR)exception-safe.html, Here's how).
178+
exception safe programs. $(DPLLINK exception-safe.html, Here's how).
179179

180180
$(COMMENT
181181
$(OL

spec/expression.dd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1747,13 +1747,13 @@ $(GNAME TypeidExpression):
17471747
)
17481748

17491749
$(P If $(I Type), returns an instance of class
1750-
$(DPLLINK $(ROOT_DIR)phobos/object.html, $(D TypeInfo))
1750+
$(DPLLINK phobos/object.html, $(D TypeInfo))
17511751
corresponding
17521752
to $(I Type).
17531753
)
17541754

17551755
$(P If $(I Expression), returns an instance of class
1756-
$(DPLLINK $(ROOT_DIR)phobos/object.html, $(D TypeInfo))
1756+
$(DPLLINK phobos/object.html, $(D TypeInfo))
17571757
corresponding
17581758
to the type of the $(I Expression).
17591759
If the type is a class, it returns the $(D TypeInfo)

spec/iasm.dd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ $(HEADERNAV_TOC)
66

77
$(HTMLTAG3 a,
88
href="http://digitalmars.com/gift/index.html" title="Gift Shop" target="_top",
9-
$(HTMLTAG3V img, src="../images/d5.gif" border="0" align="right" alt="Some Assembly Required" width="284" height="186")
9+
$(HTMLTAG3V img, src="$(ROOT_DIR)images/d5.gif" border="0" align="right" alt="Some Assembly Required" width="284" height="186")
1010
)
1111

1212
$(P D, being a systems programming language, provides an inline

spec/interfaceToC.dd

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ int myDfunction(char[] s)
5656
or other such C
5757
$(LINK2 http://www.digitalmars.com/ctg/ctgLanguageImplementation.html#extended, extended type modifiers)
5858
in D. These are handled by
59-
$(DPLLINK attribute.html#linkage, linkage attributes),
59+
$(LINK2 attribute.html#linkage, linkage attributes),
6060
such as $(D extern (C)).)
6161

6262
$(LI There is no volatile type modifier in D. To declare a C function that uses
@@ -116,10 +116,10 @@ $(H2 $(LNAME2 storage_allocation, Storage Allocation))
116116

117117
$(LI Registering the pointer with the garbage collector with the
118118

119-
$(DPLLINK $(ROOT_DIR)phobos/core_memory.html#addRoot, std.gc.addRoot())
119+
$(DPLLINK phobos/core_memory.html#addRoot, std.gc.addRoot())
120120
or
121121

122-
$(DPLLINK $(ROOT_DIR)phobos/core_memory.html#addRange, std.gc.addRange())
122+
$(DPLLINK phobos/core_memory.html#addRange, std.gc.addRange())
123123
calls.)
124124

125125
)
@@ -253,7 +253,7 @@ $(H2 $(LNAME2 structs_and_unions, Structs and Unions))
253253
with shift and mask operations,
254254
or use the $(LINK2 $(ROOT_DIR)phobos/std_bitmanip.html#bitfields, std.bitmanip.bitfields)
255255
library type.
256-
$(DPLLINK $(ROOT_DIR)htod.html, htod) will convert bit fields to inline
256+
$(DPLLINK htod.html, htod) will convert bit fields to inline
257257
functions that
258258
do the right shift and masks.
259259
)

spec/objc_interface.dd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,8 @@ $(HEADERNAV_TOC)
8989

9090
$(P
9191
The attribute is defined in druntime in
92-
$(LINK2 ../phobos/core_attribute.html, `core.attribute`) and aliased in
93-
$(LINK2 ../phobos/object.html, `object`), meaning it will be implicitly
92+
$(DPLLINK phobos/core_attribute.html, `core.attribute`) and aliased in
93+
$(DPLLINK phobos/object.html, `object`), meaning it will be implicitly
9494
imported. The attribute is only defined when the version identifier
9595
$(LINK2 #objc-version-identifier, `D_ObjectiveC`) is enabled.
9696
)

0 commit comments

Comments
 (0)