projects
/
YACASL2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make gittagの動作を変更。VERSIONに記載されたタグがmaster以外のgit REFの場合、タグを追加
[YACASL2.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
1730124
..
8bd9f1a
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-10,18
+10,25
@@
CMD := casl2 comet2 dumpword
CAT := cat
CP := cp
CAT := cat
CP := cp
-ECHO := echo
-GIT
TAG := git tag
+ECHO :=
/bin/
echo
+GIT
:= git
GREP := grep
GTAGS := gtags
INSTALL := install
SED := sed
WHICH := which
GREP := grep
GTAGS := gtags
INSTALL := install
SED := sed
WHICH := which
+EXPR := expr
+XARGS := xargs
prefix ?= ~
bindir ?= $(prefix)/bin
prefix ?= ~
bindir ?= $(prefix)/bin
-VERSION = $(shell $(CAT) VERSION)
+VERSION := $(shell $(CAT) VERSION)
+
+VERSIONGITREF := $(shell $(GIT) show-ref -s --tags $(VERSION))
+
+MASTERGITREF := $(shell $(GIT) show-ref -s refs/heads/master)
+
VERSIONFILES = include/package.h \
test/system/casl2/opt_v/0.txt \
test/system/comet2/opt_v/0.txt \
VERSIONFILES = include/package.h \
test/system/casl2/opt_v/0.txt \
test/system/comet2/opt_v/0.txt \
@@
-65,8
+72,8
@@
version: $(VERSIONFILES)
$(VERSIONFILES): VERSION
@$(SED) -e "s/@@VERSION@@/$(VERSION)/g" $@.version >$@
$(VERSIONFILES): VERSION
@$(SED) -e "s/@@VERSION@@/$(VERSION)/g" $@.version >$@
-gittag:
VERSION
- $(GITTAG) | $(GREP) $(VERSION) || $(GITTAG) $(VERSION)
+gittag:
+ if test `$(GIT) status -s | wc -l` -gt 0; then $(ECHO) "Error: commit, first."; exit 1; fi; if test "$(VERSIONGITREF)" != "$(MASTERGITREF)"; then $(GIT) tag $(VERSION); fi
distclean: cmd-clean src-distclean gtags-clean version-clean clean
distclean: cmd-clean src-distclean gtags-clean version-clean clean