Merge pull request #77 from rainers/master

rainers · web-flow · commit 5bd33d0f33f3 · 2017-07-18T08:58:23.000+02:00
changes for v0.45-rc2
diff --git a/CHANGES b/CHANGES
@@ -882,6 +882,7 @@ unreleased Version 0.45.0
     - /MAPINFO: remove ancient options no longer supported by the MS linker
     - separated compile and link into two batches so compile skipped if only link inputs changed
     - dependency monitoring: added option to specify files/folders to exclude from dependency check
+    - mark html output log as UTF-8 encoded
   * editor
     - fix crash when editing dub.json when part of a project
     - added task list support for files loaded into the editor
@@ -896,3 +897,4 @@ unreleased Version 0.45.0
     - break endless loop due to unresolved selective import
     - fix for no expansions for symbols from public import in imported module
     - try dparser as fallback if goto definition on import fails
+    - fix exception in isExpression
diff --git a/VERSION b/VERSION
@@ -2,4 +2,4 @@
 #define VERSION_MINOR      45
 #define VERSION_REVISION   0
 #define VERSION_BETA       -rc
-#define VERSION_BUILD      1
+#define VERSION_BUILD      2
diff --git a/vdc/abothe/Parser b/vdc/abothe/Parser
@@ -1 +1 @@
-Subproject commit 19f5d4dc87af46859f2999dc2eb2ac597bb2eaa1
+Subproject commit 927283c1ddb2c513755fde63b78388a98a8c7b40
diff --git a/visuald/build.d b/visuald/build.d
@@ -683,7 +683,7 @@ else
 	{
 		mStartBuildTime = time(null);
 
-		mBuildLog = `<html><head><META HTTP-EQUIV="Content-Type" content="text/html">
+		mBuildLog = `<html><head><meta http-equiv="Content-Type" content="text/html" charset="utf-8">
 </head><body><pre>
 <table width=100% bgcolor=#CFCFE5><tr><td>
 	<font face=arial size=+3>Build Log</font>
@@ -1412,9 +1412,8 @@ bool getFilesFromTrackerFile(string lnkdeppath, ref string[] files)
 		}
 		else
 		{
-			auto lnkdepz = cast(string)lnkdepData ~ "\0";
-			int cp = GetKBCodePage();
-			lnkdeps = fromMBSz(lnkdepz.ptr, cp);
+			// tracker file already converted to UTF8 by pipedmd
+			lnkdeps = cast(string)lnkdepData;
 		}
 
 		string[] exclpaths = Package.GetGlobalOptions().getDepsExcludePaths();

Original file line number	Diff line number	Diff line change
`@@ -683,7 +683,7 @@ else`
`683`	`683`	`{`
`684`	`684`	`mStartBuildTime = time(null);`
`685`	`685`
`686`		- mBuildLog = `<html><head><META HTTP-EQUIV="Content-Type" content="text/html">
	`686`	+ mBuildLog = `<html><head><meta http-equiv="Content-Type" content="text/html" charset="utf-8">
`687`	`687`	`</head><body><pre>`
`688`	`688`	`<table width=100% bgcolor=#CFCFE5><tr><td>`
`689`	`689`	`<font face=arial size=+3>Build Log</font>`
`@@ -1412,9 +1412,8 @@ bool getFilesFromTrackerFile(string lnkdeppath, ref string[] files)`
`1412`	`1412`	`}`
`1413`	`1413`	`else`
`1414`	`1414`	`{`
`1415`		`- auto lnkdepz = cast(string)lnkdepData ~ "\0";`
`1416`		`- int cp = GetKBCodePage();`
`1417`		`- lnkdeps = fromMBSz(lnkdepz.ptr, cp);`
	`1415`	`+ // tracker file already converted to UTF8 by pipedmd`
	`1416`	`+ lnkdeps = cast(string)lnkdepData;`
`1418`	`1417`	`}`
`1419`	`1418`
`1420`	`1419`	`string[] exclpaths = Package.GetGlobalOptions().getDepsExcludePaths();`