[Win] Unreviewed gardening.

* win/tools/scripts/auto-version.pl: Protect against
malformed paths (trailing backslashes).
* win/tools/scripts/feature-defines.pl: Make sure result
has an EOL character.

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

diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog
index f2e506ef8ec90c1d1596fdc2274e7830f7a9f51d..83bf6744b7f778294d13ffc8ad73b4b732209943 100644 (file)
--- a/WebKitLibraries/ChangeLog
+++ b/WebKitLibraries/ChangeLog
@@ -1,3 +1,12 @@
+2014-07-09  Brent Fulgham  <bfulgham@apple.com>
+
+        [Win] Unreviewed gardening.
+
+        * win/tools/scripts/auto-version.pl: Protect against
+        malformed paths (trailing backslashes).
+        * win/tools/scripts/feature-defines.pl: Make sure result
+        has an EOL character.
+
 2014-07-09  Brent Fulgham  <bfulgham@apple.com>
 
         [Win] Remove uses of 'bash' in build system

diff --git a/WebKitLibraries/win/tools/scripts/auto-version.pl b/WebKitLibraries/win/tools/scripts/auto-version.pl
index 9f07f50fe73de27740c043442a7730e18f556dc2..2c7f000f9dea341154409e04e3cbd4c3f62692a4 100755 (executable)
--- a/WebKitLibraries/win/tools/scripts/auto-version.pl
+++ b/WebKitLibraries/win/tools/scripts/auto-version.pl
@@ -47,13 +47,17 @@ if (defined $WEBKIT_LIBRARIES) {
     chomp($COPYRIGHT_END_YEAR);
 }
 
-my $OUTPUT_DIR = File::Spec->catdir($ARGV[0], 'include');
-my $OUTPUT_FILE = File::Spec->catfile($OUTPUT_DIR, 'autoversion.h');
+# Make sure we don't have any leading or trailing quote
+$ARGV[0] =~ s/^\"//;
+$ARGV[0] =~ s/\"$//;
 
+my $OUTPUT_DIR = File::Spec->catdir(File::Spec->canonpath($ARGV[0]), 'include');
 unless (-d $OUTPUT_DIR) {
     make_path($OUTPUT_DIR) or die "Couldn't create $OUTPUT_DIR: $!";
 }
 
+my $OUTPUT_FILE = File::Spec->catfile($OUTPUT_DIR, 'autoversion.h');
+
 # Take the initial version number from RC_ProjectSourceVersion if it
 # exists, otherwise fall back to the version number stored in the source.
 my $ENVIRONMENT_VERSION = $ENV{'RC_ProjectSourceVersion'};

diff --git a/WebKitLibraries/win/tools/scripts/feature-defines.pl b/WebKitLibraries/win/tools/scripts/feature-defines.pl
index f34cb51b3164c31ff958c55d029841d67dda2c2a..71c0b565f5b5e3e1b07dc18fd542928d039e011d 100755 (executable)
--- a/WebKitLibraries/win/tools/scripts/feature-defines.pl
+++ b/WebKitLibraries/win/tools/scripts/feature-defines.pl
@@ -44,4 +44,4 @@ for (@enabled) {
 
 my $result = join(' ', @enabled);
 
-print "$result";
+print "$result\n";