Move GTEST_CPPSRCS to moz.build

RESOLVED FIXED in mozilla25

Status

defect
RESOLVED FIXED
6 years ago
Last year

People

(Reporter: gps, Assigned: bokeefe)

Tracking

(Blocks 1 bug)

Trunk
mozilla25
Dependency tree / graph

Firefox Tracking Flags

(Not tracked)

Details

Attachments

(1 attachment, 3 obsolete attachments)

GTEST_CPPSRCS needs to be moved to moz.build files. This is a new variable and I'd rather nip this one before it buds.
Since there were only the two Makefile.ins, I didn't bother splitting this into two parts. I also moved GTEST_CSRCS and GTEST_CMMSRCS while I was at it, not that they're used anywhere just yet.

This will end up conflicting with the patch for bug 864441, whenever that's ready.

If we do something like in bug 864774 comment 48, it might be worth doing something similar with these variables as well.
Assignee: nobody → bokeefe
Status: NEW → ASSIGNED
Attachment #766461 - Flags: review?(gps)
> This will end up conflicting with the patch for bug 864441, whenever that's
> ready.


Namely, now. I've updated the patch.
Attachment #766461 - Attachment is obsolete: true
Attachment #766461 - Flags: review?(gps)
Attachment #767344 - Flags: review?(gps)
Thanks
Comment on attachment 767344 [details] [diff] [review]
Move GTEST_CPPSRCS, GTEST_CMMSRCS, and GTEST_CSRCS to moz.build files

Review of attachment 767344 [details] [diff] [review]:
-----------------------------------------------------------------

r+ conditional on ensuring js/src/config/rules.mk is in sync with config/rules.mk.

::: js/src/config/rules.mk
@@ +16,5 @@
>  # responsibility between Makefile.in and mozbuild files.
>  _MOZBUILD_EXTERNAL_VARIABLES := \
>    DIRS \
>    EXTRA_PP_COMPONENTS \
> +  GTEST_CPPSRCS \

Unless splinter is lying to me, this file differs from /config/rules.mk and thus will break check-sync-dirs at the top of the build.
Attachment #767344 - Flags: review?(gps) → review+
(In reply to Gregory Szorc [:gps] from comment #4)
> Unless splinter is lying to me, this file differs from /config/rules.mk and
> thus will break check-sync-dirs at the top of the build.

I would manage to forget that.
Attachment #767344 - Attachment is obsolete: true
Attachment #767714 - Flags: review+
Keywords: checkin-needed
> gfx/tests/gtest/moz.build
>if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'windows':
>    GTEST_CPP_SOURCES += [
>        'TestBase.cpp'
>        'TestMoz2D.cpp'
>        'TestPoint.cpp'
>        'TestScaling.cpp'
>    ]

I missed a few commas here, evidently.
Attachment #767714 - Attachment is obsolete: true
Attachment #767799 - Flags: review?(gps)
Attachment #767799 - Flags: review?(gps) → review+
Keywords: checkin-needed
https://hg.mozilla.org/mozilla-central/rev/fca96d317e84
Status: ASSIGNED → RESOLVED
Closed: 6 years ago
Resolution: --- → FIXED
Target Milestone: --- → mozilla25
Will GTEST_CPPSRCS be rejected? Well need to update the GTest page:
https://developer.mozilla.org/en-US/docs/GTest#Adding_a_test_to_the_build_system
(In reply to Benoit Girard (:BenWa) from comment #11)
> Will GTEST_CPPSRCS be rejected? Well need to update the GTest page:
> https://developer.mozilla.org/en-US/docs/
> GTest#Adding_a_test_to_the_build_system

Yes, specifying GTEST_CPPSRCS (or _CSRS or _CMMSRCS) in Makefile.ins is an error now. I updated the GTest page.
Product: Core → Firefox Build System
You need to log in before you can comment on or make changes to this bug.