125986 – Extract common parts from jhbuildrc files.

RESOLVED FIXED Bug 125986

Extract common parts from jhbuildrc files.

https://bugs.webkit.org/show_bug.cgi?id=125986

Summary Extract common parts from jhbuildrc files.

ezisfake

Reported 2013-12-19 01:19:31 PST

The Tools/{efl, nix, gtk}/jhbuildrc files have some common parts. Extract them to a file in Tools/jhbuild/

Attachments
patch (12.15 KB, patch) 2013-12-19 06:37 PST, ezisfake	no flags	Details Formatted Diff Diff
patch (12.15 KB, patch) 2013-12-19 06:44 PST, ezisfake	gtk-ews: commit-queue-	Details Formatted Diff Diff
patch (17.05 KB, patch) 2014-01-14 01:12 PST, ezisfake	no flags	Details Formatted Diff Diff
patch (16.97 KB, patch) 2014-01-14 04:47 PST, ezisfake	gtk-ews: commit-queue-	Details Formatted Diff Diff
final patch ( i hope) (17.66 KB, patch) 2014-01-15 08:03 PST, ezisfake	no flags	Details Formatted Diff Diff
Patch v6 (17.82 KB, patch) 2014-02-17 10:09 PST, Tibor Mészáros	ossy: review- ossy: commit-queue-	Details Formatted Diff Diff
Patch v7 (20.64 KB, patch) 2014-02-18 04:56 PST, Tibor Mészáros	no flags	Details Formatted Diff Diff
Patch v8 (20.73 KB, patch) 2014-02-18 07:16 PST, Tibor Mészáros	no flags	Details Formatted Diff Diff
Patch v9 (20.78 KB, patch) 2014-02-18 07:51 PST, Tibor Mészáros	ossy: review- ossy: commit-queue-	Details Formatted Diff Diff
Patch v10 (18.47 KB, patch) 2014-02-21 08:44 PST, Tibor Mészáros	ossy: review- ossy: commit-queue-	Details Formatted Diff Diff
Patch v11 (17.59 KB, patch) 2014-02-24 04:48 PST, Tibor Mészáros	no flags	Details Formatted Diff Diff
Patch v12 (17.59 KB, patch) 2014-02-24 05:09 PST, Tibor Mészáros	no flags	Details Formatted Diff Diff
Patch v13 (17.74 KB, patch) 2014-02-24 06:01 PST, Tibor Mészáros	no flags	Details Formatted Diff Diff
Patch v14 (17.74 KB, patch) 2014-02-24 06:11 PST, Tibor Mészáros	no flags	Details Formatted Diff Diff
Patch v15 (17.74 KB, patch) 2014-02-24 06:27 PST, Tibor Mészáros	no flags	Details Formatted Diff Diff
Show Obsolete (13) View All Add attachment proposed patch, testcase, etc.

ezisfake

Comment 1 2013-12-19 06:37:18 PST

Created attachment 219648 [details] patch

ezisfake

Comment 2 2013-12-19 06:44:57 PST

Created attachment 219650 [details] patch fixed some checkstyle warning

WebKit Commit Bot

Comment 3 2013-12-19 06:46:53 PST

Attachment 219650 [details] did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Tools/ChangeLog', u'Tools/efl/common.py', u'Tools/efl/jhbuildrc', u'Tools/gtk/common.py', u'Tools/gtk/jhbuildrc', u'Tools/jhbuild/jhbuildrc_common.py', u'Tools/nix/common.py', u'Tools/nix/jhbuildrc', '--commit-queue']" exit_code: 1 ERROR: Tools/jhbuild/jhbuildrc_common.py:56: .has_key() is deprecated, use 'in' [pep8/W601] [5] Total errors found: 1 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style.

kov's GTK+ EWS bot

Comment 4 2013-12-19 07:40:58 PST

Comment on attachment 219650 [details] patch Attachment 219650 [details] did not pass gtk-ews (gtk): Output: http://webkit-queues.appspot.com/results/48818030

ezisfake

Comment 5 2014-01-14 01:12:12 PST

Created attachment 221119 [details] patch

Dominik Röttsches (drott)

Comment 6 2014-01-14 04:23:37 PST

*** Bug 81344 has been marked as a duplicate of this bug. ***

ezisfake

Comment 7 2014-01-14 04:47:55 PST

Created attachment 221141 [details] patch

WebKit Commit Bot

Comment 8 2014-01-14 04:49:33 PST

Attachment 221141 [details] did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Tools/ChangeLog', u'Tools/efl/common.py', u'Tools/efl/jhbuildrc', u'Tools/gtk/common.py', u'Tools/gtk/find-make-dist-errors', u'Tools/gtk/generate-gtkdoc', u'Tools/gtk/jhbuildrc', u'Tools/jhbuild/jhbuildrc_common.py', u'Tools/nix/common.py', u'Tools/nix/jhbuildrc', '--commit-queue']" exit_code: 1 ERROR: Tools/jhbuild/jhbuildrc_common.py:56: .has_key() is deprecated, use 'in' [pep8/W601] [5] Total errors found: 1 in 7 files If any of these errors are false positives, please file a bug against check-webkit-style.

kov's GTK+ EWS bot

Comment 9 2014-01-14 05:32:43 PST

Comment on attachment 221141 [details] patch Attachment 221141 [details] did not pass gtk-ews (gtk): Output: http://webkit-queues.appspot.com/results/4690392855347200

ezisfake

Comment 10 2014-01-15 08:03:00 PST

Created attachment 221268 [details] final patch ( i hope)

Csaba Osztrogonác

Comment 11 2014-02-06 05:07:33 PST

Comment on attachment 221268 [details] final patch ( i hope) LGTM, r=me

WebKit Commit Bot

Comment 12 2014-02-06 05:36:54 PST

Comment on attachment 221268 [details] final patch ( i hope) Clearing flags on attachment: 221268 Committed r163530: <http://trac.webkit.org/changeset/163530>

WebKit Commit Bot

Comment 13 2014-02-06 05:36:59 PST

All reviewed patches have been landed. Closing bug.

WebKit Commit Bot

Comment 14 2014-02-06 09:40:39 PST

Re-opened since this is blocked by bug 128311

Tibor Mészáros

Comment 15 2014-02-17 10:09:30 PST

Created attachment 224392 [details] Patch v6 This patch will extract common parts from jhbuildrc files, and fix run-gtk-test script too.

Csaba Osztrogonác

Comment 16 2014-02-18 04:40:47 PST

Comment on attachment 224392 [details] Patch v6 Please add the jhbuildrc_common.py to the patch

Tibor Mészáros

Comment 17 2014-02-18 04:56:35 PST

Created attachment 224497 [details] Patch v7 Added the missing jhbuildrc_common.py file.

WebKit Commit Bot

Comment 18 2014-02-18 04:57:32 PST

Attachment 224497 [details] did not pass style-queue: ERROR: Tools/jhbuild/jhbuildrc_common.py:21: trailing whitespace [pep8/W291] [5] ERROR: Tools/jhbuild/jhbuildrc_common.py:25: expected 2 blank lines, found 1 [pep8/E302] [5] ERROR: Tools/jhbuild/jhbuildrc_common.py:26: indentation is not a multiple of four [pep8/E111] [5] ERROR: Tools/jhbuild/jhbuildrc_common.py:27: indentation is not a multiple of four [pep8/E111] [5] ERROR: Tools/jhbuild/jhbuildrc_common.py:29: indentation is not a multiple of four [pep8/E111] [5] ERROR: Tools/jhbuild/jhbuildrc_common.py:31: expected 2 blank lines, found 1 [pep8/E302] [5] ERROR: Tools/jhbuild/jhbuildrc_common.py:32: indentation is not a multiple of four [pep8/E111] [5] ERROR: Tools/jhbuild/jhbuildrc_common.py:34: trailing whitespace [pep8/W291] [5] ERROR: Tools/jhbuild/jhbuildrc_common.py:34: expected 2 blank lines, found 1 [pep8/E302] [5] ERROR: Tools/jhbuild/jhbuildrc_common.py:35: indentation is not a multiple of four [pep8/E111] [5] ERROR: Tools/jhbuild/jhbuildrc_common.py:36: indentation is not a multiple of four [pep8/E111] [5] ERROR: Tools/jhbuild/jhbuildrc_common.py:38: trailing whitespace [pep8/W291] [5] ERROR: Tools/jhbuild/jhbuildrc_common.py:38: indentation is not a multiple of four [pep8/E111] [5] ERROR: Tools/jhbuild/jhbuildrc_common.py:40: indentation is not a multiple of four [pep8/E111] [5] ERROR: Tools/jhbuild/jhbuildrc_common.py:41: indentation is not a multiple of four [pep8/E111] [5] ERROR: Tools/jhbuild/jhbuildrc_common.py:42: whitespace after '[' [pep8/E201] [5] ERROR: Tools/jhbuild/jhbuildrc_common.py:42: indentation is not a multiple of four [pep8/E111] [5] ERROR: Tools/jhbuild/jhbuildrc_common.py:43: indentation is not a multiple of four [pep8/E111] [5] ERROR: Tools/jhbuild/jhbuildrc_common.py:44: indentation is not a multiple of four [pep8/E111] [5] ERROR: Tools/jhbuild/jhbuildrc_common.py:46: indentation is not a multiple of four [pep8/E111] [5] ERROR: Tools/jhbuild/jhbuildrc_common.py:47: whitespace after '[' [pep8/E201] [5] ERROR: Tools/jhbuild/jhbuildrc_common.py:47: indentation is not a multiple of four [pep8/E111] [5] ERROR: Tools/jhbuild/jhbuildrc_common.py:48: indentation is not a multiple of four [pep8/E111] [5] ERROR: Tools/jhbuild/jhbuildrc_common.py:49: indentation is not a multiple of four [pep8/E111] [5] ERROR: Tools/jhbuild/jhbuildrc_common.py:51: indentation is not a multiple of four [pep8/E111] [5] ERROR: Tools/jhbuild/jhbuildrc_common.py:52: indentation is not a multiple of four [pep8/E111] [5] ERROR: Tools/jhbuild/jhbuildrc_common.py:53: indentation is not a multiple of four [pep8/E111] [5] ERROR: Tools/jhbuild/jhbuildrc_common.py:54: indentation is not a multiple of four [pep8/E111] [5] ERROR: Tools/jhbuild/jhbuildrc_common.py:55: indentation is not a multiple of four [pep8/E111] [5] ERROR: Tools/jhbuild/jhbuildrc_common.py:55: missing whitespace after ',' [pep8/E231] [5] ERROR: Tools/jhbuild/jhbuildrc_common.py:56: indentation is not a multiple of four [pep8/E111] [5] ERROR: Tools/jhbuild/jhbuildrc_common.py:56: missing whitespace after ',' [pep8/E231] [5] ERROR: Tools/jhbuild/jhbuildrc_common.py:58: indentation is not a multiple of four [pep8/E111] [5] ERROR: Tools/jhbuild/jhbuildrc_common.py:59: indentation is not a multiple of four [pep8/E111] [5] ERROR: Tools/jhbuild/jhbuildrc_common.py:60: blank line at end of file [pep8/W391] [5] ERROR: Tools/jhbuild/jhbuildrc_common.py:60: trailing whitespace [pep8/W291] [5] Total errors found: 36 in 11 files If any of these errors are false positives, please file a bug against check-webkit-style.

Tibor Mészáros

Comment 19 2014-02-18 07:16:59 PST

Created attachment 224507 [details] Patch v8 The Tools/Scripts/update-webkit-[efl|gtk]libs now working.

WebKit Commit Bot

Comment 20 2014-02-18 07:18:51 PST

Attachment 224507 [details] did not pass style-queue: ERROR: Tools/jhbuild/jhbuildrc_common.py:21: trailing whitespace [pep8/W291] [5] ERROR: Tools/jhbuild/jhbuildrc_common.py:25: expected 2 blank lines, found 1 [pep8/E302] [5] ERROR: Tools/jhbuild/jhbuildrc_common.py:26: indentation is not a multiple of four [pep8/E111] [5] ERROR: Tools/jhbuild/jhbuildrc_common.py:27: indentation is not a multiple of four [pep8/E111] [5] ERROR: Tools/jhbuild/jhbuildrc_common.py:29: indentation is not a multiple of four [pep8/E111] [5] ERROR: Tools/jhbuild/jhbuildrc_common.py:31: expected 2 blank lines, found 1 [pep8/E302] [5] ERROR: Tools/jhbuild/jhbuildrc_common.py:32: indentation is not a multiple of four [pep8/E111] [5] ERROR: Tools/jhbuild/jhbuildrc_common.py:34: expected 2 blank lines, found 1 [pep8/E302] [5] ERROR: Tools/jhbuild/jhbuildrc_common.py:35: indentation is not a multiple of four [pep8/E111] [5] ERROR: Tools/jhbuild/jhbuildrc_common.py:36: indentation is not a multiple of four [pep8/E111] [5] ERROR: Tools/jhbuild/jhbuildrc_common.py:37: trailing whitespace [pep8/W291] [5] ERROR: Tools/jhbuild/jhbuildrc_common.py:38: indentation is not a multiple of four [pep8/E111] [5] ERROR: Tools/jhbuild/jhbuildrc_common.py:39: trailing whitespace [pep8/W291] [5] ERROR: Tools/jhbuild/jhbuildrc_common.py:40: indentation is not a multiple of four [pep8/E111] [5] ERROR: Tools/jhbuild/jhbuildrc_common.py:41: indentation is not a multiple of four [pep8/E111] [5] ERROR: Tools/jhbuild/jhbuildrc_common.py:42: indentation is not a multiple of four [pep8/E111] [5] ERROR: Tools/jhbuild/jhbuildrc_common.py:43: indentation is not a multiple of four [pep8/E111] [5] ERROR: Tools/jhbuild/jhbuildrc_common.py:44: indentation is not a multiple of four [pep8/E111] [5] ERROR: Tools/jhbuild/jhbuildrc_common.py:45: trailing whitespace [pep8/W291] [5] ERROR: Tools/jhbuild/jhbuildrc_common.py:46: indentation is not a multiple of four [pep8/E111] [5] ERROR: Tools/jhbuild/jhbuildrc_common.py:47: indentation is not a multiple of four [pep8/E111] [5] ERROR: Tools/jhbuild/jhbuildrc_common.py:48: indentation is not a multiple of four [pep8/E111] [5] ERROR: Tools/jhbuild/jhbuildrc_common.py:49: indentation is not a multiple of four [pep8/E111] [5] ERROR: Tools/jhbuild/jhbuildrc_common.py:50: trailing whitespace [pep8/W291] [5] ERROR: Tools/jhbuild/jhbuildrc_common.py:51: indentation is not a multiple of four [pep8/E111] [5] ERROR: Tools/jhbuild/jhbuildrc_common.py:52: indentation is not a multiple of four [pep8/E111] [5] ERROR: Tools/jhbuild/jhbuildrc_common.py:53: indentation is not a multiple of four [pep8/E111] [5] ERROR: Tools/jhbuild/jhbuildrc_common.py:54: indentation is not a multiple of four [pep8/E111] [5] ERROR: Tools/jhbuild/jhbuildrc_common.py:55: indentation is not a multiple of four [pep8/E111] [5] ERROR: Tools/jhbuild/jhbuildrc_common.py:56: indentation is not a multiple of four [pep8/E111] [5] ERROR: Tools/jhbuild/jhbuildrc_common.py:57: trailing whitespace [pep8/W291] [5] ERROR: Tools/jhbuild/jhbuildrc_common.py:58: indentation is not a multiple of four [pep8/E111] [5] ERROR: Tools/jhbuild/jhbuildrc_common.py:59: indentation is not a multiple of four [pep8/E111] [5] ERROR: Tools/jhbuild/jhbuildrc_common.py:60: blank line at end of file [pep8/W391] [5] ERROR: Tools/jhbuild/jhbuildrc_common.py:60: trailing whitespace [pep8/W291] [5] Total errors found: 35 in 11 files If any of these errors are false positives, please file a bug against check-webkit-style.

Tibor Mészáros

Comment 21 2014-02-18 07:51:48 PST

Created attachment 224511 [details] Patch v9 Style has been fixed.

Csaba Osztrogonác

Comment 22 2014-02-19 09:34:49 PST

Comment on attachment 224511 [details] Patch v9 The patch looks good to me, but the Nix part has gone away - https://trac.webkit.org/changeset/164360 , and please credit the original author in the changelog.

Tibor Mészáros

Comment 23 2014-02-21 08:44:28 PST

Created attachment 224872 [details] Patch v10 Removed the nix support

Peter Gal

Comment 24 2014-02-21 09:05:23 PST

(In reply to comment #23) > Created an attachment (id=224872) [details] > Patch v10 It seems this patch contains modifications against an already existing 'jhbuildrc_common.py' file, which is clearly incorrect (it's not in the repo). The whole 'jhbuildrc_common.py' file should be in the patch as a new file.

Csaba Osztrogonác

Comment 25 2014-02-24 03:36:56 PST

Comment on attachment 224872 [details] Patch v10 r-, because the patch isn't appliable and the credit for the original author is still missing.

Tibor Mészáros

Comment 26 2014-02-24 04:48:02 PST

Created attachment 225053 [details] Patch v11 The nix support removed, and added co-author.

Tibor Mészáros

Comment 27 2014-02-24 05:09:02 PST

Created attachment 225054 [details] Patch v12 Updated patch

Tibor Mészáros

Comment 28 2014-02-24 06:01:23 PST

Created attachment 225057 [details] Patch v13 Updated patch again

WebKit Commit Bot

Comment 29 2014-02-24 06:03:59 PST

Attachment 225057 [details] did not pass style-queue: ERROR: Tools/jhbuild/jhbuildrc_common.py:64: trailing whitespace [pep8/W291] [5] Total errors found: 1 in 10 files If any of these errors are false positives, please file a bug against check-webkit-style.

Tibor Mészáros

Comment 30 2014-02-24 06:11:56 PST

Created attachment 225059 [details] Patch v14 Removed the trailing whitespace from Tools/jhbuild/jhbuildrc_common.py:64

Tibor Mészáros

Comment 31 2014-02-24 06:27:48 PST

Created attachment 225061 [details] Patch v15 Added the missing line break to the end of the diff file...

WebKit Commit Bot

Comment 32 2014-02-24 07:40:03 PST

Comment on attachment 225061 [details] Patch v15 Clearing flags on attachment: 225061 Committed r164585: <http://trac.webkit.org/changeset/164585>

WebKit Commit Bot

Comment 33 2014-02-24 07:40:07 PST

All reviewed patches have been landed. Closing bug.

Note You need to log in before you can comment on or make changes to this bug.

Status RESOLVED

Resolution FIXED

Priority P2

Severity Normal

Classification Unclassified

Version 528+ (Nightly build)

Hardware Unspecified

OS Unspecified

Product WebKit

Component Tools / Tests

Assignee

Nobody

Reported

2013-12-19 01:19 PST

Modified

2014-02-24 07:40 PST History

CC List

11 users Show

URL

Keywords

Duplicates (1)

81344 View as bug list

Depends on

128311

Blocks

Dependancies

tree graph