I determined parts of the following checkins to mozilla-1.9.1 that should be ported to comm-central: http://hg.mozilla.org/releases/mozilla-1.9.1/rev/7a44dd817b06cb3a3d8a9b6a7291c396ec3c2b3e Bug 471685 - Upgrade to SQLite 3.6.7 This contains the changes to Mozilla code for the upgrade. r=asuth http://hg.mozilla.org/releases/mozilla-1.9.1/rev/94974f18a47c2434432844a18b783cfd82c54654 Bug 469558: --enable-system-lcms build option should be removed.r=bsmedberg,sr=ted,a=vlad http://hg.mozilla.org/releases/mozilla-1.9.1/rev/fe00abb941c0e55409cba4c2fc32a6b20941ddc9 Bug 464190 - GetProcAddress Wince Workaround r=ted a191=beltzner http://hg.mozilla.org/releases/mozilla-1.9.1/rev/10a15c1e6c5735db1f62b845f44f8c3c7c70004b Bug 464088 - Option to build NSS without dbm, non-nss changes r=ted a191=beltzner http://hg.mozilla.org/releases/mozilla-1.9.1/rev/734900e6f341a85cbe0ee046f5b9618df7eab82a Bug 467579 - --with-static-checking is broken in spidermonkey. There is currently no useful static checking infrastructure for spidermonkey, so disable it for the time being, r=jimb a=beltzner (NOTE: bug 460865 and bug 468717 re-enable some analysis for js/src on trunk: they have not yet landed on the 1.9.1 branch) http://hg.mozilla.org/releases/mozilla-1.9.1/rev/21e587bf5cfd337c531c0821f3d0acb507dfe423 Bug 397227 - Reduce the effort needed to write C++ tests. r=ted, a=testonlychange http://hg.mozilla.org/releases/mozilla-1.9.1/rev/f8f3208b2606b191a182f845fd0082687d9c18df Bug 463420 - SIMPLE_PROGRAMS leads to bustage with generated.pdb r=ted a=beltzner http://hg.mozilla.org/releases/mozilla-1.9.1/rev/9ca5b0c60e50c723ca3ffa1b37fc23633b1c7c12 Bug 466492 - test for the existence of jar.mn in make, rather than in a shell script: this allows us to avoid launching the subshell in the common case where a jar.mn is not present r=ted a=beltzner http://hg.mozilla.org/releases/mozilla-1.9.1/rev/27a7287e4809522e398ac61109696cb5bc47237d bug 471188 - stop calling 'make install' for spidermonkey. r=bsmedberg,jimb, a=beltzner http://hg.mozilla.org/releases/mozilla-1.9.1/rev/fa30613a73c1ae1bc885ae18d60930a55bc57b2e bug 467271 - JS not being PGOed on win32. r=bsmedberg, a=blocking191 http://hg.mozilla.org/releases/mozilla-1.9.1/rev/758a1804c9014b549796d55e17dc9235c857a5a8 Bug 466486 - Don't use a subshell to recurse over DIRS when DIRS is empty, r=ted a=beltzner http://hg.mozilla.org/releases/mozilla-1.9.1/rev/e8aaec14e0a4a55658565eb7e391e3e99ec3932a Bug 446300 - move tools/test-harness/xpcshell-simple to testing/xpcshell; (Av1a-MC) Move the source harness directory; r=ted.mielczarek
Oh, wait, I wrongly included bug 446300 in the list, which already has its own patch for porting.
Created attachment 358523 [details] [diff] [review] update c-c build system Here's the patch for porting that batch of changes.
Created attachment 358617 [details] [diff] [review] update c-c build system, v1.1 Sorry, forgot the added file in the first patch
(In reply to comment #0) > http://hg.mozilla.org/releases/mozilla-1.9.1/rev/10a15c1e6c5735db1f62b845f44f8c3c7c70004b > Bug 464088 - Option to build NSS without dbm, non-nss changes r=ted > a191=beltzner This doesn't seem to be included, but I don't think we need this anyway do we? + $(PYTHON) $(MOZILLA_DIR)/config/JarMaker.py \ + $(QUIET) -j $(FINAL_TARGET)/chrome \ + $(MAKE_JARS_FLAGS) $(XULPPFLAGS) $(DEFINES) $(ACDEFINES) \ + $(JAR_MANIFEST); There's a ; on the end here that I think you don't need.
(In reply to comment #4) > (In reply to comment #0) > > http://hg.mozilla.org/releases/mozilla-1.9.1/rev/10a15c1e6c5735db1f62b845f44f8c3c7c70004b > > Bug 464088 - Option to build NSS without dbm, non-nss changes r=ted > > a191=beltzner > > This doesn't seem to be included, but I don't think we need this anyway do we? Right. I did exclude it in my investigations but apparently still wrongly copied it to the list I pasted here. > + $(PYTHON) $(MOZILLA_DIR)/config/JarMaker.py \ > + $(QUIET) -j $(FINAL_TARGET)/chrome \ > + $(MAKE_JARS_FLAGS) $(XULPPFLAGS) $(DEFINES) $(ACDEFINES) \ > + $(JAR_MANIFEST); > > There's a ; on the end here that I think you don't need. Right, will fix this on checkin if no other issues come up.
Comment on attachment 358617 [details] [diff] [review] update c-c build system, v1.1 r=me based mainly on inspection, though I did do a basic test.
Created attachment 359728 [details] [diff] [review] mailnews/imap/test bustage fix Pushed changeset f28e295d14fb to comm-central with r=Standard8 over IRC.