Skip to content

Commit

Permalink
Fixed support of the special symbols in path: ' &!~@#$^(+)_=%-;[.]{…
Browse files Browse the repository at this point in the history
…,}`. Issue #7

* gnt.bat now uses safe logic for work with special symbols from `-msbuild` key.
* And main logic just ignores `;` only when `|` is found.
* Also fixes .packer for new logic with "|" and just adds .compressor from DllExport project.
  • Loading branch information
3F committed Dec 7, 2018
1 parent e910e5c commit 6e66acf
Show file tree
Hide file tree
Showing 8 changed files with 473 additions and 37 deletions.
12 changes: 12 additions & 0 deletions .vssbe
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,17 @@
"",
"#[IO writeLine(STDOUT):#[File sout(\"netmsb.bat\", \"embedded/.packer /p:core=\\\"../$(dobj)gnt.min.core\\\" /p:output=\\\"../$(dobj)gnt.bat\\\" /nologo /v:m /m:4\", 400)]]",
"",
"",
"#[\" ",
" .compressor for executable version (batch)",
"\"]",
"#[IO writeLine(STDOUT):#[File sout(\"netmsb.bat\", \"embedded/.compressor /p:core=\\\"../$(dobj)gnt.bat\\\" /p:output=\\\"../$(dobj)gnt.minified.bat\\\" /nologo /v:m /m:4\", 400)]]",
"#[IO copy.file(\"$(dobj)gnt.bat\", \"$(dobj)gnt.full.bat\", true)]",
"#[IO copy.file(\"$(dobj)gnt.minified.bat\", \"$(dobj)gnt.bat\", true)]",
"#[IO delete.files({\"$(dobj)gnt.minified.bat\"})]",
"",
"#[IO writeLine(STDOUT): Validating the generated version ...]",
"",
"#[IO copy.file(\"embedded/sha1*\", \"$(dobj)\", true)]",
"#[IO writeLine(STDOUT):#[File sout(\"$(dobj)sha1.cmd\", \"\", 400)]]"
]
Expand All @@ -130,6 +141,7 @@
"#[IO copy.file(\"$(dobj)core\", \"$(odir)core/gnt.core\", true)]",
"#[IO copy.file(\"$(dobj)gnt.min.core\", \"$(odir)core-minified/gnt.core\", true)]",
"#[IO copy.file(\"$(dobj)gnt.bat\", \"$(odir)versions/01. executable/gnt.bat\", true)]",
"#[IO copy.file(\"$(dobj)gnt.bat.map\", \"$(odir)versions/01. executable/gnt.bat.map\", true)]",
"",
"#[IO copy.file({",
" \"$(odir)core-minified/gnt.core\", ",
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ The [MIT License (MIT)](https://github.com/3F/GetNuTool/blob/master/LICENSE)
Copyright (c) 2015-2018 Denis Kuzmin <entry.reg@gmail.com> :: github.com/3F
```

[![Donate](https://www.paypalobjects.com/en_US/i/btn/btn_donate_SM.gif)](https://r-eg.net/Donation/)
[![Donate](https://www.paypalobjects.com/en_US/i/btn/btn_donate_SM.gif)](https://3F.github.io/Donation/)


## Why GetNuTool ?
Expand Down
7 changes: 5 additions & 2 deletions caller/gnt.bat
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
@echo off
:: GetNuTool via batch
:: Copyright (c) 2015-2018 Denis Kuzmin [ entry.reg@gmail.com ]
:: https://github.com/3F/GetNuTool

set gntcore=gnt.core

Expand All @@ -11,7 +14,7 @@ for %%v in (4.0, 14.0, 12.0, 3.5, 2.0) do (
)
)

echo MSBuild was not found, try: ` "full_path_to_msbuild.exe" %gntcore% arguments` 1>&2
echo MSBuild was not found. Try: "full_path_to_msbuild.exe" %gntcore% arguments` 1>&2
exit /B 2

:found
Expand All @@ -21,4 +24,4 @@ exit /B 2
%msbuildexe% %gntcore% /nologo /v:m /m:4 %*
REM /noconlog

exit /B 0
exit /B %ERRORLEVEL%
Loading

0 comments on commit 6e66acf

Please sign in to comment.