1630201 - Merge browser/themes/shared/preferences/ and browser/themes/shared/incontentprefs/

Status: RESOLVED FIXED

(Firefox :: Theme, task)

Description

[Tim Nguyen :ntim]

I think there's really no point in mentioning in-content anymore, so the merged directory should just be preferences/.

There's a containers.css file both in the preferences and the incontentprefs dirs. The preferences one seems used in the subdialog, while the other one is used in the main UI.
So I'll just rename accordingly.

Comment 1

[Tim Nguyen :ntim]

Attachment: Bug 1630201 - Rename browser/themes/shared/preferences/containers.css to browser/themes/shared/preferences/containers-dialog.css.

Comment 2

[Tim Nguyen :ntim]

Attachment: Bug 1630201 - Merge browser/themes/shared/preferences and browser/themes/shared/incontentprefs.

Depends on D71019

Comment 3

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/60f42302b5d5
Rename browser/themes/shared/preferences/containers.css to browser/themes/shared/preferences/containers-dialog.css. r=jaws
https://hg.mozilla.org/integration/autoland/rev/05d18c70a0bd
Merge browser/themes/shared/preferences and browser/themes/shared/incontentprefs. r=jaws

Comment 4

[Natalia Csoregi [:nataliaCs]]

Backed out for bustages due to containers.css missing

backout: https://hg.mozilla.org/integration/autoland/rev/fe3c79839a883fd37d818a2720e025df394e3cec

push: https://treeherder.mozilla.org/#/jobs?repo=autoland&group_state=expanded&revision=05d18c70a0bdf435c95ca4bcc7f452eb06abe400&searchStr=build&selectedJob=297805758

failure log: https://treeherder.mozilla.org/logviewer.html#/jobs?job_id=297805758&repo=autoland&lineNumber=55739

[task 2020-04-15T20:25:42.351Z] 20:25:42 INFO - processing /builds/worker/checkouts/gecko/browser/themes/windows/jar.mn
[task 2020-04-15T20:25:42.351Z] 20:25:42 ERROR - Traceback (most recent call last):
[task 2020-04-15T20:25:42.351Z] 20:25:42 INFO - File "/usr/lib/python3.5/runpy.py", line 193, in _run_module_as_main
[task 2020-04-15T20:25:42.351Z] 20:25:42 INFO - "main", mod_spec)
[task 2020-04-15T20:25:42.352Z] 20:25:42 INFO - File "/usr/lib/python3.5/runpy.py", line 85, in _run_code
[task 2020-04-15T20:25:42.352Z] 20:25:42 INFO - exec(code, run_globals)
[task 2020-04-15T20:25:42.352Z] 20:25:42 INFO - File "/builds/worker/checkouts/gecko/python/mozbuild/mozbuild/action/jar_maker.py", line 17, in <module>
[task 2020-04-15T20:25:42.352Z] 20:25:42 INFO - sys.exit(main(sys.argv[1:]))
[task 2020-04-15T20:25:42.352Z] 20:25:42 INFO - File "/builds/worker/checkouts/gecko/python/mozbuild/mozbuild/action/jar_maker.py", line 13, in main
[task 2020-04-15T20:25:42.352Z] 20:25:42 INFO - return mozbuild.jar.main(args)
[task 2020-04-15T20:25:42.352Z] 20:25:42 INFO - File "/builds/worker/checkouts/gecko/python/mozbuild/mozbuild/jar.py", line 616, in main
[task 2020-04-15T20:25:42.352Z] 20:25:42 INFO - jm.makeJar(infile, options.d)
[task 2020-04-15T20:25:42.352Z] 20:25:42 INFO - File "/builds/worker/checkouts/gecko/python/mozbuild/mozbuild/jar.py", line 337, in makeJar
[task 2020-04-15T20:25:42.352Z] 20:25:42 INFO - self.processJarSection(info, jardir)
[task 2020-04-15T20:25:42.352Z] 20:25:42 INFO - File "/builds/worker/checkouts/gecko/python/mozbuild/mozbuild/jar.py", line 392, in processJarSection
[task 2020-04-15T20:25:42.352Z] 20:25:42 INFO - self._processEntryLine(e, outHelper, jf)
[task 2020-04-15T20:25:42.352Z] 20:25:42 INFO - File "/builds/worker/checkouts/gecko/python/mozbuild/mozbuild/jar.py", line 464, in _processEntryLine
[task 2020-04-15T20:25:42.352Z] 20:25:42 INFO - ', '.join(src_base)))
[task 2020-04-15T20:25:42.352Z] 20:25:42 INFO - RuntimeError: File "../shared/preferences/containers.css" not found in /builds/worker/checkouts/gecko/browser/themes/windows, /builds/worker/workspace/obj-build/browser/themes/windows
[task 2020-04-15T20:25:42.352Z] 20:25:42 INFO - /builds/worker/checkouts/gecko/config/rules.mk:944: recipe for target 'libs' failed
[task 2020-04-15T20:25:42.352Z] 20:25:42 ERROR - make[4]: *** [libs] Error 1
[task 2020-04-15T20:25:42.352Z] 20:25:42 INFO - make[4]: Leaving directory '/builds/worker/workspace/obj-build/browser/themes/windows'
[task 2020-04-15T20:25:42.353Z] 20:25:42 INFO - /builds/worker/checkouts/gecko/config/recurse.mk:101: recipe for target 'browser/themes/windows/libs' failed
[task 2020-04-15T20:25:42.353Z] 20:25:42 ERROR - make[3]: *** [browser/themes/windows/libs] Error 2
[task 2020-04-15T20:25:42.353Z] 20:25:42 INFO - /builds/worker/checkouts/gecko/config/recurse.mk:32: recipe for target 'libs' failed
[task 2020-04-15T20:25:42.353Z] 20:25:42 ERROR - make[2]: *** [libs] Error 2
[task 2020-04-15T20:25:42.353Z] 20:25:42 INFO - /builds/worker/checkouts/gecko/config/rules.mk:394: recipe for target 'default' failed
[task 2020-04-15T20:25:42.353Z] 20:25:42 ERROR - make[1]: *** [default] Error 2
[task 2020-04-15T20:25:42.353Z] 20:25:42 INFO - client.mk:125: recipe for target 'build' failed
[task 2020-04-15T20:25:42.353Z] 20:25:42 INFO - make: *** [build] Error 2
[task 2020-04-15T20:25:42.353Z] 20:25:42 INFO - 211 compiler warnings present.
[task 2020-04-15T20:25:42.429Z] 20:25:42 INFO - Notification center failed: Install notify-send (usually part of the libnotify package) to get a notification when the build finishes.
[task 2020-04-15T20:25:42.465Z] 20:25:42 ERROR - Return code: 2
[task 2020-04-15T20:25:42.465Z] 20:25:42 WARNING - setting return code to 2

Comment 5

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/fe5f1d556dc6
Rename browser/themes/shared/preferences/containers.css to browser/themes/shared/preferences/containers-dialog.css. r=jaws
https://hg.mozilla.org/integration/autoland/rev/300228102cea
Merge browser/themes/shared/preferences and browser/themes/shared/incontentprefs. r=jaws

Comment 6

[Noemi Erli[:noemi_erli]]

https://hg.mozilla.org/mozilla-central/rev/fe5f1d556dc6
https://hg.mozilla.org/mozilla-central/rev/300228102cea

Comment 7

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/comm-central/rev/3b134efc8be7
Port bug 1630201 - Merge browser/themes/shared/preferences and browser/themes/shared/incontentprefs. rs=bustage-fix