Do case insensitive search for lua scripts to load.

[obnox/wireshark/wip.git] / make-version.pl

diff --git a/make-version.pl b/make-version.pl
index 45312cc8f12f130c6bc59653a331967acc64aa22..a9ab79953af664d2ff912a1c00977d00a3e0a51f 100755 (executable)
--- a/make-version.pl
+++ b/make-version.pl
@@ -80,7 +80,9 @@ my %version_pref = (
        #"pkg_format" => "",
        );
 my $srcdir = ".";
+my $svn_info_cmd = "";
 
+$ENV{LANG} = "C";  # Ensure we run with correct locale
 
 # Run "svn info".  Parse out the most recent modification time and the
 # revision number.
@@ -103,7 +105,7 @@ sub read_svn_info {
                eval {
                        use warnings "all";
                        no warnings "all";
-                       $line = qx{svn info $srcdir};
+                       $line = qx{$svn_info_cmd};
                        if (defined($line)) {
                                if ($line =~ /Last Changed Date: (\d{4})-(\d\d)-(\d\d) (\d\d):(\d\d):(\d\d)/) {
                                        $last_change = timegm($6, $5, $4, $3, $2 - 1, $1);
@@ -253,8 +255,7 @@ sub print_svn_version
                        $revision . "\"\n" .
                        "#define SVNPATH \"" . $repo_path . "\"\n";
        } else {
-               $svn_version = "/* #define SVNVERSION \"\" */\n" .
-                       "/* #define SVNPATH \"\" */\n";
+               $svn_version = "\n";
        }
        if (open(OLDVER, "<$version_file")) {
                my $old_svn_version = <OLDVER> . <OLDVER>;
@@ -310,6 +311,12 @@ sub get_config {
 &get_config();
 
 if (-d "$srcdir/.svn") {
+       $svn_info_cmd = "svn info $srcdir";
+} elsif (-d "$srcdir/.git/svn") {
+       $svn_info_cmd = "git svn info $srcdir";
+}
+
+if ($svn_info_cmd) {
        print "This is a build from SVN (or a SVN snapshot).\n";
        &read_svn_info();
        if ($pkg_version) {
@@ -325,6 +332,8 @@ if (-d "$srcdir/.svn") {
        }
 } else {
        print "This is not a SVN build.\n";
+               $last_change = 0;
+               $revision = 0;
 }
 
 &print_svn_version;