From e1e3cfaf45d7eb5401343debb8b6cbc983855677 Mon Sep 17 00:00:00 2001 From: Frank LENORMAND Date: Wed, 15 Mar 2017 17:35:44 +0300 Subject: [PATCH 1/2] contrib Tupfile: Adapt to upstream changes --- contrib/Tupfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/contrib/Tupfile b/contrib/Tupfile index c8c97d4e..1f2f3e8d 100644 --- a/contrib/Tupfile +++ b/contrib/Tupfile @@ -58,6 +58,8 @@ endif !cxx = |> $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c %f -o %o |> !ld = |> $(CXX) $(LDFLAGS) $(LIBS) %f -o %o |> +!ln = |> ln -sf %f %o |> -:foreach *.cc |> !cxx |> obj/%B$(suffix).o {objects} -:{objects} |> !ld |> kak +:foreach *.cc |> !cxx |> %B$(suffix).o {objects} +:{objects} |> !ld |> kak$(suffix) +:kak$(suffix) |> !ln |> kak From a2be15801f318ffb48971d27a41c18cc61860f35 Mon Sep 17 00:00:00 2001 From: Frank LENORMAND Date: Thu, 29 Jun 2017 13:11:39 +0300 Subject: [PATCH 2/2] rc tupfile: Fix the keywords regex --- rc/extra/tupfile.kak | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rc/extra/tupfile.kak b/rc/extra/tupfile.kak index 837dc185..ce8af71d 100644 --- a/rc/extra/tupfile.kak +++ b/rc/extra/tupfile.kak @@ -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 "\$\([\w_]+\)" 0:value 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 "\bifn?eq|ifn?def|else|endif|error|include|include_rules|run|preload|export\b" 0:keyword +add-highlighter -group /tupfile/code regex "\.gitignore\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 # Initialization