From: fennecdjay Date: Sun, 13 Oct 2019 18:52:44 +0000 (+0200) Subject: :art: Update X-Git-Tag: nightly~2154 X-Git-Url: http://10.10.0.4:5575/?a=commitdiff_plain;h=936806b0757c7b8cafa0ade85e4ca6f9a8dfa73a;p=gwion.git :art: Update --- diff --git a/Makefile b/Makefile index 4d954979..63c2dc24 100644 --- 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 22881b6f..48c6d265 160000 --- a/ast +++ b/ast @@ -1 +1 @@ -Subproject commit 22881b6f0a64d5c80d4142bd92dc67e9152961fa +Subproject commit 48c6d265b7d93dab3b0a70c20f2009cce191ef15