Closed Bug 904831 Opened 6 years ago Closed 6 years ago

Move MSVC_ENABLE_PGO into moz.build

Categories

(Firefox Build System :: General, defect)

defect
Not set

Tracking

(Not tracked)

RESOLVED FIXED
mozilla26

People

(Reporter: gps, Assigned: Ms2ger)

References

(Blocks 1 open bug)

Details

Attachments

(4 files)

MSVC_ENABLE_PGO is currently the 8th most frequently used variable yet to be ported to moz.build files.
And since it's checked in config.mk, you'll need to make sure config.mk isn't included before rules.mk in the makefile, right?
Assignee: nobody → Ms2ger
Attached patch Part a: logicSplinter Review
Attachment #792090 - Flags: review?(gps)
Attachment #792100 - Flags: review?(joey)
Attachment #792101 - Flags: review?(mshal)
Attachment #792103 - Flags: review?(khuey)
Comment on attachment 792100 [details] [diff] [review]
Part b: automated moves

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

Patch will not import cleanly

% hg qimport ~/MSVC_ENABLE_PGO-auto 
adding MSVC_ENABLE_PGO-auto to series file

% hg qpush -a
applying MSVC_ENABLE_PGO-auto
patching file caps/src/Makefile.in
Hunk #1 FAILED at 4
1 out of 1 hunks FAILED -- saving rejects to file caps/src/Makefile.in.rej
patching file caps/src/moz.build
Hunk #1 FAILED at 14
1 out of 1 hunks FAILED -- saving rejects to file caps/src/moz.build.rej
patching file chrome/src/Makefile.in
Hunk #1 FAILED at 5
1 out of 1 hunks FAILED -- saving rejects to file chrome/src/Makefile.in.rej
patching file chrome/src/moz.build
Hunk #1 FAILED at 13
1 out of 1 hunks FAILED -- saving rejects to file chrome/src/moz.build.rej
Attachment #792100 - Flags: review?(joey) → review-
Comment on attachment 792100 [details] [diff] [review]
Part b: automated moves

Well, yes, there's 30 patches below it. You can get them from try: https://tbpl.mozilla.org/?tree=Try&rev=95e9f75cd8e6
Attachment #792100 - Flags: review- → review?(joey)
Attachment #792090 - Flags: review?(gps) → review+
(In reply to :Ms2ger from comment #8)
> Comment on attachment 792100 [details] [diff] [review]
> Part b: automated moves
> 
> Well, yes, there's 30 patches below it. You can get them from try:
> https://tbpl.mozilla.org/?tree=Try&rev=95e9f75cd8e6

If patches do not apply cleanly that will inhibit being able to run command line scripts to screen for problems.  Also the request was a single patch not 30, applying them all will make it more difficult to review just the requested patch content.
Comment on attachment 792101 [details] [diff] [review]
Part c: manual moves

>diff --git a/netwerk/dns/Makefile.in b/netwerk/dns/Makefile.in
>--- a/netwerk/dns/Makefile.in
>+++ b/netwerk/dns/Makefile.in
>@@ -5,16 +5,17 @@
> 
> DEPTH     = @DEPTH@
> topsrcdir = @top_srcdir@
> srcdir    = @srcdir@
> VPATH     = @srcdir@
> 
> include $(DEPTH)/config/autoconf.mk
> 
>+# need to include etld_data.inc

Would be nice if mozbuild-migrate would get the comments above the variable rather than below it, but I don't see an easy way to do that with the pymake structures :/. Maybe I'm missing something...
Attachment #792101 - Flags: review?(mshal) → review+
Comment on attachment 792100 [details] [diff] [review]
Part b: automated moves

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

Didn't see any obvious issues with this automated migration.
Attachment #792100 - Flags: review?(joey) → review+
Product: Core → Firefox Build System
You need to log in before you can comment on or make changes to this bug.