From 0b0dc6a731b50447ac2045b3897f8eaa9a0d2b10 Mon Sep 17 00:00:00 2001 From: Adam Borowski Date: Wed, 25 Nov 2009 23:42:10 +0100 Subject: Properly build when out of git (using packaged source). --- crawl-ref/source/util/gen_ver.pl | 17 +++++++++-------- crawl-ref/source/util/release_ver | 1 - 2 files changed, 9 insertions(+), 9 deletions(-) delete mode 100644 crawl-ref/source/util/release_ver (limited to 'crawl-ref/source/util') diff --git a/crawl-ref/source/util/gen_ver.pl b/crawl-ref/source/util/gen_ver.pl index 4902be79a9..46317fe19d 100755 --- a/crawl-ref/source/util/gen_ver.pl +++ b/crawl-ref/source/util/gen_ver.pl @@ -17,12 +17,6 @@ if (!$mergebase) { $mergebase = ""; } -my $releasever; - -open IN, "<", "$scriptpath/release_ver"; -read IN, $releasever, 32; -close IN; - mkdir dirname($outfile); my $verstring = ""; @@ -30,8 +24,15 @@ my $verstring = ""; $verstring = `git describe --tags --long $mergebase 2> /dev/null || git describe --tags $mergebase 2> /dev/null`; if (!$verstring) { - print STDERR "WARNING: Couldn't get revision information from Git. Using $scriptpath/release_ver.\n"; - $verstring = $releasever; + if (open IN, "<", "$scriptpath/release_ver") + { + $verstring = ; + close IN; + } + else + { + die "No Git, and $scriptpath/release_ver doesn't exist.\n"; + } $in_git = 0; } diff --git a/crawl-ref/source/util/release_ver b/crawl-ref/source/util/release_ver deleted file mode 100644 index aa64bcec46..0000000000 --- a/crawl-ref/source/util/release_ver +++ /dev/null @@ -1 +0,0 @@ -0.6.0-a0 -- cgit v1.2.3-54-g00ecf