Contents of /trunk/mozilla-firefox/patches/mozilla-firefox-5.0-cache-build.patch
Parent Directory | Revision Log
Revision 1407 -
(show annotations)
(download)
Mon Jul 11 14:47:30 2011 UTC (13 years, 2 months ago) by niro
File size: 2668 byte(s)
Mon Jul 11 14:47:30 2011 UTC (13 years, 2 months ago) by niro
File size: 2668 byte(s)
-added build fix - see https://bugzilla.mozilla.org/show_bug.cgi?id=633645
1 | # HG changeset patch |
2 | # User Michael Wu <mwu@mozilla.com> |
3 | # Parent 4d0e9de89591f6494d80b28a82aa360cf2638ff2 |
4 | Bug 633645 - Add startup cache to omnijar during make package, r= a= try: -b o -p macosx,macosx64 -u all -t none |
5 | |
6 | |
7 | diff -up firefox-5.0/mozilla-release/browser/installer/Makefile.in.cache firefox-5.0/mozilla-release/browser/installer/Makefile.in |
8 | --- firefox-5.0/mozilla-release/browser/installer/Makefile.in.cache 2011-06-15 23:57:18.000000000 +0200 |
9 | +++ firefox-5.0/mozilla-release/browser/installer/Makefile.in 2011-06-21 16:28:07.513443952 +0200 |
10 | @@ -117,20 +119,6 @@ ifndef LIBXUL_SDK |
11 | INSTALL_SDK = 1 |
12 | endif |
13 | |
14 | -ifneq (1_,$(if $(CROSS_COMPILE),1,0)_$(UNIVERSAL_BINARY)) |
15 | -ifdef RUN_TEST_PROGRAM |
16 | -_ABS_RUN_TEST_PROGRAM = $(call core_abspath,$(RUN_TEST_PROGRAM)) |
17 | -endif |
18 | - |
19 | -GENERATE_CACHE = \ |
20 | - $(_ABS_RUN_TEST_PROGRAM) $(_ABS_DIST)/bin/xpcshell$(BIN_SUFFIX) -g "$$PWD" -f $(topsrcdir)/browser/installer/precompile_cache.js -e 'populate_startupcache("omni.jar", "startupCache.zip");' && \ |
21 | - rm -rf jsloader && \ |
22 | - $(UNZIP) startupCache.zip && \ |
23 | - rm startupCache.zip && \ |
24 | - find jsloader | xargs touch -t 201001010000 && \ |
25 | - $(ZIP) -r9mX omni.jar jsloader |
26 | -endif |
27 | - |
28 | include $(topsrcdir)/toolkit/mozapps/installer/packager.mk |
29 | |
30 | ifeq (bundle, $(MOZ_FS_LAYOUT)) |
31 | diff -up firefox-5.0/mozilla-release/browser/installer/package-manifest.in.cache firefox-5.0/mozilla-release/browser/installer/package-manifest.in |
32 | --- firefox-5.0/mozilla-release/browser/installer/package-manifest.in.cache 2011-06-15 23:58:10.000000000 +0200 |
33 | +++ firefox-5.0/mozilla-release/browser/installer/package-manifest.in 2011-06-21 16:27:14.003407707 +0200 |
34 | @@ -88,6 +88,7 @@ |
35 | |
36 | [browser] |
37 | ; [Base Browser Files] |
38 | +@BINPATH@/jsloader/ |
39 | #ifndef XP_UNIX |
40 | @BINPATH@/@MOZ_APP_NAME@.exe |
41 | #else |
42 | diff -up firefox-5.0/mozilla-release/toolkit/mozapps/installer/packager.mk.cache firefox-5.0/mozilla-release/toolkit/mozapps/installer/packager.mk |
43 | --- firefox-5.0/mozilla-release/toolkit/mozapps/installer/packager.mk.cache 2011-06-15 23:58:10.000000000 +0200 |
44 | +++ firefox-5.0/mozilla-release/toolkit/mozapps/installer/packager.mk 2011-06-21 16:28:29.785042798 +0200 |
45 | @@ -380,7 +380,6 @@ MAKE_SDK = $(CREATE_FINAL_TAR) - $(MOZ_A |
46 | endif |
47 | |
48 | ifdef MOZ_OMNIJAR |
49 | -GENERATE_CACHE ?= true |
50 | |
51 | OMNIJAR_FILES = \ |
52 | chrome \ |
53 | @@ -409,7 +408,6 @@ PACK_OMNIJAR = \ |
54 | mv components.manifest components && \ |
55 | find . | xargs touch -t 201001010000 && \ |
56 | zip -r9mX omni.jar $(OMNIJAR_FILES) -x $(NON_OMNIJAR_FILES) && \ |
57 | - $(GENERATE_CACHE) && \ |
58 | $(OPTIMIZE_JARS_CMD) --optimize $(_ABS_DIST)/jarlog/ ./ ./ && \ |
59 | mv binary.manifest components && \ |
60 | printf "manifest components/binary.manifest\n" > chrome.manifest |