AuroraPipeline/premake
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases 1 Wiki Activity

Merge pull request #1913 from Jarod42/fix_buildmessage_escaping

Browse Source 
Fix Codelite/gmake2 `buildmessage` escaping.
This commit is contained in:
Nick Clark 2022-09-02 14:11:21 -05:00 committed by GitHub
commit a96fe76fe3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 109 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/codelite/codelite_project.lua
View File

@ -325,7 +325,7 @@
_p(3, '<PreBuild>') _p(3, '<PreBuild>')
p.escaper(codelite.escElementText) p.escaper(codelite.escElementText)
if cfg.prebuildmessage then if cfg.prebuildmessage then
local command = os.translateCommandsAndPaths("@{ECHO} " .. cfg.prebuildmessage, cfg.project.basedir, cfg.project.location) local command = os.translateCommandsAndPaths("@{ECHO} " .. p.quote(cfg.prebuildmessage), cfg.project.basedir, cfg.project.location)
_x(4, '<Command Enabled="yes">%s</Command>', command) _x(4, '<Command Enabled="yes">%s</Command>', command)
end end
local commands = os.translateCommandsAndPaths(cfg.prebuildcommands, cfg.project.basedir, cfg.project.location) local commands = os.translateCommandsAndPaths(cfg.prebuildcommands, cfg.project.basedir, cfg.project.location)
@ -342,7 +342,7 @@
_p(3, '<PostBuild>') _p(3, '<PostBuild>')
p.escaper(codelite.escElementText) p.escaper(codelite.escElementText)
if cfg.postbuildmessage then if cfg.postbuildmessage then
local command = os.translateCommandsAndPaths("@{ECHO} " .. cfg.postbuildmessage, cfg.project.basedir, cfg.project.location) local command = os.translateCommandsAndPaths("@{ECHO} " .. p.quote(cfg.postbuildmessage), cfg.project.basedir, cfg.project.location)
_x(4, '<Command Enabled="yes">%s</Command>', command) _x(4, '<Command Enabled="yes">%s</Command>', command)
end end
local commands = os.translateCommandsAndPaths(cfg.postbuildcommands, cfg.project.basedir, cfg.project.location) local commands = os.translateCommandsAndPaths(cfg.postbuildcommands, cfg.project.basedir, cfg.project.location)
@ -398,7 +398,7 @@
local outputs = project.getrelative(cfg.project, config.buildoutputs[1]) local outputs = project.getrelative(cfg.project, config.buildoutputs[1])
local buildmessage = "" local buildmessage = ""
if config.buildmessage then if config.buildmessage then
buildmessage = "\t@{ECHO} " .. config.buildmessage .. "\n" buildmessage = "\t@{ECHO} " .. p.quote(config.buildmessage) .. "\n"
end end
local commands = table.implode(config.buildcommands,"\t","\n","") local commands = table.implode(config.buildcommands,"\t","\n","")
table.insert(makefilerules, os.translateCommandsAndPaths(outputs .. ": " .. filename .. inputs .. "\n" .. buildmessage .. commands, cfg.project.basedir, cfg.project.location)) table.insert(makefilerules, os.translateCommandsAndPaths(outputs .. ": " .. filename .. inputs .. "\n" .. buildmessage .. commands, cfg.project.basedir, cfg.project.location))

42
modules/codelite/tests/test_codelite_additional_rules.lua
View File

@ -111,11 +111,11 @@
<CustomPostBuild/> <CustomPostBuild/>
<CustomPreBuild>test.obj test2.obj <CustomPreBuild>test.obj test2.obj
test.obj: test.rule test.obj: test.rule
@echo Rule-ing test.rule @echo "Rule-ing test.rule"
dorule -p "test.rule" dorule -p "test.rule"
test2.obj: test2.rule test2.obj: test2.rule
@echo Rule-ing test2.rule @echo "Rule-ing test2.rule"
dorule -p -p2 "test2.rule" dorule -p -p2 "test2.rule"
</CustomPreBuild> </CustomPreBuild>
</AdditionalRules> </AdditionalRules>
@ -156,19 +156,19 @@ test2.obj: test2.rule
<CustomPostBuild/> <CustomPostBuild/>
<CustomPreBuild>test.obj test2.obj test3.obj test4.obj <CustomPreBuild>test.obj test2.obj test3.obj test4.obj
test.obj: test.rule test.obj: test.rule
@echo Rule-ing test.rule @echo "Rule-ing test.rule"
dorule testValue1 testValue2 "test.rule" dorule testValue1 testValue2 "test.rule"
test2.obj: test2.rule test2.obj: test2.rule
@echo Rule-ing test2.rule @echo "Rule-ing test2.rule"
dorule -StestValue1 -StestValue2 "test2.rule" dorule -StestValue1 -StestValue2 "test2.rule"
test3.obj: test3.rule test3.obj: test3.rule
@echo Rule-ing test3.rule @echo "Rule-ing test3.rule"
dorule testValue1,testValue2 "test3.rule" dorule testValue1,testValue2 "test3.rule"
test4.obj: test4.rule test4.obj: test4.rule
@echo Rule-ing test4.rule @echo "Rule-ing test4.rule"
dorule -OtestValue1,testValue2 "test4.rule" dorule -OtestValue1,testValue2 "test4.rule"
</CustomPreBuild> </CustomPreBuild>
</AdditionalRules> </AdditionalRules>
@ -197,11 +197,11 @@ test4.obj: test4.rule
<CustomPostBuild/> <CustomPostBuild/>
<CustomPreBuild>test.obj test2.obj <CustomPreBuild>test.obj test2.obj
test.obj: test.rule test.obj: test.rule
@echo Rule-ing test.rule @echo "Rule-ing test.rule"
dorule S0 "test.rule" dorule S0 "test.rule"
test2.obj: test2.rule test2.obj: test2.rule
@echo Rule-ing test2.rule @echo "Rule-ing test2.rule"
dorule S1 "test2.rule" dorule S1 "test2.rule"
</CustomPreBuild> </CustomPreBuild>
</AdditionalRules> </AdditionalRules>
@ -221,7 +221,27 @@ test2.obj: test2.rule
<CustomPostBuild/> <CustomPostBuild/>
<CustomPreBuild>toto.c <CustomPreBuild>toto.c
toto.c: toto.txt extra_dependency toto.c: toto.txt extra_dependency
@echo Some message @echo "Some message"
test
test toto.c
</CustomPreBuild>
</AdditionalRules>]]
end
function suite.buildCommand_escaping()
files {"foo.txt", "bar.txt"}
buildinputs { "toto.txt", "extra_dependency" }
buildoutputs { "toto.c" }
buildcommands { "test", "test toto.c" }
buildmessage '"Some message"'
prepare()
codelite.project.additionalRules(cfg)
test.capture [[
<AdditionalRules>
<CustomPostBuild/>
<CustomPreBuild>toto.c
toto.c: toto.txt extra_dependency
@echo "\"Some message\""
test test
test toto.c test toto.c
</CustomPreBuild> </CustomPreBuild>
@ -242,12 +262,12 @@ toto.c: toto.txt extra_dependency
<CustomPostBuild/> <CustomPostBuild/>
<CustomPreBuild>bar.c foo.c <CustomPreBuild>bar.c foo.c
bar.c: bar.txt bar.h extra_dependency bar.c: bar.txt bar.h extra_dependency
@echo Some message @echo "Some message"
test test
test bar test bar
foo.c: foo.txt foo.h extra_dependency foo.c: foo.txt foo.h extra_dependency
@echo Some message @echo "Some message"
test test
test foo test foo
</CustomPreBuild> </CustomPreBuild>

4
modules/codelite/tests/test_codelite_config.lua
View File

@ -204,7 +204,7 @@
codelite.project.preBuild(cfg) codelite.project.preBuild(cfg)
test.capture [[ test.capture [[
<PreBuild> <PreBuild>
<Command Enabled="yes">@echo test</Command> <Command Enabled="yes">@echo "test"</Command>
</PreBuild> </PreBuild>
]] ]]
end end
@ -215,7 +215,7 @@
codelite.project.postBuild(cfg) codelite.project.postBuild(cfg)
test.capture [[ test.capture [[
<PostBuild> <PostBuild>
<Command Enabled="yes">@echo test</Command> <Command Enabled="yes">@echo "test"</Command>
</PostBuild> </PostBuild>
]] ]]
end end

2
modules/gmake2/gmake2_cpp.lua
View File

@ -748,7 +748,7 @@
_p('%s: %s', file.buildoutputs[1], dependencies) _p('%s: %s', file.buildoutputs[1], dependencies)
if file.buildmessage then if file.buildmessage then
_p('\t@echo %s', file.buildmessage) _p('\t@echo %s', p.quote(file.buildmessage))
end end
if file.buildcommands then if file.buildcommands then

2
modules/gmake2/gmake2_utility.lua
View File

@ -370,7 +370,7 @@
_p('%s: %s', outputs, dependencies) _p('%s: %s', outputs, dependencies)
if file.buildmessage then if file.buildmessage then
_p('\t@echo %s', file.buildmessage) _p('\t@echo %s', p.quote(file.buildmessage))
end end
if file.buildcommands then if file.buildcommands then

78
modules/gmake2/tests/test_gmake2_file_rules.lua
View File

@ -93,10 +93,10 @@
# ############################################# # #############################################
$(OBJDIR)/hello.o: src/greetings/hello.cpp $(OBJDIR)/hello.o: src/greetings/hello.cpp
@echo $(notdir $<) @echo "$(notdir $<)"
$(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<" $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<"
$(OBJDIR)/hello1.o: src/hello.cpp $(OBJDIR)/hello1.o: src/hello.cpp
@echo $(notdir $<) @echo "$(notdir $<)"
$(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<" $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<"
]] ]]
@ -115,10 +115,10 @@ $(OBJDIR)/hello1.o: src/hello.cpp
# ############################################# # #############################################
$(OBJDIR)/hello.o: src/hello.c $(OBJDIR)/hello.o: src/hello.c
@echo $(notdir $<) @echo "$(notdir $<)"
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<" $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<"
$(OBJDIR)/test.o: src/test.cpp $(OBJDIR)/test.o: src/test.cpp
@echo $(notdir $<) @echo "$(notdir $<)"
$(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<" $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<"
]] ]]
@ -138,10 +138,10 @@ $(OBJDIR)/test.o: src/test.cpp
# ############################################# # #############################################
$(OBJDIR)/hello.o: src/hello.c $(OBJDIR)/hello.o: src/hello.c
@echo $(notdir $<) @echo "$(notdir $<)"
$(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<" $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<"
$(OBJDIR)/test.o: src/test.c $(OBJDIR)/test.o: src/test.c
@echo $(notdir $<) @echo "$(notdir $<)"
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<" $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<"
]] ]]
end end
@ -160,17 +160,17 @@ $(OBJDIR)/test.o: src/test.c
# ############################################# # #############################################
$(OBJDIR)/test.o: src/test.c $(OBJDIR)/test.o: src/test.c
@echo $(notdir $<) @echo "$(notdir $<)"
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<" $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<"
ifeq ($(config),debug) ifeq ($(config),debug)
$(OBJDIR)/hello.o: src/hello.c $(OBJDIR)/hello.o: src/hello.c
@echo $(notdir $<) @echo "$(notdir $<)"
$(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<" $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<"
else ifeq ($(config),release) else ifeq ($(config),release)
$(OBJDIR)/hello.o: src/hello.c $(OBJDIR)/hello.o: src/hello.c
@echo $(notdir $<) @echo "$(notdir $<)"
$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<" $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<"
endif endif
@ -198,13 +198,13 @@ endif
ifeq ($(config),debug) ifeq ($(config),debug)
obj/Debug/hello.obj: hello.x obj/Debug/hello.obj: hello.x
@echo Compiling hello.x @echo "Compiling hello.x"
$(SILENT) cxc -c "hello.x" -o "obj/Debug/hello.xo" $(SILENT) cxc -c "hello.x" -o "obj/Debug/hello.xo"
$(SILENT) c2o -c "obj/Debug/hello.xo" -o "obj/Debug/hello.obj" $(SILENT) c2o -c "obj/Debug/hello.xo" -o "obj/Debug/hello.obj"
else ifeq ($(config),release) else ifeq ($(config),release)
obj/Release/hello.obj: hello.x obj/Release/hello.obj: hello.x
@echo Compiling hello.x @echo "Compiling hello.x"
$(SILENT) cxc -c "hello.x" -o "obj/Release/hello.xo" $(SILENT) cxc -c "hello.x" -o "obj/Release/hello.xo"
$(SILENT) c2o -c "obj/Release/hello.xo" -o "obj/Release/hello.obj" $(SILENT) c2o -c "obj/Release/hello.xo" -o "obj/Release/hello.obj"
@ -212,6 +212,38 @@ endif
]] ]]
end end
--
-- If a custom build rule is supplied, it should be used.
--
function suite.customBuildRuleWithEscaping()
files { "hello.x" }
filter "files:**.x"
buildmessage '"Compiling %{file.name}"'
buildcommands {
'cxc -c "%{file.path}" -o "%{cfg.objdir}/%{file.basename}.xo"',
}
buildoutputs { "%{cfg.objdir}/%{file.basename}.obj" }
prepare()
test.capture [[
# File Rules
# #############################################
ifeq ($(config),debug)
obj/Debug/hello.obj: hello.x
@echo "\"Compiling hello.x\""
$(SILENT) cxc -c "hello.x" -o "obj/Debug/hello.xo"
else ifeq ($(config),release)
obj/Release/hello.obj: hello.x
@echo "\"Compiling hello.x\""
$(SILENT) cxc -c "hello.x" -o "obj/Release/hello.xo"
endif
]]
end
function suite.customBuildRuleWithAdditionalInputs() function suite.customBuildRuleWithAdditionalInputs()
files { "hello.x" } files { "hello.x" }
filter "files:**.x" filter "files:**.x"
@ -229,13 +261,13 @@ endif
ifeq ($(config),debug) ifeq ($(config),debug)
obj/Debug/hello.obj: hello.x hello.x.inc hello.x.inc2 obj/Debug/hello.obj: hello.x hello.x.inc hello.x.inc2
@echo Compiling hello.x @echo "Compiling hello.x"
$(SILENT) cxc -c "hello.x" -o "obj/Debug/hello.xo" $(SILENT) cxc -c "hello.x" -o "obj/Debug/hello.xo"
$(SILENT) c2o -c "obj/Debug/hello.xo" -o "obj/Debug/hello.obj" $(SILENT) c2o -c "obj/Debug/hello.xo" -o "obj/Debug/hello.obj"
else ifeq ($(config),release) else ifeq ($(config),release)
obj/Release/hello.obj: hello.x hello.x.inc hello.x.inc2 obj/Release/hello.obj: hello.x hello.x.inc hello.x.inc2
@echo Compiling hello.x @echo "Compiling hello.x"
$(SILENT) cxc -c "hello.x" -o "obj/Release/hello.xo" $(SILENT) cxc -c "hello.x" -o "obj/Release/hello.xo"
$(SILENT) c2o -c "obj/Release/hello.xo" -o "obj/Release/hello.obj" $(SILENT) c2o -c "obj/Release/hello.xo" -o "obj/Release/hello.obj"
@ -259,14 +291,14 @@ endif
ifeq ($(config),debug) ifeq ($(config),debug)
obj/Debug/hello.obj: hello.x obj/Debug/hello.obj: hello.x
@echo Compiling hello.x @echo "Compiling hello.x"
$(SILENT) cxc -c "hello.x" -o "obj/Debug/hello.xo" $(SILENT) cxc -c "hello.x" -o "obj/Debug/hello.xo"
$(SILENT) c2o -c "obj/Debug/hello.xo" -o "obj/Debug/hello.obj" $(SILENT) c2o -c "obj/Debug/hello.xo" -o "obj/Debug/hello.obj"
obj/Debug/hello.other obj/Debug/hello.another: obj/Debug/hello.obj obj/Debug/hello.other obj/Debug/hello.another: obj/Debug/hello.obj
else ifeq ($(config),release) else ifeq ($(config),release)
obj/Release/hello.obj: hello.x obj/Release/hello.obj: hello.x
@echo Compiling hello.x @echo "Compiling hello.x"
$(SILENT) cxc -c "hello.x" -o "obj/Release/hello.xo" $(SILENT) cxc -c "hello.x" -o "obj/Release/hello.xo"
$(SILENT) c2o -c "obj/Release/hello.xo" -o "obj/Release/hello.obj" $(SILENT) c2o -c "obj/Release/hello.xo" -o "obj/Release/hello.obj"
obj/Release/hello.other obj/Release/hello.another: obj/Release/hello.obj obj/Release/hello.other obj/Release/hello.another: obj/Release/hello.obj
@ -296,10 +328,10 @@ endif
# ############################################# # #############################################
test.obj: test.rule test.obj: test.rule
@echo Rule-ing test.rule @echo "Rule-ing test.rule"
$(SILENT) dorule -p "test.rule" $(SILENT) dorule -p "test.rule"
test2.obj: test2.rule test2.obj: test2.rule
@echo Rule-ing test2.rule @echo "Rule-ing test2.rule"
$(SILENT) dorule -p -p2 "test2.rule" $(SILENT) dorule -p -p2 "test2.rule"
]] ]]
end end
@ -335,16 +367,16 @@ test2.obj: test2.rule
# ############################################# # #############################################
test.obj: test.rule test.obj: test.rule
@echo Rule-ing test.rule @echo "Rule-ing test.rule"
$(SILENT) dorule testValue1\ testValue2 "test.rule" $(SILENT) dorule testValue1\ testValue2 "test.rule"
test2.obj: test2.rule test2.obj: test2.rule
@echo Rule-ing test2.rule @echo "Rule-ing test2.rule"
$(SILENT) dorule -StestValue1\ -StestValue2 "test2.rule" $(SILENT) dorule -StestValue1\ -StestValue2 "test2.rule"
test3.obj: test3.rule test3.obj: test3.rule
@echo Rule-ing test3.rule @echo "Rule-ing test3.rule"
$(SILENT) dorule testValue1,testValue2 "test3.rule" $(SILENT) dorule testValue1,testValue2 "test3.rule"
test4.obj: test4.rule test4.obj: test4.rule
@echo Rule-ing test4.rule @echo "Rule-ing test4.rule"
$(SILENT) dorule -OtestValue1,testValue2 "test4.rule" $(SILENT) dorule -OtestValue1,testValue2 "test4.rule"
]] ]]
end end
@ -370,10 +402,10 @@ test4.obj: test4.rule
# ############################################# # #############################################
test.obj: test.rule test.obj: test.rule
@echo Rule-ing test.rule @echo "Rule-ing test.rule"
$(SILENT) dorule S0 "test.rule" $(SILENT) dorule S0 "test.rule"
test2.obj: test2.rule test2.obj: test2.rule
@echo Rule-ing test2.rule @echo "Rule-ing test2.rule"
$(SILENT) dorule S1 "test2.rule" $(SILENT) dorule S1 "test2.rule"
]] ]]
end end

12
modules/gmake2/tests/test_gmake2_pch.lua
View File

@ -69,10 +69,10 @@
# ############################################# # #############################################
$(OBJDIR)/a.o: a.cpp $(OBJDIR)/a.o: a.cpp
@echo $(notdir $<) @echo "$(notdir $<)"
$(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<" $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<"
$(OBJDIR)/b.o: b.cpp $(OBJDIR)/b.o: b.cpp
@echo $(notdir $<) @echo "$(notdir $<)"
$(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<" $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<"
]] ]]
end end
@ -193,10 +193,10 @@ PCH = ../../../../src/host/premake.h
# ############################################# # #############################################
$(OBJDIR)/a.o: a.cpp $(OBJDIR)/a.o: a.cpp
@echo $(notdir $<) @echo "$(notdir $<)"
$(SILENT) $(CXX) -include $(PCH_PLACEHOLDER) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<" $(SILENT) $(CXX) -include $(PCH_PLACEHOLDER) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<"
$(OBJDIR)/b.o: b.cpp $(OBJDIR)/b.o: b.cpp
@echo $(notdir $<) @echo "$(notdir $<)"
$(SILENT) $(CXX) -include $(PCH_PLACEHOLDER) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<" $(SILENT) $(CXX) -include $(PCH_PLACEHOLDER) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<"
]] ]]
end end
@ -215,10 +215,10 @@ $(OBJDIR)/b.o: b.cpp
# ############################################# # #############################################
$(OBJDIR)/a.o: a.cpp $(OBJDIR)/a.o: a.cpp
@echo $(notdir $<) @echo "$(notdir $<)"
$(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<" $(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<"
$(OBJDIR)/b.o: b.cpp $(OBJDIR)/b.o: b.cpp
@echo $(notdir $<) @echo "$(notdir $<)"
$(SILENT) $(CXX) -include $(PCH_PLACEHOLDER) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<" $(SILENT) $(CXX) -include $(PCH_PLACEHOLDER) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<"
]] ]]
end end

11
src/base/premake.lua
View File

@ -321,7 +321,16 @@ end
end end
end end
---
-- Wrap the provided value in double quotes
-- escaping backslash and double quote
---
function premake.quote(s)
s = s:gsub('\\', '\\\\')
s = s:gsub('"', '\\"')
return '"' .. s .. '"'
end
--- ---
-- Wrap the provided value in double quotes if it contains spaces, or -- Wrap the provided value in double quotes if it contains spaces, or
@ -334,7 +343,7 @@ end
q = value:find("$%(.-%)", 1) q = value:find("$%(.-%)", 1)
end end
if q then if q then
value = '"' .. value .. '"' return p.quote(value)
end end
return value return value
end end