diff options
| author | glx <glx@openttd.org> | 2008-08-12 18:03:32 +0000 |
|---|---|---|
| committer | glx <glx@openttd.org> | 2008-08-12 18:03:32 +0000 |
| commit | 86865d7f4cca62866eaa27ff7c5d41abb437ce9f (patch) | |
| tree | 7056d8fde8caf0c97a4e7c23f895e73d81d7cf76 | |
| parent | 6199dc987beb75538797ac55478ae9b05a7c9a35 (diff) | |
| download | openttd-86865d7f4cca62866eaa27ff7c5d41abb437ce9f.tar.xz | |
(svn r14053) -Fix: branch detection failed for svn+ssh repos
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | Makefile.src.in | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in index 819d5835b..d63a0fdd6 100644 --- a/Makefile.in +++ b/Makefile.in @@ -156,7 +156,7 @@ 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, "/"); BRANCH="-"a[5] } /^Last Changed Rev:/ { REV="r"$$4"$(REV_MODIFIED)" } END { print REV BRANCH }') +REV := $(shell LC_ALL=C svn info $(SRC_DIR) | $(AWK) '/^URL:.*branches/ { split($$2, a, "/"); i=1; while(i<length(a) && a[i++]!="branches"); BRANCH="-"a[i] } /^Last Changed Rev:/ { REV="r"$$4"$(REV_MODIFIED)" } END { print REV BRANCH }') endif endif # Make sure we have something in REV diff --git a/Makefile.src.in b/Makefile.src.in index e4ac9c0e7..0c32e89e3 100644 --- a/Makefile.src.in +++ b/Makefile.src.in @@ -124,7 +124,7 @@ else ifeq ($(shell if test -d $(SRC_DIR)/.svn; then echo 1; fi), 1) # Find if the local source if modified # Find the revision like: rXXXX-branch -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 }') +REV := $(shell LC_ALL=C svn info $(SRC_DIR) | $(AWK) '/^URL:.*branch/ { split($$2, a, "/"); i=1; while(i<length(a) && a[i++]!="branches"); BRANCH="-"a[i] } /^Last Changed Rev:/ { REV="r"$$4"$(REV_MODIFIED)" } END { print REV BRANCH }') REV_NR := $(shell LC_ALL=C svn info $(SRC_DIR) | $(AWK) '/^Last Changed Rev:/ { print $$4 }') else # Are we a git dir? |