cpp/openttd-patchpack/source Changeset - r9903:1f4c9a7781a3

Changeset - r9903:1f4c9a7781a3

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

glx - 16 years ago 2008-08-12 18:03:32
glx@openttd.org

(svn r14053) -Fix: branch detection failed for svn+ssh repos

2 files changed with 2 insertions and 2 deletions:

Makefile.in

Makefile.src.in

0 comments (0 inline, 0 general)

Makefile.in

➞

Show inline comments

@@ @@ -156,7 +156,7 @@ ifeq ($(shell if test -d $(SRC_DIR)/.svn @@
 # 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

Makefile.src.in

➞

Show inline comments

@@ @@ -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?

0 comments (0 inline, 0 general)