diff --git a/compact/.compressor b/compact/.compressor index e98b663..5af4746 100644 --- a/compact/.compressor +++ b/compact/.compressor @@ -1,6 +1,6 @@ - + - + - + @@ -45,6 +45,7 @@ + @@ -89,8 +90,9 @@ var ret = new Queue(); foreach(var cfg in config.Split('|')) { - if(File.Exists(cfg)) { - h(cfg, ret); + var lcfg = Path.Combine(wpath, cfg ?? ""); + if(File.Exists(lcfg)) { + h(lcfg, ret); } } @@ -109,6 +111,7 @@ + @@ -129,10 +132,14 @@ Console.WriteLine(s, p); } }; + + Func loc = delegate(string p) { + return Path.Combine(wpath, p ?? ""); + }; Action get = delegate(string link, string name, string path) { - string output = Path.GetFullPath(path ?? name); + string output = Path.GetFullPath(loc(path ?? name)); if(Directory.Exists(output)) { Console.WriteLine("The `{0}` is already exists. /pass -> `{1}`", name, output); return; @@ -196,6 +203,7 @@ + @@ -229,6 +237,9 @@ } }; + dir = Path.Combine(wpath, dir); + dout = Path.Combine(wpath, dout ?? ""); + // Get metadata var nuspec = Directory.GetFiles(dir, "*" + EXT_NUSPEC, SearchOption.TopDirectoryOnly).FirstOrDefault(); diff --git a/wrapper/.packer b/wrapper/.packer index 528187f..4f3f607 100644 --- a/wrapper/.packer +++ b/wrapper/.packer @@ -15,7 +15,7 @@ ..\gnt.core gnt.bat - 1024 + 1400 @@ -139,7 +139,7 @@ // Now we can define, how it should be written into external file - const string corevar = "gntcore"; + const string corevar = "tgnt"; content = String.Empty; foreach(var line in lines) { diff --git a/wrapper/exec.tpl b/wrapper/exec.tpl index 2ac8dde..b748c26 100644 --- a/wrapper/exec.tpl +++ b/wrapper/exec.tpl @@ -21,7 +21,7 @@ goto exit $gnt.core.logic$ -%msbuild% %$tpl.corevar$% %* /nologo /verbosity:m +%msbuild% %$tpl.corevar$% %* /nologo /verbosity:m /p:wpath="%~dp0/" :exit \ No newline at end of file