]> Nishi Git Mirror - gwion.git/commitdiff
:art: Update
authorfennecdjay <astor.jeremie@wanadoo.fr>
Sun, 13 Oct 2019 18:52:44 +0000 (20:52 +0200)
committerfennecdjay <astor.jeremie@wanadoo.fr>
Sun, 13 Oct 2019 18:52:44 +0000 (20:52 +0200)
Makefile
ast

index 4d954979f01c4eb5b5594622485d8c2fcf207b7a..63c2dc24000c78f79f9b05d2d67e2b88758f7050 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -10,6 +10,8 @@ include config.mk
 GWION_PACKAGE=gwion
 CFLAGS += -DGWION_PACKAGE='"${GWION_PACKAGE}"'
 
+GIT_BRANCH=$(shell git branch | grep "*" | cut -d" " -f2)
+
 # initialize source lists
 src_src := $(wildcard src/*.c)
 lib_src := $(wildcard src/lib/*.c)
@@ -119,13 +121,11 @@ test:
        @bash scripts/test.sh ${test_dir}
 
 coverity:
-       $(shell git branch | grep "*" | cut -d" " -f2 > .branch)
        [ -z "$(git ls-remote --heads $(git remote get-url origin) coverity_scan)" ] || git push origin :coverity_scan
        git show-ref --verify --quiet refs/heads/master && git branch -D coverity_scan || echo ""
        git checkout -b coverity_scan
        git push --set-upstream origin coverity_scan
-       git checkout $(cat .branch)
-       rm .branch
+       git checkout ${GIT_BRANCH}
 
 include $(wildcard .d/*.d)
 include util/intl.mk
diff --git a/ast b/ast
index 22881b6f0a64d5c80d4142bd92dc67e9152961fa..48c6d265b7d93dab3b0a70c20f2009cce191ef15 160000 (submodule)
--- a/ast
+++ b/ast
@@ -1 +1 @@
-Subproject commit 22881b6f0a64d5c80d4142bd92dc67e9152961fa
+Subproject commit 48c6d265b7d93dab3b0a70c20f2009cce191ef15