diff options
| author | matthijs <matthijs@openttd.org> | 2008-09-07 13:36:18 +0000 |
|---|---|---|
| committer | matthijs <matthijs@openttd.org> | 2008-09-07 13:36:18 +0000 |
| commit | bb683cf38edb3bf6f15cd32b4490c0bd84032e42 (patch) | |
| tree | 8d1a1f5c776b984afcc25fbdbf18b0c26921bd4c /Makefile.bundle.in | |
| parent | 6cf61714ca18fbee15fcb127246420922b13f078 (diff) | |
| download | openttd-bb683cf38edb3bf6f15cd32b4490c0bd84032e42.tar.xz | |
(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.
Diffstat (limited to 'Makefile.bundle.in')
| -rw-r--r-- | Makefile.bundle.in | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/Makefile.bundle.in b/Makefile.bundle.in index 85204de84..8558912b2 100644 --- a/Makefile.bundle.in +++ b/Makefile.bundle.in @@ -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 |