Title: [106233] trunk/Tools
- Revision
- 106233
- Author
- [email protected]
- Date
- 2012-01-30 04:47:28 -0800 (Mon, 30 Jan 2012)
Log Message
[Qt] Store build config immediately instead of waiting for a successfull build
Otherwise we will not pick up changes to the config if the build is aborted,
for example due to build errors or if the user pressed Ctrl+Z. We now write
the new config before starting a build, but still defer to write the SVN
revision once the build completes successfully.
Reviewed by Ossy.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (106232 => 106233)
--- trunk/Tools/ChangeLog 2012-01-30 12:36:41 UTC (rev 106232)
+++ trunk/Tools/ChangeLog 2012-01-30 12:47:28 UTC (rev 106233)
@@ -1,3 +1,17 @@
+2012-01-30 Tor Arne Vestbø <[email protected]>
+
+ [Qt] Store build config immediately instead of waiting for a successfull build
+
+ Otherwise we will not pick up changes to the config if the build is aborted,
+ for example due to build errors or if the user pressed Ctrl+Z. We now write
+ the new config before starting a build, but still defer to write the SVN
+ revision once the build completes successfully.
+
+ Reviewed by Ossy.
+
+ * Scripts/webkitdirs.pm:
+ (buildQMakeProjects):
+
2012-01-30 Alexander Færøy <[email protected]>
[Qt] Add "New Window" button to the Qt MiniBrowser
Modified: trunk/Tools/Scripts/webkitdirs.pm (106232 => 106233)
--- trunk/Tools/Scripts/webkitdirs.pm 2012-01-30 12:36:41 UTC (rev 106232)
+++ trunk/Tools/Scripts/webkitdirs.pm 2012-01-30 12:47:28 UTC (rev 106233)
@@ -2188,6 +2188,15 @@
#}
}
+ # Save config up-front so we can detect changes to the build config even
+ # when the user re-configures after aborting the build.
+ open(DEFAULTS, ">$pathToDefinesCache");
+ print DEFAULTS "# These defines were set when building WebKit last time\n";
+ foreach my $key (sort keys %defines) {
+ print DEFAULTS "$key=$defines{$key}\n";
+ }
+ close(DEFAULTS);
+
my $result = 0;
my $makefile = File::Spec->catfile($dir, "Makefile");
@@ -2221,12 +2230,9 @@
chdir ".." or die;
if ($result eq 0) {
- $defines{"SVN_REVISION"} = $svnRevision;
- open(DEFAULTS, ">$pathToDefinesCache");
- print DEFAULTS "# These defines were set when building WebKit last time\n";
- foreach my $key (sort keys %defines) {
- print DEFAULTS "$key=$defines{$key}\n";
- }
+ # Now that the build completed successfully we can save the SVN revision
+ open(DEFAULTS, ">>$pathToDefinesCache");
+ print DEFAULTS "SVN_REVISION=$svnRevision\n";
close(DEFAULTS);
} elsif ($buildHint eq "" && exitStatus($result)) {
my $exitCode = exitStatus($result);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
