equal
deleted
inserted
replaced
127 else |
127 else |
128 # Are we a git dir? |
128 # Are we a git dir? |
129 ifeq ($(shell if test -d $(SRC_DIR)/../.git; then echo 1; fi), 1) |
129 ifeq ($(shell if test -d $(SRC_DIR)/../.git; then echo 1; fi), 1) |
130 # Find the revision like: gXXXXM-branch |
130 # Find the revision like: gXXXXM-branch |
131 REV := g$(shell if head=`LC_ALL=C git rev-parse --verify HEAD 2>/dev/null`; then echo "$$head" | cut -c1-8; fi)$(REV_MODIFIED)$(shell git branch|grep '[*]' | sed 's/\* /-/;s/^-master$$//') |
131 REV := g$(shell if head=`LC_ALL=C git rev-parse --verify HEAD 2>/dev/null`; then echo "$$head" | cut -c1-8; fi)$(REV_MODIFIED)$(shell git branch|grep '[*]' | sed 's/\* /-/;s/^-master$$//') |
132 REV_NR := $(shell LC_ALL=C cd "$(SRC_DIR)/.." && git log --pretty=format:%s src | grep -m 1 "^(svn r[0-9]*)" | sed "s/.*(svn r\([0-9]*\)).*/\1/" ) |
132 REV_NR := $(shell LC_ALL=C cd "$(SRC_DIR)/.." && git log --pretty=format:%s src | grep "^(svn r[0-9]*)" | head -n 1 | sed "s/.*(svn r\([0-9]*\)).*/\1/" ) |
133 else |
133 else |
134 # Are we a hg (Mercurial) dir? |
134 # Are we a hg (Mercurial) dir? |
135 ifeq ($(shell if test -d $(SRC_DIR)/../.hg; then echo 1; fi), 1) |
135 ifeq ($(shell if test -d $(SRC_DIR)/../.hg; then echo 1; fi), 1) |
136 # Find the revision like: hXXXXM-branch |
136 # Find the revision like: hXXXXM-branch |
137 REV := h$(shell if head=`LC_ALL=C hg tip 2>/dev/null`; then echo "$$head" | head -n 1 | cut -d: -f3 | cut -c1-8; fi)$(REV_MODIFIED)$(shell hg branch | sed 's/^/-/;s/^-default$$//') |
137 REV := h$(shell if head=`LC_ALL=C hg tip 2>/dev/null`; then echo "$$head" | head -n 1 | cut -d: -f3 | cut -c1-8; fi)$(REV_MODIFIED)$(shell hg branch | sed 's/^/-/;s/^-default$$//') |
138 REV_NR := $(shell LC_ALL=C hg log -k "svn" -l 1 --template "{desc}\n" $(SRC_DIR) | grep -m 1 "^(svn r[0-9]*)" | sed "s/.*(svn r\([0-9]*\)).*/\1/" ) |
138 REV_NR := $(shell LC_ALL=C hg log -k "svn" -l 1 --template "{desc}\n" $(SRC_DIR) | grep "^(svn r[0-9]*)" | head -n 1 | sed "s/.*(svn r\([0-9]*\)).*/\1/" ) |
139 endif |
139 endif |
140 endif |
140 endif |
141 endif |
141 endif |
142 endif |
142 endif |
143 |
143 |