diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 6a789b94d..9b6b3ba61 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -1,18 +1,13 @@ { - "version": "0.1.0", - "command": "haxe", - "args": ["client.hxml"], - "problemMatcher": { - "owner": "haxe", - "pattern": { - "regexp": "^(.+):(\\d+): (?:lines \\d+-(\\d+)|character(?:s (\\d+)-| )(\\d+)) : (?:(Warning) : )?(.*)$", - "file": 1, - "line": 2, - "endLine": 3, - "column": 4, - "endColumn": 5, - "severity": 6, - "message": 7 - } - } -} + "version": "2.0.0", + "tasks": [ + { + "type": "hxml", + "file": "client.hxml", + "group": { + "kind": "build", + "isDefault": true + } + } + ] +} \ No newline at end of file diff --git a/run.n b/run.n index 947c7a839..1cb31d13c 100644 Binary files a/run.n and b/run.n differ diff --git a/src/Package.hx b/src/Package.hx index 3703e6e15..9d0e246d4 100644 --- a/src/Package.hx +++ b/src/Package.hx @@ -68,7 +68,7 @@ class Package { v; } var json:Infos = haxe.Json.parse(sys.io.File.getContent("haxelib.json")); - if (!runVersion.startsWith(json.version + " ")) { + if (runVersion != json.version) { Sys.println('Error: Version in haxelib.json (${json.version}) does not match `neko run.n version` ($runVersion)'); Sys.exit(1); } diff --git a/src/haxelib/client/Main.hx b/src/haxelib/client/Main.hx index 7acfe2400..8b3a3fd79 100644 --- a/src/haxelib/client/Main.hx +++ b/src/haxelib/client/Main.hx @@ -257,7 +257,7 @@ class Main { else cats[i].push(c); } - print('Haxe Library Manager $VERSION - (c)2006-2017 Haxe Foundation'); + print('Haxe Library Manager $VERSION - (c)2006-2019 Haxe Foundation'); print(" Usage: haxelib [command] [options]"); for (cat in cats) { @@ -1359,7 +1359,8 @@ class Main { try { var f = File.getContent(d.dir + "extraParams.hxml"); - Sys.println(f.trim()); + var lines = ~/\r?\n/g.split(f).map(StringTools.trim).filter(function(line) return !line.startsWith("#")); + Sys.print(lines.join("\n")); } catch(_:Dynamic) {} var dir = d.dir;