Remove last required use of WEBKIT_LIBRARIES environment variable on Windows

https://bugs.webkit.org/show_bug.cgi?id=149355

Reviewed by Brent Fulgham.

* win/tools/scripts/auto-version.pl:
Use the directory of $0 (the currently executed perl script) to find the perl script instead of an environment variable.
This makes it possible to build WebKit on Windows without environment variables.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@189992 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog
index 05dea9e84339de2cbc52bc392852089d8d83b0b8..fce7b4256ddb13fa9e51fde94309a33cdc3f911e 100644 (file)
--- a/WebKitLibraries/ChangeLog
+++ b/WebKitLibraries/ChangeLog
@@ -1,3 +1,14 @@
+2015-09-18  Alex Christensen  <achristensen@webkit.org>
+
+        Remove last required use of WEBKIT_LIBRARIES environment variable on Windows
+        https://bugs.webkit.org/show_bug.cgi?id=149355
+
+        Reviewed by Brent Fulgham.
+
+        * win/tools/scripts/auto-version.pl:
+        Use the directory of $0 (the currently executed perl script) to find the perl script instead of an environment variable.
+        This makes it possible to build WebKit on Windows without environment variables.
+
 2015-09-14  Chris Dumez  <cdumez@apple.com>
 
         Disable PICTURE_SIZES on AppleWin

diff --git a/WebKitLibraries/win/tools/scripts/auto-version.pl b/WebKitLibraries/win/tools/scripts/auto-version.pl
index 5f7c9808e46e26f19868314879575c8f67dabafe..3c93f2688d76e6131be65ed2e2cb4b194b6536cf 100755 (executable)
--- a/WebKitLibraries/win/tools/scripts/auto-version.pl
+++ b/WebKitLibraries/win/tools/scripts/auto-version.pl
@@ -3,6 +3,8 @@
 use strict;
 use File::Path qw(make_path);
 use File::Spec;
+use File::Basename;
+use Cwd 'abs_path';
 use Win32;
 
 # Copyright (C) 2007, 2009, 2014 Apple Inc.  All rights reserved.
@@ -32,22 +34,19 @@ sub splitVersion($);
 
 die "You must supply an output path as the argument.\n" if ($#ARGV < 0);
 
-my $WEBKIT_LIBRARIES = $ENV{'WEBKIT_LIBRARIES'};
-
-my ($COPYRIGHT_END_YEAR, $FALLBACK_VERSION);
-if (defined $WEBKIT_LIBRARIES) {
-    my $FALLBACK_VERSION_PATH = File::Spec->catfile($WEBKIT_LIBRARIES, 'tools', 'scripts', 'VERSION');
-    open(FALLBACK_VERSION_FILE, '<', $FALLBACK_VERSION_PATH) or die "Unable to open $FALLBACK_VERSION_PATH: $!";
-    $FALLBACK_VERSION = <FALLBACK_VERSION_FILE>;
-    close FALLBACK_VERSION_FILE;
-    chomp($FALLBACK_VERSION);
-
-    my $COPYRIGHT_END_YEAR_PATH = File::Spec->catfile($WEBKIT_LIBRARIES, 'tools', 'scripts', 'COPYRIGHT-END-YEAR');
-    open(COPYRIGHT_END_YEAR_FILE, '<', $COPYRIGHT_END_YEAR_PATH) or die "Unable to open $COPYRIGHT_END_YEAR_PATH: $!";
-    $COPYRIGHT_END_YEAR = <COPYRIGHT_END_YEAR_FILE>;
-    close COPYRIGHT_END_YEAR_FILE;
-    chomp($COPYRIGHT_END_YEAR);
-}
+my $thisDirectory = dirname(abs_path($0));
+
+my $FALLBACK_VERSION_PATH = File::Spec->catfile($thisDirectory, 'VERSION');
+open(FALLBACK_VERSION_FILE, '<', $FALLBACK_VERSION_PATH) or die "Unable to open $FALLBACK_VERSION_PATH: $!";
+my $FALLBACK_VERSION = <FALLBACK_VERSION_FILE>;
+close FALLBACK_VERSION_FILE;
+chomp($FALLBACK_VERSION);
+
+my $COPYRIGHT_END_YEAR_PATH = File::Spec->catfile($thisDirectory, 'COPYRIGHT-END-YEAR');
+open(COPYRIGHT_END_YEAR_FILE, '<', $COPYRIGHT_END_YEAR_PATH) or die "Unable to open $COPYRIGHT_END_YEAR_PATH: $!";
+my $COPYRIGHT_END_YEAR = <COPYRIGHT_END_YEAR_FILE>;
+close COPYRIGHT_END_YEAR_FILE;
+chomp($COPYRIGHT_END_YEAR);
 
 # Make sure we don't have any leading or trailing quote
 $ARGV[0] =~ s/^\"//;