Skip to content

fixup for #186 #211

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
MartinNowak merged 6 commits into from
Jan 6, 2017
+37 −51
Merged

fixup for #186 #211

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
04cc619
use abbreviated month
MartinNowak Jan 6, 2017
1c02e4f
don't escape title and description
MartinNowak Jan 6, 2017
93aec28
use language-changelog for dlang.org repo
MartinNowak Jan 6, 2017
0d0c67f
add final newline
MartinNowak Jan 6, 2017
873a08f
separate entries by newline
MartinNowak Jan 6, 2017
3a2f048
paragraphs and indentation
MartinNowak Jan 6, 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
88 changes: 37 additions & 51 deletions changed.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ void writeTextChangesHeader(Entries, Writer)(Entries changes, Writer w, string h
scope(exit) w.put("\n)\n\n");
foreach(change; changes)
{
w.formattedWrite("$(LI $(RELATIVE_LINK2 %s,%s))\n", change.basename, change.title.escapeParens);
w.formattedWrite("$(LI $(RELATIVE_LINK2 %s,%s))\n", change.basename, change.title);
}
}
/**
Expand All @@ -261,9 +261,38 @@ void writeTextChangesBody(Entries, Writer)(Entries changes, Writer w, string hea
scope(exit) w.put("\n)\n\n");
foreach(change; changes)
{
w.formattedWrite("$(LI $(LNAME2 %s,%s)\n", change.basename, change.title.escapeParens);
scope(exit) w.put(")\n");
w.formattedWrite(" $(P %s )\n", change.description.escapeParens);
w.formattedWrite("$(LI $(LNAME2 %s,%s)\n", change.basename, change.title);
scope(exit) w.put(")\n\n");

bool inPara, inCode;
foreach (line; change.description.splitLines)
{
if (line.startsWith("---"))
{
if (inPara)
{
w.put(" )\n");
inPara = false;
}
inCode = !inCode;
}
else if (!inCode && !inPara && !line.empty)
{
w.put(" $(P\n");
inPara = true;
}
else if (inPara && line.empty)
{
w.put(" )\n");
inPara = false;
}
if (!line.empty)
w.put(inPara ? " " : " ");
w.put(line);
w.put("\n");
}
if (inPara)
w.put(" )\n");
}
}

Expand Down Expand Up @@ -299,58 +328,14 @@ void writeBugzillaChanges(Entries, Writer)(Entries entries, Writer w)
}
}

string toString(Month month){
string s = void;
with(Month)
final switch (month) {
case jan:
s = "January";
break;
case feb:
s = "February";
break;
case mar:
s = "March";
break;
case apr:
s = "April";
break;
case may:
s = "May";
break;
case jun:
s = "June";
break;
case jul:
s = "July";
break;
case aug:
s = "August";
break;
case sep:
s = "September";
break;
case oct:
s = "October";
break;
case nov:
s = "November";
break;
case dec:
s = "December";
break;
}
return s;
}

int main(string[] args)
{
auto outputFile = "./changelog.dd";
auto nextVersionString = "LATEST";

auto currDate = Clock.currTime();
auto nextVersionDate = "%s %02d, %04d"
.format(currDate.month.toString, currDate.day, currDate.year);
.format(currDate.month.to!string.capitalize, currDate.day, currDate.year);

string previousVersion = "Previous version";
bool hideTextChanges = false;
Expand Down Expand Up @@ -407,7 +392,7 @@ Please supply a bugzilla version
Repo("tools", "Tools changes")];

auto changedRepos = repos
.map!(repo => Repo(buildPath("..", repo.path, "changelog"), repo.headline))
.map!(repo => Repo(buildPath("..", repo.path, repo.path == "dlang.org" ? "language-changelog" : "changelog"), repo.headline))
.filter!(r => r.path.exists)
.map!(r => tuple!("headline", "changes")(r.headline, r.path.readTextChanges.array))
.filter!(r => !r.changes.empty);
Expand Down Expand Up @@ -441,7 +426,8 @@ Please supply a bugzilla version
// write own macros
w.formattedWrite(`Macros:
VER=%s
TITLE=Change Log: $(VER)`, nextVersionString);
TITLE=Change Log: $(VER)
`, nextVersionString);

writefln("Change log generated to: '%s'", outputFile);
return 0;
Expand Down