Closed Bug 743560 Opened 8 years ago Closed 8 years ago

Building Firefox on top of xulrunner failed after d36aeec1abe1 in m-c

Categories

(Firefox Build System :: General, defect)

defect
Not set

Tracking

(Not tracked)

RESOLVED FIXED
mozilla14

People

(Reporter: t.matsuu, Assigned: benjamin)

References

Details

Attachments

(2 files)

Changeset d36aeec1abe1 in m-c (bug 734975) breaks building Firefox on top of xulrunner.

https://hg.mozilla.org/mozilla-central/rev/d36aeec1abe1

run-mozilla.sh and xpcshell commands are referred as $(LIBXUL_DIST)/bin/run-mozilla.sh and $(LIBXUL_DIST)/bin/xpcshell$(BIN_SUFFIX) in some places in m-c respectively.
Blocks: 734975
Files using $(LIBXUL_DIST)/bin/run-mozilla.sh:
https://mxr.mozilla.org/mozilla-central/search?string=%28LIBXUL_DIST%29%2Fbin%2Frun-mozilla.sh&find=&findi=&filter=^[^\0]*%24&hitlimit=&tree=mozilla-central

We also may need to fix $(topsrcdir)/build/os2/test_os2.cmd "$(LIBXUL_DIST)" for OS/2:
https://mxr.mozilla.org/mozilla-central/search?string=test_os2.cmd+%22%24%28LIBXUL_DIST%29&find=&findi=&filter=^[^\0]*%24&hitlimit=&tree=mozilla-central

Files using $(LIBXUL_DIST)/bin/xpcshell$(BIN_SUFFIX):
https://mxr.mozilla.org/mozilla-central/search?string=%28LIBXUL_DIST%29%2Fbin%2Fxpcshell&find=&findi=&filter=^[^\0]*%24&hitlimit=&tree=mozilla-central
Summary: Build failed after d36aeec1abe1 in m-c → Building Firefox on top of xulrunner failed after d36aeec1abe1 in m-c
Or we could just go back to shipping those files, I didn't think they would be needed in the xulrunner runtime itself which is why I removed them.
(In reply to Dave Townsend (:Mossop) from comment #2)
> Or we could just go back to shipping those files

It would make me happy.
Can you make a patch?
Backing out NO_PKG_FILES.
Attachment #613253 - Flags: review?(benjamin)
Comment on attachment 613253 [details] [diff] [review]
Pack xpcshell and run-mozilla.sh again.

These files (xpcshell and run-mozilla) should be packaged in the *SDK* but not in the binary package. Is this makefile being used to package both of these?
xpcshell is installed to dist/bin by js/xpconnect/shell/Makefile.
run-mozilla.sh is installed to dist/bin by build/unix/Makefile.
Yes, that's not what I'm asking. We are *intentionally* removing these files from the XULRunner binary package, but we should not be removing them from the SDK package. Is this instance of NO_PKG_FILES removing them from the SDK package by accident? If so, can we fix this so that they continue to be properly removed from the non-SDK package?
(In reply to Benjamin Smedberg  [:bsmedberg] from comment #7)
> Is this instance of NO_PKG_FILES removing them from the SDK
> package by accident?

No.
xpcshell and run-mozilla.sh are installed to dist/bin as mentioned in comment #6. This means they are never installed to dist/sdk/bin and bundled only as a part of binary package.

So I suppose we need to fix here that
1) xpcshell and run-mozilla.sh should be installed to sdk/bin
2) set $(LIBXUL_DIST)/sdk instead of $(LIBXUL_DIST) for files mentioned in comment #1.

Is this right?
no. there is no such thing as dist/sdk/bin (I think!). Instead the sdk/bin is the same as dist/bin (in general). I'm going to attach a patch which I *think* does the right thing, but I'll need you to test it.
Attachment #613696 - Flags: feedback?(t.matsuu)
Attachment #613253 - Flags: review?(benjamin) → review-
(In reply to Benjamin Smedberg  [:bsmedberg] from comment #10)
> Created attachment 613696 [details] [diff] [review]
> Package in the SDK, not in the binary, rev. 1

Works fine!
Thanks.
Attachment #613696 - Flags: feedback?(t.matsuu) → feedback+
https://hg.mozilla.org/integration/mozilla-inbound/rev/3f872c75a08c
Assignee: nobody → benjamin
Status: NEW → ASSIGNED
Target Milestone: --- → mozilla14
https://hg.mozilla.org/mozilla-central/rev/3f872c75a08c
Status: ASSIGNED → RESOLVED
Closed: 8 years ago
Resolution: --- → FIXED
Depends on: 749573
Depends on: 756786
Product: Core → Firefox Build System
You need to log in before you can comment on or make changes to this bug.