diff options
| author | ruki <[email protected]> | 2018-10-10 08:41:41 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2018-10-10 08:41:41 +0800 |
| commit | 6939afdafdbb00c0a616e58632b292f776ad2dfa (patch) | |
| tree | bc66b658d1bd0b7d424c031cdb06b6a00ccedfab | |
| parent | 497e25b10f0dd3a734a81109541d6c09c61e9e82 (diff) | |
| parent | ca7b50a40cf7c120d49ca8164f9a54c289dd5743 (diff) | |
Merge pull request #221 from rivy/fix.makefile-null
fix makefile use of null device for windows
| -rw-r--r-- | xmake/plugins/project/makefile/makefile.lua | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/xmake/plugins/project/makefile/makefile.lua b/xmake/plugins/project/makefile/makefile.lua index b2bfa76f0..2ea69d20a 100644 --- a/xmake/plugins/project/makefile/makefile.lua +++ b/xmake/plugins/project/makefile/makefile.lua @@ -39,7 +39,7 @@ end function _mkdir(makefile, dir) if is_plat("windows") then - makefile:print("\t-@mkdir %s > /null 2>&1", dir) + makefile:print("\t-@mkdir %s > NUL 2>&1", dir) else makefile:print("\t@mkdir -p %s", dir) end @@ -50,7 +50,7 @@ function _cp(makefile, sourcefile, targetfile) -- copy file if is_plat("windows") then - makefile:print("\t@copy /Y %s %s > /null 2>&1", sourcefile, targetfile) + makefile:print("\t@copy /Y %s %s > NUL 2>&1", sourcefile, targetfile) else makefile:print("\t@cp %s %s", sourcefile, targetfile) end @@ -62,9 +62,9 @@ function _tryrm(makefile, filedir) -- remove it if is_plat("windows") then if os.isdir(filedir) then - makefile:print("\t@rmdir /S /Q %s > /null 2>&1", filedir) + makefile:print("\t@rmdir /S /Q %s > NUL 2>&1", filedir) elseif os.isfile(filedir) then - makefile:print("\t@del /F /Q %s > /null 2>&1", filedir) + makefile:print("\t@del /F /Q %s > NUL 2>&1", filedir) end else if os.isdir(filedir) then |