fiddlerwoaroof/crawl - Change VGJ2TQOSXM3KW5DRANRAU6UXMHZ5Y2UNVQLL2776YI5OBS6S7FTQC

makefile: allow build.h to be generated based on git-merge-base

Signed-off-by: Steven Noonan <steven@uplinklabs.net>

Created by Steven Noonan on October 25, 2009

VGJ2TQOSXM3KW5DRANRAU6UXMHZ5Y2UNVQLL2776YI5OBS6S7FTQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/util/gen_ver.pl at line 14 [3.63]
[3.224]
[3.224]
```
my $mergebase = $ARGV[1];
```
Insertion in crawl-ref/source/util/gen_ver.pl at line 16 [3.63]
[3.225]
[3.225]
```
if (!$mergebase) {
	$mergebase = "";
}
```

Replacement in crawl-ref/source/util/gen_ver.pl at line 30 [3.63]

B:BD[3.367] → [3.367:459]

$verstring = `git describe --tags --long 2> /dev/null || git describe --tags 2> /dev/null`;

[3.367]

[3.459]

$verstring = `git describe --tags --long $mergebase 2> /dev/null || git describe --tags $mergebase 2> /dev/null`;

Replacement in crawl-ref/source/util/gen_ver.pl at line 88 [3.63]
B:BD[3.1729] → [3.1729:1770]
```
	$commit = `git rev-list $tag.. | wc -l`
```
[3.1729]
[3.1770]
```
	$commit = `git rev-list $tag..$mergebase | wc -l`
```

Insertion in crawl-ref/source/makefile at line 143 [6.2455714]

[2.2898]

[5.3143]

endif
ifdef USE_MERGE_BASE
MERGE_BASE := $(shell git merge-base HEAD $(USE_MERGE_BASE))

Replacement in crawl-ref/source/makefile at line 612 [6.2455714]
B:BD[4.7107] → [4.7107:7139]
```
	$(QUIET_GEN)util/gen_ver.pl $@
```
[4.7107]
[4.7139]
```
	$(QUIET_GEN)util/gen_ver.pl $@ $(MERGE_BASE)
```