Title: [170940] trunk/WebKitLibraries
- Revision
- 170940
- Author
- bfulg...@apple.com
- Date
- 2014-07-09 17:24:43 -0700 (Wed, 09 Jul 2014)
Log Message
[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.
Modified Paths
Diff
Modified: trunk/WebKitLibraries/ChangeLog (170939 => 170940)
--- trunk/WebKitLibraries/ChangeLog 2014-07-10 00:22:35 UTC (rev 170939)
+++ trunk/WebKitLibraries/ChangeLog 2014-07-10 00:24:43 UTC (rev 170940)
@@ -1,5 +1,14 @@
2014-07-09 Brent Fulgham <bfulg...@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 <bfulg...@apple.com>
+
[Win] Remove uses of 'bash' in build system
https://bugs.webkit.org/show_bug.cgi?id=134782
<rdar://problem/17615533>
Modified: trunk/WebKitLibraries/win/tools/scripts/auto-version.pl (170939 => 170940)
--- trunk/WebKitLibraries/win/tools/scripts/auto-version.pl 2014-07-10 00:22:35 UTC (rev 170939)
+++ trunk/WebKitLibraries/win/tools/scripts/auto-version.pl 2014-07-10 00:24:43 UTC (rev 170940)
@@ -47,13 +47,17 @@
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'};
Modified: trunk/WebKitLibraries/win/tools/scripts/feature-defines.pl (170939 => 170940)
--- trunk/WebKitLibraries/win/tools/scripts/feature-defines.pl 2014-07-10 00:22:35 UTC (rev 170939)
+++ trunk/WebKitLibraries/win/tools/scripts/feature-defines.pl 2014-07-10 00:24:43 UTC (rev 170940)
@@ -44,4 +44,4 @@
my $result = join(' ', @enabled);
-print "$result";
+print "$result\n";
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
