Closed
Bug 678161
Opened 13 years ago
Closed 13 years ago
msvc*.dll missing when building with new style jemalloc
Categories
(Firefox Build System :: General, defect)
Tracking
(Not tracked)
RESOLVED
FIXED
mozilla9
People
(Reporter: glandium, Assigned: glandium)
References
Details
(Whiteboard: fixed-in-bs)
Attachments
(1 file, 3 obsolete files)
When building with VC10, the new style jemalloc is used, which requires the CRT to be copied over. http://mxr.mozilla.org/mozilla-central/source/build/win32/Makefile.in#65 prevents that from happening
Assignee | ||
Comment 1•13 years ago
|
||
Attachment #552340 -
Flags: review?(khuey)
Assignee | ||
Comment 2•13 years ago
|
||
Comment on attachment 552340 [details] [diff] [review] Also install msvc*.dll when using new style jemalloc Need some more
Attachment #552340 -
Flags: review?(khuey)
Assignee | ||
Updated•13 years ago
|
Summary: msvc*.dll missing when building with VC10 → msvc*.dll missing when building with new style jemalloc
Assignee | ||
Comment 3•13 years ago
|
||
This takes care of installing the files in the package, and makes the mobile manifest look like the browser one.
Attachment #552377 -
Flags: review?(khuey)
Assignee | ||
Updated•13 years ago
|
Attachment #552340 -
Attachment is obsolete: true
Assignee | ||
Updated•13 years ago
|
Assignee: nobody → mh+mozilla
Assignee | ||
Comment 4•13 years ago
|
||
Comment on attachment 552377 [details] [diff] [review] Also install msvc*.dll when using new style jemalloc the CRT is also missing from the js shell zip.
Attachment #552377 -
Flags: review?(khuey)
Assignee | ||
Comment 5•13 years ago
|
||
Not sure if it's fine to let zip warn about the missing files when not building with WIN32_REDIST_DIR set.
Attachment #554318 -
Flags: review?(khuey)
Assignee | ||
Updated•13 years ago
|
Attachment #552377 -
Attachment is obsolete: true
Comment on attachment 554318 [details] [diff] [review] Also install msvc*.dll when using new style jemalloc Review of attachment 554318 [details] [diff] [review]: ----------------------------------------------------------------- A couple comments ::: browser/installer/removed-files.in @@ +1277,5 @@ > msvcm80.dll > msvcp80.dll > msvcr80.dll > #else > mozcrt19.dll Shouldn't mozcpp19.dll be here too? ::: mobile/installer/package-manifest.in @@ +63,5 @@ > +@BINPATH@/mozcpp19.dll > +#else > +#ifdef MOZ_MEMORY > +@BINPATH@/jemalloc.dll > +#endif Does mobile not need adjustment in removed-files.in? ::: toolkit/mozapps/installer/packager.mk @@ +106,5 @@ > +endif > +ifeq ($(_MSC_VER),1500) > +JSSHELL_BINS += $(DIST)/bin/msvcr100.dll > +endif > +endif Really sucks that we have to duplicate all this gunk here :-(
Attachment #554318 -
Flags: review?(khuey) → review+
Assignee | ||
Comment 7•13 years ago
|
||
(In reply to Kyle Huey [:khuey] (khuey@mozilla.com) from comment #6) > Comment on attachment 554318 [details] [diff] [review] > Also install msvc*.dll when using new style jemalloc > > Review of attachment 554318 [details] [diff] [review]: > ----------------------------------------------------------------- > > A couple comments > > ::: browser/installer/removed-files.in > @@ +1277,5 @@ > > msvcm80.dll > > msvcp80.dll > > msvcr80.dll > > #else > > mozcrt19.dll > > Shouldn't mozcpp19.dll be here too? mozcpp19.dll isn't there anymore. New style jemalloc builds a mozcrt.lib that helps linking jemalloc with the right hacked static portion of the crt, but that's all. mozcpp19.dll is replaced by jemalloc.dll+the CRT dlls > Does mobile not need adjustment in removed-files.in? I was wondering... its removed-files.in is mostly empty. > ::: toolkit/mozapps/installer/packager.mk > @@ +106,5 @@ > > +endif > > +ifeq ($(_MSC_VER),1500) > > +JSSHELL_BINS += $(DIST)/bin/msvcr100.dll > > +endif > > +endif > > Really sucks that we have to duplicate all this gunk here :-( An alternative could be that we set a variable with the list of crt files somewhere in config/config.mk and use that variable to fill the rest.
(In reply to Mike Hommey [:glandium] from comment #7) > (In reply to Kyle Huey [:khuey] (khuey@mozilla.com) from comment #6) > > Comment on attachment 554318 [details] [diff] [review] > > Also install msvc*.dll when using new style jemalloc > > > > Review of attachment 554318 [details] [diff] [review]: > > ----------------------------------------------------------------- > > > > A couple comments > > > > ::: browser/installer/removed-files.in > > @@ +1277,5 @@ > > > msvcm80.dll > > > msvcp80.dll > > > msvcr80.dll > > > #else > > > mozcrt19.dll > > > > Shouldn't mozcpp19.dll be here too? > > mozcpp19.dll isn't there anymore. New style jemalloc builds a mozcrt.lib > that helps linking jemalloc with the right hacked static portion of the crt, > but that's all. mozcpp19.dll is replaced by jemalloc.dll+the CRT dlls Right, I know that (I wrote that code :-) ). I'm asking why mozcpp19.dll isn't in removed-files.in. > > Does mobile not need adjustment in removed-files.in? > > I was wondering... its removed-files.in is mostly empty. I think that's mostly because mobile hasn't been around that long (there's stuff in Firefox's removed-file.in from the ancient days). > > ::: toolkit/mozapps/installer/packager.mk > > @@ +106,5 @@ > > > +endif > > > +ifeq ($(_MSC_VER),1500) > > > +JSSHELL_BINS += $(DIST)/bin/msvcr100.dll > > > +endif > > > +endif > > > > Really sucks that we have to duplicate all this gunk here :-( > > An alternative could be that we set a variable with the list of crt files > somewhere in config/config.mk and use that variable to fill the rest. Perhaps. I wouldn't block this on figuring out what to do here though.
Assignee | ||
Comment 9•13 years ago
|
||
As landing
Assignee | ||
Updated•13 years ago
|
Attachment #554318 -
Attachment is obsolete: true
Assignee | ||
Comment 10•13 years ago
|
||
http://hg.mozilla.org/projects/build-system/rev/9b6e97e91525
Whiteboard: fixed-in-bs
Comment 11•13 years ago
|
||
on toolkit/mozapps/installer/packager.mk, +ifeq ($(_MSC_VER),1500) +JSSHELL_BINS += $(DIST)/bin/msvcr100.dll +endif but, +ifeq ($(_MSC_VER),1600) +JSSHELL_BINS += $(DIST)/bin/msvcr100.dll +endif ?
Assignee | ||
Comment 12•13 years ago
|
||
http://hg.mozilla.org/mozilla-central/rev/9b6e97e91525
Status: NEW → RESOLVED
Closed: 13 years ago
Resolution: --- → FIXED
Target Milestone: --- → mozilla9
Updated•13 years ago
|
Attachment #555090 -
Attachment description: Also install msvc*.dll when using new style jemalloc. → Also install msvc*.dll when using new style jemalloc
[Checked in: Comment 12]
Comment 13•13 years ago
|
||
(In reply to Takeshi Ichimaru from comment #11) > on toolkit/mozapps/installer/packager.mk, Fixed in bug 681893.
Updated•13 years ago
|
Flags: in-testsuite-
Updated•6 years ago
|
Product: Core → Firefox Build System
You need to log in
before you can comment on or make changes to this bug.
Description
•