[Win] Unreviewed gardening.
authorbfulgham@apple.com <bfulgham@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 10 Jul 2014 00:24:43 +0000 (00:24 +0000)
committerbfulgham@apple.com <bfulgham@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 10 Jul 2014 00:24:43 +0000 (00:24 +0000)
* 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

WebKitLibraries/ChangeLog
WebKitLibraries/win/tools/scripts/auto-version.pl
WebKitLibraries/win/tools/scripts/feature-defines.pl

index f2e506e..83bf674 100644 (file)
@@ -1,5 +1,14 @@
 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
         https://bugs.webkit.org/show_bug.cgi?id=134782
         <rdar://problem/17615533>
index 9f07f50..2c7f000 100755 (executable)
@@ -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'};
index f34cb51..71c0b56 100755 (executable)
@@ -44,4 +44,4 @@ for (@enabled) {
 
 my $result = join(' ', @enabled);
 
-print "$result";
+print "$result\n";