Closed Bug 968642 Opened 6 years ago Closed 6 years ago

Port RCFILE and RESFILE to moz.build

Categories

(Firefox Build System :: General, defect)

x86
macOS
defect
Not set

Tracking

(Not tracked)

RESOLVED FIXED
mozilla30

People

(Reporter: ehsan, Assigned: ehsan)

References

Details

Attachments

(1 file, 1 obsolete file)

No description provided.
Attachment #8371240 - Flags: review?(mh+mozilla)
Attachment #8371240 - Flags: review?(gps)
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.
Attachment #8371240 - Flags: review?(mh+mozilla)
Attachment #8371240 - Flags: review?(gps)
Attachment #8371240 - Flags: review+
Attachment #8371240 - Attachment is obsolete: true
Keywords: checkin-needed
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?
Flags: needinfo?(mh+mozilla)
Flags: needinfo?(gps)
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
Flags: needinfo?(mh+mozilla)
Flags: needinfo?(gps)
https://hg.mozilla.org/mozilla-central/rev/d7de45815801
Status: NEW → RESOLVED
Closed: 6 years ago
Resolution: --- → FIXED
Target Milestone: --- → mozilla30
Product: Core → Firefox Build System
You need to log in before you can comment on or make changes to this bug.