(svn r14262) -Feature [Makefile]: Let Makefile.bundle.in also use the new findversion.sh

script. This enables revision detection for bundles for git and hg checkouts.
pull/155/head
matthijs 16 years ago
parent 8f69465314
commit 3f42080e1a

@ -6,14 +6,11 @@
ifdef REVISION
REV := $(REVISION)
else
# Are we a SVN dir?
ifeq ($(shell if test -d $(SRC_DIR)/.svn; then echo 1; fi), 1)
# Find if the local source if modified
REV_MODIFIED := $(shell svnversion $(SRC_DIR) | sed -n 's/.*\(M\).*/\1/p' )
# Find the revision like: rXXXX-branch
REV := $(shell LC_ALL=C svn info $(SRC_DIR) | $(AWK) '/^URL:.*branches/ { split($$2, a, "/"); for (i in a) if(a[i]=="branches") { BRANCH="-"a[i+1]; break } } /^Last Changed Rev:/ { REV="r"$$4"$(REV_MODIFIED)" } END { print REV BRANCH }')
endif
# Detect the revision
VERSIONS := $(shell AWK="$(AWK)" "$(ROOT_DIR)/findversion.sh")
REV := $(shell echo "$(VERSIONS)" | cut -f 1)
endif
# Make sure we have something in REV
ifeq ($(REV),)
REV := norev000

Loading…
Cancel
Save