equal
deleted
inserted
replaced
104 else |
104 else |
105 # Are we a git dir? |
105 # Are we a git dir? |
106 ifeq ($(shell if test -d $(SRC_DIR)/../.git; then echo 1; fi), 1) |
106 ifeq ($(shell if test -d $(SRC_DIR)/../.git; then echo 1; fi), 1) |
107 # Find the revision like: gXXXXM-branch |
107 # Find the revision like: gXXXXM-branch |
108 REV := g$(shell if head=`LC_ALL=C git rev-parse --verify HEAD 2>/dev/null`; then echo "$$head" | cut -c1-8; fi)$(shell if git diff-index HEAD | read dummy; then echo M; fi)$(shell git branch|grep '[*]' | sed 's/\* /-/;s/^-master$$//') |
108 REV := g$(shell if head=`LC_ALL=C git rev-parse --verify HEAD 2>/dev/null`; then echo "$$head" | cut -c1-8; fi)$(shell if git diff-index HEAD | read dummy; then echo M; fi)$(shell git branch|grep '[*]' | sed 's/\* /-/;s/^-master$$//') |
109 REV_NR := $(shell echo `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/"` ) |
109 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/" ) |
110 else |
110 else |
111 # Are we a hg (Mercurial) dir? |
111 # Are we a hg (Mercurial) dir? |
112 ifeq ($(shell if test -d $(SRC_DIR)/../.hg; then echo 1; fi), 1) |
112 ifeq ($(shell if test -d $(SRC_DIR)/../.hg; then echo 1; fi), 1) |
113 # Find the revision like: hXXXXM-branch |
113 # Find the revision like: hXXXXM-branch |
114 REV := h$(shell if head=`LC_ALL=C hg tip 2>/dev/null`; then echo "$$head" | head -n 1 | cut -c19-26; fi)$(shell if hg status $(SRC_DIR) | grep -v '^?' | read dummy; then echo M; fi)$(shell hg branch | sed 's/^/-/;s/^-default$$//') |
114 REV := h$(shell if head=`LC_ALL=C hg tip 2>/dev/null`; then echo "$$head" | head -n 1 | cut -c19-26; fi)$(shell if hg status $(SRC_DIR) | grep -v '^?' | read dummy; then echo M; fi)$(shell hg branch | sed 's/^/-/;s/^-default$$//') |
115 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/" ) |
115 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/" ) |
116 endif |
116 endif |
117 endif |
117 endif |
118 endif |
118 endif |
119 endif |
119 endif |
120 |
120 |