Skip to content

Commit

Permalink
http://d.puremagic.com/issues/show_bug.cgi?id=6441
Browse files Browse the repository at this point in the history
  • Loading branch information
@andralex
andralex committed Jan 21, 2012
1 parent d26103e commit 9482ce9
Show file tree
Hide file tree
Showing 9 changed files with 27 additions and 22 deletions.
4 changes: 2 additions & 2 deletions changelog.dd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,8 +181,8 @@ $(VERSION 057, Dec 13, 2011, =================================================,
$(LI $(BUGZILLA 3474): PATCH: Implement opDollar for struct and class indexing operations)
$(LI $(BUGZILLA 6572): Deprecate typedef)

$(LI Major overhaul of std.regex module's implementation.
$(RED Breaking change) in std.regex.replace with delegate,
$(LI Major overhaul of std.regex module's implementation.
$(RED Breaking change) in std.regex.replace with delegate,
use Captures!string instead of RegexMatch!string as delegate parameter.)
$(LI As typedef has been deprecated, overloads of std.conv.to which use
typedef have now been deprecated.)
Expand Down
2 changes: 1 addition & 1 deletion code_coverage.dd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,6 @@ $(LINK2 http://en.wikipedia.org/wiki/Code_coverage, Wikipedia)
Macros:
TITLE=Code Coverage Analysis
WIKI=Dcover
CATEGORY_TOOLS=$0
CATEGORY_DOWNLOAD=$0
RPAREN=)

1 change: 1 addition & 0 deletions dcompiler.dd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1079,3 +1079,4 @@ Macros:
LIB=$(WINDOWS phobos.lib)$(UNIX $(V1 libphobos.a)$(V2 libphobos2.a))
DMD_CONF=$(LINK2 #dmd_conf, dmd.conf)
SWITCH=$(DT $1)$(DD $+)
CATEGORY_DOWNLOAD=$0
13 changes: 6 additions & 7 deletions doc.ddoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ NAVIGATION=
$(NAVBLOCK_HEADER $(TOCHEADERL index.html, D Programming Language, D Home),
$(TOCENTRYTH overview.html, D language overview, Overview, $(CATEGORY_OVERVIEW $(SUBNAV_OVERVIEW)))
$(TOCENTRYTH comparison.html, D feature list, Features, $(CATEGORY_FEATURES $(SUBNAV_FEATURES)))
$(TOCENTRYTH download.html, Download a D compiler, Download (v$(LATEST)), $(CATEGORY_TOOLS $(SUBNAV_DOWNLOADS_TOOLS)))
$(TOCENTRYTH download.html, Download a D compiler, Downloads & Tools, $(CATEGORY_DOWNLOAD $(SUBNAV_DOWNLOAD)))
$(TOCENTRYT changelog.html, History of changes to D, Changelog)
$(TOCENTRYT http://d.puremagic.com/issues/, D issue and bug tracking system, Bug tracker)
$(TOCENTRYTH faq.html, Frequently Asked Questions, FAQ, $(CATEGORY_FAQ $(SUBNAV_FAQ)))
Expand Down Expand Up @@ -234,13 +234,12 @@ $(NAVBLOCK
$(TOCENTRYT features2.html, Language changes for D, Features)
)

SUBNAV_DOWNLOADS_TOOLS=
SUBNAV_DOWNLOAD=
$(NAVBLOCK
$(TOCENTRYT dmd-linux.html, dmd - the Digital Mars D compiler, DMD D Compiler (Linux))
$(TOCENTRYT dmd-freebsd.html, dmd - the Digital Mars D compiler, DMD D Compiler (FreeBSD))
$(TOCENTRYT dmd-osx.html, dmd - the Digital Mars D compiler, DMD D Compiler (Mac OSX))
$(TOCENTRYT dmd-windows.html, dmd - the Digital Mars D compiler, DMD D Compiler (Windows))
$(TOCENTRYT changelog.html, History of changes to D, D Change Log)
$(TOCENTRYT dmd-linux.html, dmd - the Digital Mars D compiler, Notes (Linux))
$(TOCENTRYT dmd-freebsd.html, dmd - the Digital Mars D compiler, Notes (FreeBSD))
$(TOCENTRYT dmd-osx.html, dmd - the Digital Mars D compiler, Notes (Mac OSX))
$(TOCENTRYT dmd-windows.html, dmd - the Digital Mars D compiler, Notes (Windows))
$(TOCENTRYT http://bitbucket.org/goshawk/gdc/wiki/Home, gdc - the Gnu D compiler, GDC D Compiler)
$(TOCENTRYT http://dnet.codeplex.com/, D Compiler for .NET, D.NET Compiler)
$(TOCENTRYT http://digitalmars.com/ctg/optlink.html, Optlink - the Digital Mars Linker, Linker)
Expand Down
1 change: 1 addition & 0 deletions download.dd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -322,3 +322,4 @@ Macros:


TDL=<td style="text-align: left;">$0</td>
CATEGORY_DOWNLOAD=$0
2 changes: 1 addition & 1 deletion htod.dd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -231,4 +231,4 @@ $(OL
Macros:
TITLE=htod
WIKI=htod
CATEGORY_TOOLS=$0
CATEGORY_DOWNLOAD=$0
10 changes: 7 additions & 3 deletions posix.mak
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ $(info Current release: ${LATEST})

# Documents

DDOC=macros.ddoc windows.ddoc doc.ddoc ${LATEST}.ddoc
DDOC=macros.ddoc doc.ddoc ${LATEST}.ddoc

IMAGES=favicon.ico $(addprefix images/, c1.gif cpp1.gif d002.ico \
d3.gif d4.gif d5.gif debian_logo.png dlogo.png dmlogo.gif \
Expand Down Expand Up @@ -60,7 +60,8 @@ TARGETS=32-64-portability.html cpptod.html ctod.html download.html \
d-floating-point.html migrate-to-shared.html D1toD2.html \
unittest.html hash-map.html pdf-intro-cover.html \
pdf-spec-cover.html pdf-tools-cover.html intro-to-datetime.html \
std_consolidated_header.html simd.html
std_consolidated_header.html simd.html dmd-windows.html \
dmd-linux.html dmd-freebsd.html dmd-osx.html

PDFINTRO=index.html overview.html wc.html warnings.html builtin.html \
ctod.html cpptod.html pretod.html template-comparison.html
Expand Down Expand Up @@ -115,6 +116,9 @@ $(DOC_OUTPUT_DIR)/% : %
@mkdir -p $(dir $@)
cp $< $@

$(DOC_OUTPUT_DIR)/dmd-%.html : %.ddoc dcompiler.dd $(DDOC)
$(DMD) -c -o- -Df$@ $(DDOC) dcompiler.dd $<

################################################################################
# Rulez
################################################################################
Expand Down Expand Up @@ -147,7 +151,7 @@ clean:
rm -rf $(DOC_OUTPUT_DIR) ${DMD_DIR}.${LATEST} ${LATEST}.ddoc
rm -rf ${DRUNTIME_DIR}.${LATEST} ${PHOBOS_DIR}.${LATEST}

rsync : all
rsync : #all
rsync -avz $(DOC_OUTPUT_DIR)/ d-programming@digitalmars.com:data/

pdf : $(PDFTARGETS)
Expand Down
14 changes: 7 additions & 7 deletions rdmd.dd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ In a command prompt:
<pre>
% cat myprog.d
import std.stdio;
void main()
void main()
{
writeln("Hello, world without explicit compilations!");
writeln("Hello, world without explicit compilations!");
}
% rdmd myprog
Hello, world without explicit compilations!
Expand All @@ -22,9 +22,9 @@ Inside a D program:
% cat myprog.d
#!/usr/bin/rdmd
import std.stdio;
void main()
void main()
{
writeln("Hello, world with automated script running!");
writeln("Hello, world with automated script running!");
}
% ./myprog.d
Hello, world with automated script running!
Expand All @@ -44,7 +44,7 @@ relative dates of the files involved to minimize the amount of work
necessary. Unlike $(B make), $(B rdmd) tracks dependencies and
freshness without requiring additional information from the user.)

$(P $(B rdmd): $(UL
$(P $(B rdmd): $(UL

$(LI shields its user from the notion that producing a running program
from D programming language files may entail several concerted steps
Expand Down Expand Up @@ -75,7 +75,7 @@ $(P
$(P In addition to $(B dmd)'s options, $(B rdmd) recognizes the following:
)

$(DL
$(DL

$(DT $(B --build-only)) $(DD just build the executable, don't run it)

Expand Down Expand Up @@ -128,5 +128,5 @@ $(LINK2 http://erdani.org/, Andrei Alexandrescu)
Macros:
TITLE=rdmd
WIKI=rdmd
CATEGORY_TOOLS=$0
CATEGORY_DOWNLOAD=$0

2 changes: 1 addition & 1 deletion windbg.dd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -179,5 +179,5 @@ $(P and it should now compile and run without error.)
Macros:
TITLE=windbg Debugger
WIKI=Windbg
CATEGORY_TOOLS=$0
CATEGORY_DOWNLOAD=$0

0 comments on commit 9482ce9

Please sign in to comment.