Merge remote-tracking branch 'lenormf/fix-tupfile'

This commit is contained in:
Maxime Coste 2017-07-08 13:39:22 +09:00
commit 822225cbbb
2 changed files with 6 additions and 4 deletions

View File

@ -58,6 +58,8 @@ endif
!cxx = |> $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c %f -o %o |> !cxx = |> $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c %f -o %o |>
!ld = |> $(CXX) $(LDFLAGS) $(LIBS) %f -o %o |> !ld = |> $(CXX) $(LDFLAGS) $(LIBS) %f -o %o |>
!ln = |> ln -sf %f %o |>
:foreach *.cc |> !cxx |> obj/%B$(suffix).o {objects} :foreach *.cc |> !cxx |> %B$(suffix).o {objects}
:{objects} |> !ld |> kak :{objects} |> !ld |> kak$(suffix)
:kak$(suffix) |> !ln |> kak

View File

@ -21,8 +21,8 @@ add-highlighter -group /tupfile/comment fill comment
add-highlighter -group /tupfile/code regex "\%[fbBeoOdg]\b" 0:value add-highlighter -group /tupfile/code regex "\%[fbBeoOdg]\b" 0:value
add-highlighter -group /tupfile/code regex "\$\([\w_]+\)" 0:value add-highlighter -group /tupfile/code regex "\$\([\w_]+\)" 0:value
add-highlighter -group /tupfile/code regex ":\s*(foreach)\b" 1:keyword add-highlighter -group /tupfile/code regex ":\s*(foreach)\b" 1:keyword
add-highlighter -group /tupfile/code regex "(\.gitignore\b)" 0:keyword add-highlighter -group /tupfile/code regex "\.gitignore\b" 0:keyword
add-highlighter -group /tupfile/code regex "\bifn?eq|ifn?def|else|endif|error|include|include_rules|run|preload|export\b" 0:keyword add-highlighter -group /tupfile/code regex "\b(ifn?eq|ifn?def|else|endif|error|include|include_rules|run|preload|export)\b" 0:keyword
add-highlighter -group /tupfile/code regex "\b(\&?[\w_]+)\s*[:+]?=" 1:keyword add-highlighter -group /tupfile/code regex "\b(\&?[\w_]+)\s*[:+]?=" 1:keyword
# Initialization # Initialization