equal
deleted
inserted
replaced
94 ifeq ($(shell if test -d $(SRC_DIR)/.svn; then echo 1; fi), 1) |
94 ifeq ($(shell if test -d $(SRC_DIR)/.svn; then echo 1; fi), 1) |
95 # Find if the local source if modified |
95 # Find if the local source if modified |
96 REV_MODIFIED := $(shell svnversion $(SRC_DIR) | sed -n 's/.*\(M\).*/\1/p' ) |
96 REV_MODIFIED := $(shell svnversion $(SRC_DIR) | sed -n 's/.*\(M\).*/\1/p' ) |
97 # Find the revision like: rXXXX-branch |
97 # Find the revision like: rXXXX-branch |
98 REV := $(shell LC_ALL=C svn info $(SRC_DIR) | $(AWK) '/^URL:.*branch/ { split($$2, a, "/"); BRANCH="-"a[5] } /^Last Changed Rev:/ { REV="r"$$4"$(REV_MODIFIED)" } END { print REV BRANCH }') |
98 REV := $(shell LC_ALL=C svn info $(SRC_DIR) | $(AWK) '/^URL:.*branch/ { split($$2, a, "/"); BRANCH="-"a[5] } /^Last Changed Rev:/ { REV="r"$$4"$(REV_MODIFIED)" } END { print REV BRANCH }') |
99 endif |
99 else |
100 endif |
100 # Are we a git dir? |
|
101 ifeq ($(shell if test -d $(SRC_DIR)/../.git; then echo 1; fi), 1) |
|
102 # Find the revision like: rXXXXM |
|
103 REV := g$(shell if head=`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$$//') |
|
104 endif |
|
105 endif |
|
106 endif |
|
107 |
101 # Make sure we have something in REV |
108 # Make sure we have something in REV |
102 ifeq ($(REV),) |
109 ifeq ($(REV),) |
103 REV := norev000 |
110 REV := norev000 |
104 endif |
111 endif |
105 |
112 |