Comment on attachment 8371240 [details] [diff] [review] Port RCFILE and RESFILE to moz.build Review of attachment 8371240 [details] [diff] [review]: ----------------------------------------------------------------- ::: browser/app/moz.build @@ +33,5 @@ > '/xpcom/build', > ] > + > +if CONFIG['OS_ARCH'] == 'OS2': > + RESFILE = 'splashos2.res' Four-space

Comment on attachment 8371240 [details] [diff] [review] Port RCFILE and RESFILE to moz.build Review of attachment 8371240 [details] [diff] [review]: ----------------------------------------------------------------- ::: browser/app/moz.build @@ +33,5 @@ > '/xpcom/build', > ] > + > +if CONFIG['OS_ARCH'] == 'OS2': > + RESFILE = 'splashos2.res' I think we made the decision to unsupport OS/2. I'd just kill this. ::: toolkit/library/moz.build @@ +59,5 @@ > LOCAL_INCLUDES += [ > '/widget/os2', > '/xpcom/base', > ] > + RESFILE = 'xulrunos2.res' Warp this OS/2 stuff out of the build config. ::: xulrunner/app/moz.build @@ +18,5 @@ > if CONFIG['TARGET_XPCOM_ABI']: > DEFINES['TARGET_XPCOM_ABI'] = '"%s"' % CONFIG['TARGET_XPCOM_ABI'] > + > +if CONFIG['OS_ARCH'] == 'OS2': > + RESFILE = 'splashos2.res' More OS/2 foo.

Backed out in https://hg.mozilla.org/integration/mozilla-inbound/rev/8719d47b9a89 for Windows plugin test bustages: https://tbpl.mozilla.org/php/getParsedLog.php?id=34334057&tree=Mozilla-Inbound https://tbpl.mozilla.org/php/getParsedLog.php?id=34334036&tree=Mozilla-Inbound https://tbpl.mozilla.org/php/getParsedLog.php?id=34334067&tree=Mozilla-Inbound

Hmm, I have no idea what could be happening here... Thoughts?

A log before my patch: <https://tbpl.mozilla.org/php/getParsedLog.php?id=34335026&tree=Mozilla-Inbound&full=1> contains the following line: c:\builds\moz2_slave\m-in-w32-000000000000000000000\build\config\rules.mk:1085:0$ rc.exe -r -DNO_NSPR_10_SUPPORT -Ic:/builds/moz2_slave/m-in-w32-000000000000000000000/build/dom/plugins/test/testplugin -I. -I../../../../dist/include -Ic:/builds/moz2_slave/m-in-w32-000000000000000000000/build/obj-firefox/dist/include/nspr -Ic:/builds/moz2_slave/m-in-w32-000000000000000000000/build/obj-firefox/dist/include/nss -Fonptest.res c:/builds/moz2_slave/m-in-w32-000000000000000000000/build/dom/plugins/test/testplugin/nptest.rc That command is gone from the log with my patch: <https://tbpl.mozilla.org/php/getParsedLog.php?id=34335239&tree=Mozilla-Inbound&full=1>. As far as I know I haven't touched the build rules. Aren't pass through variables just directly reflected in the Makefile?

I think the RESFILE and RCFILE variables should be added to http://mxr.mozilla.org/mozilla-central/source/dom/plugins/test/testplugin/testplugin.mozbuild, not http://mxr.mozilla.org/mozilla-central/source/dom/plugins/test/testplugin/moz.build so that they get used when building secondplugin as well. Testing that theory locally.

Yeah, that was it! https://hg.mozilla.org/integration/mozilla-inbound/rev/d7de45815801