Closed Bug 737006 Opened 8 years ago Closed 8 years ago

Use internal ply only if needed

Categories

(Firefox Build System :: General, defect)

defect
Not set

Tracking

(Not tracked)

RESOLVED FIXED
mozilla14

People

(Reporter: t.matsuu, Assigned: t.matsuu)

Details

Attachments

(1 file, 3 obsolete files)

In some parts, $(topsrcdir)/other-licenses/ply is hard-coded.
Attached patch Fix (obsolete) — Splinter Review
Attachment #607145 - Flags: review?(khuey)
Comment on attachment 607145 [details] [diff] [review]
Fix

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

Also note that we've added more usage of ply in dom/bindings/Makefile.in. r=me to change those too.

::: config/rules.mk
@@ +1476,5 @@
>  
> +# include internal ply
> +ifndef MOZ_SYSTEM_PLY
> +PLY_INCLUDE=-I$(topsrcdir)/other-licenses/ply
> +endif

Please move this bit to config/config.mk.

::: js/src/config/rules.mk
@@ +1476,5 @@
>  
> +# include internal ply
> +ifndef MOZ_SYSTEM_PLY
> +PLY_INCLUDE=-I$(topsrcdir)/other-licenses/ply
> +endif

Likewise.
Attachment #607145 - Flags: review?(khuey) → review+
Attached patch Fix (v2) (obsolete) — Splinter Review
Addressed review comment.
Carried over r+
Attachment #607145 - Attachment is obsolete: true
Attachment #612184 - Flags: review+
Attachment #612184 - Flags: checkin?
Assignee: nobody → t.matsuu
Keywords: checkin-needed
Attached patch Fix (v3) (obsolete) — Splinter Review
Fit to the latest m-c.
Carry over r+
Attachment #612184 - Attachment is obsolete: true
Attachment #612184 - Flags: checkin?
Attachment #612284 - Flags: review+
Attachment #612284 - Flags: checkin?
Summary: More use system ply → Use internal ply only if needed
Attachment #612284 - Flags: checkin?
Status: NEW → ASSIGNED
remove checkin-needed keyword because of the fix of bug 741248.
https://hg.mozilla.org/mozilla-central/rev/ed9cbe6a817e

I'll update my patch later.
Keywords: checkin-needed
Attached patch Fix (v4)Splinter Review
Fit to the latest m-c.
Carry over r+
Attachment #612284 - Attachment is obsolete: true
Attachment #612857 - Flags: review+
Keywords: checkin-needed
https://hg.mozilla.org/integration/mozilla-inbound/rev/a82e8c2edb29
Flags: in-testsuite-
Keywords: checkin-needed
Target Milestone: --- → mozilla14
https://hg.mozilla.org/mozilla-central/rev/a82e8c2edb29
Status: ASSIGNED → RESOLVED
Closed: 8 years ago
Resolution: --- → FIXED
I reverted the bits of this patch that changed $(PYTHON) $(topsrcdir)/config/pythonpath.py to $(PYTHON_PATH) because they brought bug 741248 back.  All the ply bits are still there though.
(In reply to Kyle Huey [:khuey] (khuey@mozilla.com) from comment #9)
> I reverted the bits of this patch
Thanks.
It's my mistake because of the discussion of bug 741248 in parallel. :-(
Don't worry about it.  I should have caught it during review.
Product: Core → Firefox Build System
You need to log in before you can comment on or make changes to this bug.