Closed Bug 926043 Opened 11 years ago Closed 11 years ago

Port build system changes from Bug 585016 and Bug 924615 to comm-central

Categories

(MailNews Core :: Build Config, defect)

defect
Not set
blocker

Tracking

(seamonkey2.24 fixed)

RESOLVED FIXED
Thunderbird 27.0
Tracking Status
seamonkey2.24 --- fixed

People

(Reporter: mcsmurf, Assigned: mcsmurf)

References

Details

Attachments

(1 file, 1 obsolete file)

Bug 585016 changed a few things in the build system, a few changed need to be ported to the comm-central build system as (for example) a SeaMonkey clobber build currently fails with: 2:32.31 c:/mozilla/tree-hg/comm-central/obj-i686-pc-mingw32/mozilla/_virtualenv /Scripts/python.exe: can't open file 'c:/mozilla/tree-hg/comm-central/mozilla/co nfig/buildlist.py': [Errno 2] No such file or directory 2:32.31 c:\mozilla\tree-hg\comm-central\config\rules.mk:638:0: command 'c:/mozi lla/tree-hg/comm-central/obj-i686-pc-mingw32/mozilla/_virtualenv/Scripts/python. exe c:/mozilla/tree-hg/comm-central/mozilla/config/buildlist.py ../../../mozilla /config/final-link-libs mozldap' failed, return code 2
Severity: normal → blocker
Depends on: 585016
OS: Windows 8 → All
Hardware: x86_64 → All
Attached patch Patch? (obsolete) (deleted) — Splinter Review
Not sure if this will fix it/do the right thing, still need to test this. I'll just leave it here for now.
JarMaker.py was also changed (see Bug 924615).
Depends on: 924615
Summary: Port build system changes from Bug 585016 to comm-central → Port build system changes from Bug 585016 and Bug 924615 to comm-central
Attached patch Patch (deleted) — Splinter Review
This also should fix the JarMaker.py issue. Patch is currently tested on TB try (ignore the two other patches in that test run, those are suite/ only patches).
Attachment #816222 - Attachment is obsolete: true
Comment on attachment 816232 [details] [diff] [review] Patch The buildlist changes worked for me locally, but I haven't pulled the m-c JarMaker changeset yet.
The patch works for me. Now the build continues up to /home/hafi/moz-work/src/suite/profile/migration/src/nsNetscapeProfileMigratorBase.cpp: In member function ‘nsresult nsNetscapeProfileMigratorBase::CopyPasswords(bool)’: /home/hafi/moz-work/src/suite/profile/migration/src/nsNetscapeProfileMigratorBase.cpp:663:59: error: no matching function for call to ‘nsILoginManagerStorage::InitWithFile(nsCOMPtr<nsIFile>&, std::nullptr_t)’ /home/hafi/moz-work/src/suite/profile/migration/src/nsNetscapeProfileMigratorBase.cpp:663:59: note: candidate is: ../../../../mozilla/dist/include/nsILoginManagerStorage.h:40:60: note: virtual nsresult nsILoginManagerStorage::InitWithFile(nsIFile*) ../../../../mozilla/dist/include/nsILoginManagerStorage.h:40:60: note: candidate expects 1 argument, 2 provided /home/hafi/moz-work/src/suite/profile/migration/src/nsNetscapeProfileMigratorBase.cpp:664:1: error: control reaches end of non-void function [-Werror=return-type] cc1plus: some warnings being treated as errors make[8]: *** [nsNetscapeProfileMigratorBase.o] Error 1
That's bug 925803.
Comment on attachment 816232 [details] [diff] [review] Patch Patch works fine locally and on try (https://tbpl.mozilla.org/?tree=Thunderbird-Try&rev=d427657222a4), the test failures are from the removal of the signons.txt import functionality as far as I see this.
Attachment #816232 - Flags: review?(Pidgeot18)
Attachment #816232 - Flags: review?(Pidgeot18) → review+
Assignee: nobody → bugzilla
Status: NEW → RESOLVED
Closed: 11 years ago
Resolution: --- → FIXED
Target Milestone: --- → Thunderbird 27.0
Depends on: 926278
You need to log in before you can comment on or make changes to this bug.

Attachment

General

Created:
Updated:
Size: