| author | Wolfgang Rosenauer <wr@rosenauer.org> |
| Wed, 25 Aug 2010 08:00:07 +0200 | |
| changeset 140 | c5e051ab6cb8 |
| child 142 | d6fa6dc539c1 |
| permissions | -rw-r--r-- |
|
140
c5e051ab6cb8
install sync components with Firefox-on-xulrunner builds (bmo#590411)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1 |
# HG changeset patch |
|
c5e051ab6cb8
install sync components with Firefox-on-xulrunner builds (bmo#590411)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2 |
# Parent 0603e401d941cbfaa6dea050149bb5309ff4b5a0 |
|
c5e051ab6cb8
install sync components with Firefox-on-xulrunner builds (bmo#590411)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
3 |
Bug 590411 - Sync/Weave is not included if FF is built against libxul sdk |
|
c5e051ab6cb8
install sync components with Firefox-on-xulrunner builds (bmo#590411)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
4 |
|
|
c5e051ab6cb8
install sync components with Firefox-on-xulrunner builds (bmo#590411)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
5 |
diff --git a/browser/build.mk b/browser/build.mk |
|
c5e051ab6cb8
install sync components with Firefox-on-xulrunner builds (bmo#590411)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
6 |
--- a/browser/build.mk |
|
c5e051ab6cb8
install sync components with Firefox-on-xulrunner builds (bmo#590411)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
7 |
+++ b/browser/build.mk |
|
c5e051ab6cb8
install sync components with Firefox-on-xulrunner builds (bmo#590411)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
8 |
@@ -40,16 +40,21 @@ include $(topsrcdir)/toolkit/toolkit-tie |
|
c5e051ab6cb8
install sync components with Firefox-on-xulrunner builds (bmo#590411)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
9 |
endif |
|
c5e051ab6cb8
install sync components with Firefox-on-xulrunner builds (bmo#590411)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
10 |
|
|
c5e051ab6cb8
install sync components with Firefox-on-xulrunner builds (bmo#590411)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
11 |
TIERS += app |
|
c5e051ab6cb8
install sync components with Firefox-on-xulrunner builds (bmo#590411)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
12 |
|
|
c5e051ab6cb8
install sync components with Firefox-on-xulrunner builds (bmo#590411)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
13 |
ifdef MOZ_EXTENSIONS |
|
c5e051ab6cb8
install sync components with Firefox-on-xulrunner builds (bmo#590411)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
14 |
tier_app_dirs += extensions |
|
c5e051ab6cb8
install sync components with Firefox-on-xulrunner builds (bmo#590411)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
15 |
endif |
|
c5e051ab6cb8
install sync components with Firefox-on-xulrunner builds (bmo#590411)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
16 |
|
|
c5e051ab6cb8
install sync components with Firefox-on-xulrunner builds (bmo#590411)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
17 |
+ifdef MOZ_SERVICES_SYNC |
|
c5e051ab6cb8
install sync components with Firefox-on-xulrunner builds (bmo#590411)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
18 |
+tier_app_dirs += services/crypto |
|
c5e051ab6cb8
install sync components with Firefox-on-xulrunner builds (bmo#590411)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
19 |
+tier_app_dirs += services/sync |
|
c5e051ab6cb8
install sync components with Firefox-on-xulrunner builds (bmo#590411)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
20 |
+endif |
|
c5e051ab6cb8
install sync components with Firefox-on-xulrunner builds (bmo#590411)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
21 |
+ |
|
c5e051ab6cb8
install sync components with Firefox-on-xulrunner builds (bmo#590411)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
22 |
tier_app_dirs += $(MOZ_BRANDING_DIRECTORY) |
|
c5e051ab6cb8
install sync components with Firefox-on-xulrunner builds (bmo#590411)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
23 |
|
|
c5e051ab6cb8
install sync components with Firefox-on-xulrunner builds (bmo#590411)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
24 |
tier_app_dirs += browser |
|
c5e051ab6cb8
install sync components with Firefox-on-xulrunner builds (bmo#590411)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
25 |
|
|
c5e051ab6cb8
install sync components with Firefox-on-xulrunner builds (bmo#590411)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
26 |
installer: |
|
c5e051ab6cb8
install sync components with Firefox-on-xulrunner builds (bmo#590411)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
27 |
@$(MAKE) -C browser/installer installer |
|
c5e051ab6cb8
install sync components with Firefox-on-xulrunner builds (bmo#590411)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
28 |
|
|
c5e051ab6cb8
install sync components with Firefox-on-xulrunner builds (bmo#590411)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
29 |
package: |
|
c5e051ab6cb8
install sync components with Firefox-on-xulrunner builds (bmo#590411)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
30 |
diff --git a/toolkit/toolkit-tiers.mk b/toolkit/toolkit-tiers.mk |
|
c5e051ab6cb8
install sync components with Firefox-on-xulrunner builds (bmo#590411)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
31 |
--- a/toolkit/toolkit-tiers.mk |
|
c5e051ab6cb8
install sync components with Firefox-on-xulrunner builds (bmo#590411)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
32 |
+++ b/toolkit/toolkit-tiers.mk |
|
c5e051ab6cb8
install sync components with Firefox-on-xulrunner builds (bmo#590411)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
33 |
@@ -266,19 +266,14 @@ endif |
|
c5e051ab6cb8
install sync components with Firefox-on-xulrunner builds (bmo#590411)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
34 |
ifdef MOZ_LEAKY |
|
c5e051ab6cb8
install sync components with Firefox-on-xulrunner builds (bmo#590411)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
35 |
tier_platform_dirs += tools/leaky |
|
c5e051ab6cb8
install sync components with Firefox-on-xulrunner builds (bmo#590411)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
36 |
endif |
|
c5e051ab6cb8
install sync components with Firefox-on-xulrunner builds (bmo#590411)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
37 |
|
|
c5e051ab6cb8
install sync components with Firefox-on-xulrunner builds (bmo#590411)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
38 |
ifdef MOZ_MAPINFO |
|
c5e051ab6cb8
install sync components with Firefox-on-xulrunner builds (bmo#590411)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
39 |
tier_platform_dirs += tools/codesighs |
|
c5e051ab6cb8
install sync components with Firefox-on-xulrunner builds (bmo#590411)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
40 |
endif |
|
c5e051ab6cb8
install sync components with Firefox-on-xulrunner builds (bmo#590411)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
41 |
|
|
c5e051ab6cb8
install sync components with Firefox-on-xulrunner builds (bmo#590411)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
42 |
-ifdef MOZ_SERVICES_SYNC |
|
c5e051ab6cb8
install sync components with Firefox-on-xulrunner builds (bmo#590411)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
43 |
-tier_platform_dirs += services/crypto |
|
c5e051ab6cb8
install sync components with Firefox-on-xulrunner builds (bmo#590411)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
44 |
-tier_platform_dirs += services/sync |
|
c5e051ab6cb8
install sync components with Firefox-on-xulrunner builds (bmo#590411)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
45 |
-endif |
|
c5e051ab6cb8
install sync components with Firefox-on-xulrunner builds (bmo#590411)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
46 |
- |
|
c5e051ab6cb8
install sync components with Firefox-on-xulrunner builds (bmo#590411)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
47 |
ifdef ENABLE_TESTS |
|
c5e051ab6cb8
install sync components with Firefox-on-xulrunner builds (bmo#590411)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
48 |
tier_platform_dirs += testing/mochitest |
|
c5e051ab6cb8
install sync components with Firefox-on-xulrunner builds (bmo#590411)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
49 |
tier_platform_dirs += testing/xpcshell |
|
c5e051ab6cb8
install sync components with Firefox-on-xulrunner builds (bmo#590411)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
50 |
tier_platform_dirs += testing/mozmill |
|
c5e051ab6cb8
install sync components with Firefox-on-xulrunner builds (bmo#590411)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
51 |
endif |
|
c5e051ab6cb8
install sync components with Firefox-on-xulrunner builds (bmo#590411)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
52 |