Attachment #233803 for bug #133547

View Details Raw Unified Return to Bug 133547

| Differences between



2014-06-25  László Langó  <llango.u-szeged@partner.samsung.com>

        [JavaScriptCore] Make build-jsc output format better.
        https://bugs.webkit.org/show_bug.cgi?id=133547

        Reviewed by NOBODY (OOPS!).

        * Scripts/build-jsc: Emit built time information on successful builds.
        (writeCongrats):
        * Scripts/build-webkit: Move formatBuildTime function into webkitdirs.pm.
        (cMakeArgsFromFeatures):
        (formatBuildTime): Deleted.
        * Scripts/webkitdirs.pm:
        (formatBuildTime):

2014-06-24  Tomas Popela  <tpopela@redhat.com>

        [GTK] Some of DOM bindings macros are misnamed

Lines 35-40 use lib $FindBin::Bin; a/Tools/Scripts/build-jsc_sec1
- a/Tools/Scripts/build-jsc +15 lines
35	use webkitdirs;	35	use webkitdirs;
36	use POSIX;	36	use POSIX;
37		37
		38	sub writeCongrats();
		39
38	my $coverageSupport = 0;	40	my $coverageSupport = 0;
39	my $showHelp = 0;	41	my $showHelp = 0;
40	my $ftlJIT = isAppleWebKit();	42	my $ftlJIT = isAppleWebKit();
Lines 42-47 my $forceCLoop = 0; a/Tools/Scripts/build-jsc_sec2
42	my $cli = 0;	44	my $cli = 0;
43	my $makeArgs = "";	45	my $makeArgs = "";
44	my $copyLibraries = 1;	46	my $copyLibraries = 1;
		47	my $startTime = time();
45		48
46	my $programName = basename($0);	49	my $programName = basename($0);
47	my $usage = <<EOF;	50	my $usage = <<EOF;
Lines 85-90 if (cmakeBasedPortName()) { a/Tools/Scripts/build-jsc_sec3
85		88
86	# This call only returns if nothing wrong happened	89	# This call only returns if nothing wrong happened
87	buildCMakeProjectOrExit(0, cmakeBasedPortName(), undef, "jsc $makeArgs", (cmakeBasedPortArguments(), $cmakeArgs));	90	buildCMakeProjectOrExit(0, cmakeBasedPortName(), undef, "jsc $makeArgs", (cmakeBasedPortArguments(), $cmakeArgs));
		91	writeCongrats();
88	exit exitStatus(0);	92	exit exitStatus(0);
89	}	93	}
90		94
Lines 127-132 sub buildMyProject a/Tools/Scripts/build-jsc_sec4
127	chdirWebKit();	131	chdirWebKit();
128	}	132	}
129		133
		134	sub writeCongrats()
		135	{
		136	my $endTime = time();
		137	my $buildTime = formatBuildTime($endTime - $startTime);
		138
		139	print "\n";
		140	print "====================================================================\n";
		141	print " JavaScriptCore is now built ($buildTime). \n";
		142	print "====================================================================\n";
		143	}
		144
130	if (!isAppleWinWebKit() && !isWinCairo()) {	145	if (!isAppleWinWebKit() && !isWinCairo()) {
131	buildMyProject("Source/bmalloc", "bmalloc");	146	buildMyProject("Source/bmalloc", "bmalloc");
132	}	147	}



use POSIX;

sub cMakeArgsFromFeatures();
sub formatBuildTime($);
sub writeCongrats();

my $originalWorkingDirectory = getcwd();

    return @args;
}

sub formatBuildTime($)
{
    my ($buildTime) = @_;

    my $buildHours = int($buildTime / 3600);
    my $buildMins = int(($buildTime - $buildHours * 3600) / 60);
    my $buildSecs = $buildTime - $buildHours * 3600 - $buildMins * 60;

    if ($buildHours) {
        return sprintf("%dh:%02dm:%02ds", $buildHours, $buildMins, $buildSecs);
    }
    return sprintf("%02dm:%02ds", $buildMins, $buildSecs);
}

sub writeCongrats()
{
    my $launcherPath = launcherPath();



    return !$error && readRegistryString($valueName) eq $string;
}

sub formatBuildTime($)
{
    my ($buildTime) = @_;

    my $buildHours = int($buildTime / 3600);
    my $buildMins = int(($buildTime - $buildHours * 3600) / 60);
    my $buildSecs = $buildTime - $buildHours * 3600 - $buildMins * 60;

    if ($buildHours) {
        return sprintf("%dh:%02dm:%02ds", $buildHours, $buildMins, $buildSecs);
    }
    return sprintf("%02dm:%02ds", $buildMins, $buildSecs);
}

1;

Return to Bug 133547

Lines 2504-2507 sub writeRegistryString a/Tools/Scripts/webkitdirs.pm_sec1
- a/Tools/Scripts/webkitdirs.pm +14 lines
2504	return !$error && readRegistryString($valueName) eq $string;	2504	return !$error && readRegistryString($valueName) eq $string;
2505	}	2505	}
2506		2506
		2507	sub formatBuildTime($)
		2508	{
		2509	my ($buildTime) = @_;
		2510
		2511	my $buildHours = int($buildTime / 3600);
		2512	my $buildMins = int(($buildTime - $buildHours * 3600) / 60);
		2513	my $buildSecs = $buildTime - $buildHours * 3600 - $buildMins * 60;
		2514
		2515	if ($buildHours) {
		2516	return sprintf("%dh:%02dm:%02ds", $buildHours, $buildMins, $buildSecs);
		2517	}
		2518	return sprintf("%02dm:%02ds", $buildMins, $buildSecs);
		2519	}
		2520
2507	1;	2521	1;

Lines 1-3 a/Tools/ChangeLog_sec1
- a/Tools/ChangeLog +15 lines
		1	2014-06-25 László Langó <llango.u-szeged@partner.samsung.com>
		2
		3	[JavaScriptCore] Make build-jsc output format better.
		4	https://bugs.webkit.org/show_bug.cgi?id=133547
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	* Scripts/build-jsc: Emit built time information on successful builds.
		9	(writeCongrats):
		10	* Scripts/build-webkit: Move formatBuildTime function into webkitdirs.pm.
		11	(cMakeArgsFromFeatures):
		12	(formatBuildTime): Deleted.
		13	* Scripts/webkitdirs.pm:
		14	(formatBuildTime):
		15
1	2014-06-24 Tomas Popela <tpopela@redhat.com>	16	2014-06-24 Tomas Popela <tpopela@redhat.com>
2		17
3	[GTK] Some of DOM bindings macros are misnamed	18	[GTK] Some of DOM bindings macros are misnamed

Lines 45-51 use webkitperl::FeatureList qw(getFeatureOptionList); a/Tools/Scripts/build-webkit_sec1
- a/Tools/Scripts/build-webkit -15 lines
45	use POSIX;	45	use POSIX;
46		46
47	sub cMakeArgsFromFeatures();	47	sub cMakeArgsFromFeatures();
48	sub formatBuildTime($);
49	sub writeCongrats();	48	sub writeCongrats();
50		49
51	my $originalWorkingDirectory = getcwd();	50	my $originalWorkingDirectory = getcwd();
Lines 345-364 sub cMakeArgsFromFeatures() a/Tools/Scripts/build-webkit_sec2
345	return @args;	344	return @args;
346	}	345	}
347		346
348	sub formatBuildTime($)
349	{
350	my ($buildTime) = @_;
351
352	my $buildHours = int($buildTime / 3600);
353	my $buildMins = int(($buildTime - $buildHours * 3600) / 60);
354	my $buildSecs = $buildTime - $buildHours * 3600 - $buildMins * 60;
355
356	if ($buildHours) {
357	return sprintf("%dh:%02dm:%02ds", $buildHours, $buildMins, $buildSecs);
358	}
359	return sprintf("%02dm:%02ds", $buildMins, $buildSecs);
360	}
361
362	sub writeCongrats()	347	sub writeCongrats()
363	{	348	{
364	my $launcherPath = launcherPath();	349	my $launcherPath = launcherPath();