Closed Bug 415330 Opened 12 years ago Closed 12 years ago

XPInstall leftovers in packages files

Categories

(Firefox Build System :: General, defect, P2, minor)

Tracking

(Not tracked)

RESOLVED FIXED

People

(Reporter: philor, Assigned: philor)

References

()

Details

Attachments

(1 file, 1 obsolete file)

Attached patch Fix v.1 (obsolete) — Splinter Review
Along the way to removing a ton of unloved bits of xpinstall, bug 406807 removed cmessage.txt, and everything that made xpicleanup(.exe), but didn't remove them from the various packages-static files (so they'll be spewing warnings at Build while they've got better things to worry about, and are already spewing in tinderbox logs) or add them to the removed-files.ins so they'll really go away.
Attachment #300995 - Flags: review?(ted.mielczarek)
Comment on attachment 300995 [details] [diff] [review]
Fix v.1

Wups, I missed xpistub.dll, since I foolishly looked at Fx build logs, where I foolishly hid it away in the else of an ifdef MOZ_ENABLE_LIBXUL
Attachment #300995 - Attachment is obsolete: true
Attachment #300995 - Flags: review?(ted.mielczarek)
Attached patch Fix v.2Splinter Review
Thusly: don't package (lib)xpistub.(dll|so), cmessage.txt, or xpicleanup(.exe) anywhere; remove them all everywhere; take cmessage.txt out of Tbird's NO_PKG_FILES because that confuses rsync mightily; remove nsScriptableIO.js for Tbird since it was being accidentally packaged for non-Windows (or accidentally not-packaged for Windows, depending on which way you think about it).
Attachment #301217 - Flags: review?(ted.mielczarek)
And while the package warnings are just annoyances, given our history of crashing in un-removed-files things, that part is probably a blocker.
Flags: blocking1.9?
Comment on attachment 301217 [details] [diff] [review]
Fix v.2

>Index: browser/installer/removed-files.in
>===================================================================
>-@DLL_PREFIX@xpistub@DLL_SUFFIX@
>-components/@DLL_PREFIX@jar50@DLL_SUFFIX@

Did you really mean to remove these two lines?

r=me otherwise.
Attachment #301217 - Flags: review?(ted.mielczarek) → review+
I did indeed mean to remove those (didn't I?). The first one is where we were removing xpistub.dll only ifdef MOZ_ENABLE_LIBXUL, but now that it's gone no matter what, we want it outside the ifdef, the second is where we hated jar50.dll so much that we removed it twice:

 #ifdef MOZ_ENABLE_LIBXUL
 components/@DLL_PREFIX@jar50@DLL_SUFFIX@
 #ifdef XP_WIN
 #else
 #endif
 components/@DLL_PREFIX@jar50@DLL_SUFFIX@
 #else
Ah, I missed that.
Attachment #301217 - Flags: approval1.9?
Flags: blocking1.9? → blocking1.9+
Priority: -- → P2
Attachment #301217 - Flags: approval1.9?
browser/installer/unix/packages-static 1.152
browser/installer/windows/packages-static 1.153
browser/installer/removed-files.in 1.34
mail/installer/windows/packages-static 1.81
mail/installer/removed-files.in 1.38
mail/installer/Makefile.in 1.23
suite/installer/unix/packages 1.12
suite/installer/windows/packages 1.48
suite/installer/removed-files.in 1.17
Status: ASSIGNED → RESOLVED
Closed: 12 years ago
Flags: in-testsuite-
Resolution: --- → FIXED
Blocks: 417457
Product: Core → Firefox Build System
You need to log in before you can comment on or make changes to this bug.