Skip to content

Merge remote-tracking branch 'upstream/stable' into merge_stable #1560

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jan 22, 2017
Merged

Merge remote-tracking branch 'upstream/stable' into merge_stable #1560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
350d30a
changelog and download for 2.073.0
MartinNowak Jan 22, 2017
a176afd
Merge pull request #1559 from MartinNowak/changelog
MartinNowak Jan 22, 2017
de87177
update VERSION to 2.073.0
MartinNowak Jan 22, 2017
3723757
fixup missing rename of changelog
MartinNowak Jan 22, 2017
e8005ae
purge changelog
MartinNowak Jan 22, 2017
005b5fc
Merge remote-tracking branch 'upstream/stable' into merge_stable
MartinNowak Jan 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.072.2
2.073.0
4 changes: 2 additions & 2 deletions changelog/2.072.2.dd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Ddoc

$(CHANGELOG_NAV_LAST 2.072.1)
$(CHANGELOG_NAV 2.072.1,2.073.0)

$(VERSION Dec 31, 2016, =================================================,

Expand Down Expand Up @@ -59,7 +59,7 @@ $(LI $(BUGZILLA 16978): [REG2.072.0] pragma$(LPAREN)lib$(RPAREN) is broken with
)

)
$(CHANGELOG_NAV_LAST 2.072.1)
$(CHANGELOG_NAV 2.072.1,2.073.0)

Macros:
VER=2.072.2
Expand Down
14 changes: 11 additions & 3 deletions changelog/2.073.0_pre.dd → changelog/2.073.0.dd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@ Ddoc

$(CHANGELOG_NAV_LAST 2.072.2)

$(VERSION Jan 18, 2017, =================================================,
$(VERSION Jan 22, 2017, =================================================,

$(BUGSTITLE Compiler changes,

$(LI $(RELATIVE_LINK2 mscrtlib-option,New command line option $(B -mscrt=$(I libname)) for Windows MS-COFF object files.))
$(LI $(RELATIVE_LINK2 mscrtlib-option,New command line option $(B -mscrtlib=$(I libname)) for Windows MS-COFF object files.))
$(LI $(RELATIVE_LINK2 overhauled_ddoc_theme,The builtin Ddoc theme has been overhauled.))

)

Expand All @@ -33,7 +34,7 @@ $(HR)

$(BUGSTITLE Compiler changes,

$(LI $(LNAME2 mscrtlib-option,New command line option $(B -mscrt=$(I libname)) for Windows MS-COFF object files.)
$(LI $(LNAME2 mscrtlib-option,New command line option $(B -mscrtlib=$(I libname)) for Windows MS-COFF object files.)
$(P
If building MS-COFF object files with -m64 or -m32mscoff, this option
specifies the reference to the C runtime library $(I libname) that is
Expand All @@ -45,6 +46,13 @@ $(LI $(LNAME2 mscrtlib-option,New command line option $(B -mscrt=$(I libname)) f
)
)

$(LI $(LNAME2 overhauled_ddoc_theme,The builtin Ddoc theme has been overhauled.)
$(P
Dmd will now use more modern looking theme for generated documentation,
also see $(LINK2 https://github.com/dlang/dmd/pull/6173, dmd#6173).
)
)


)

Expand Down
1 change: 1 addition & 0 deletions changelog/changelog.ddoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ _=
CHANGELOG_VERSION = $(LI <a id="$0" href="$0.html">$0</a>)
_=BEGIN_GENERATED_CHANGELOG_VERSIONS
CHANGELOG_VERSIONS =
$(CHANGELOG_VERSION 2.073.0)
$(CHANGELOG_VERSION 2.072.2)
$(CHANGELOG_VERSION 2.072.1)
$(CHANGELOG_VERSION 2.072.0)
Expand Down
4 changes: 2 additions & 2 deletions download.dd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,8 @@ Macros:

DMDV2=$(LATEST)

_=BETA=$(COMMENT $0)
BETA=$0
BETA=$(COMMENT $0)
_=BETA=$0
B_DMDV2=2.073.0
B_SUFFIX=rc1

Expand Down
1 change: 0 additions & 1 deletion language-changelog/mcpu_avx.dd
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions win32.mak
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ SRC= $(SPECSRC) 404.dd cpptod.dd ctod.dd pretod.dd cppcontracts.dd index.dd over
changelog\2.069.2.dd changelog\2.070.0.dd changelog\2.070.1.dd \
changelog\2.070.2.dd changelog\2.071.0.dd changelog\2.071.1.dd \
changelog\2.071.2.dd changelog\2.072.0.dd changelog\2.072.1.dd \
changelog\2.072.2.dd changelog\2.073.0_pre.dd changelog\index.dd \
changelog\2.072.2.dd changelog\2.073.0.dd changelog\index.dd \
glossary.dd acknowledgements.dd \
dcompiler.dd builtin.dd comparison.dd rationale.dd code_coverage.dd \
exception-safe.dd rdmd.dd templates-revisited.dd warnings.dd \
Expand Down Expand Up @@ -355,8 +355,8 @@ changelog\2.072.1.html : $(CHANGELOG_DDOC) changelog\2.072.1.dd
$(DMD) -o- -c -D -Df$*.html $(CHANGELOG_DDOC) $*.dd
changelog\2.072.2.html : $(CHANGELOG_DDOC) changelog\2.072.2.dd
$(DMD) -o- -c -D -Df$*.html $(CHANGELOG_DDOC) $*.dd
changelog\2.073.0.html : $(CHANGELOG_PRE_DDOC) changelog\2.073.0_pre.dd
$(DMD) -o- -c -D -Df$*.html $(CHANGELOG_PRE_DDOC) $*.dd
changelog\2.073.0.html : $(CHANGELOG_DDOC) changelog\2.073.0.dd
$(DMD) -o- -c -D -Df$*.html $(CHANGELOG_DDOC) $*.dd
changelog\index.html : $(CHANGELOG_DDOC) changelog\index.dd
$(DMD) -o- -c -D -Df$*.html $(CHANGELOG_DDOC) $*.dd

Expand Down