author | Wolfgang Rosenauer <wr@rosenauer.org> |
Tue, 05 Oct 2010 08:31:35 +0200 | |
changeset 170 | b688db617cb7 |
parent 153 | 46ee28dc7145 |
child 173 | f91727efd845 |
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 |
153 | 2 |
# Parent d7f423a91ae943643510a03fd2cb0360423e014f |
140
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: |
142
d6fa6dc539c1
Removed GRE reference for Firefox Sync
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
140
diff
changeset
|
30 |
diff --git a/services/sync/Weave.js b/services/sync/Weave.js |
d6fa6dc539c1
Removed GRE reference for Firefox Sync
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
140
diff
changeset
|
31 |
--- a/services/sync/Weave.js |
d6fa6dc539c1
Removed GRE reference for Firefox Sync
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
140
diff
changeset
|
32 |
+++ b/services/sync/Weave.js |
d6fa6dc539c1
Removed GRE reference for Firefox Sync
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
140
diff
changeset
|
33 |
@@ -76,17 +76,17 @@ WeaveService.prototype = { |
d6fa6dc539c1
Removed GRE reference for Firefox Sync
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
140
diff
changeset
|
34 |
.getService(Ci.nsIIOService); |
d6fa6dc539c1
Removed GRE reference for Firefox Sync
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
140
diff
changeset
|
35 |
let resProt = ioService.getProtocolHandler("resource") |
d6fa6dc539c1
Removed GRE reference for Firefox Sync
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
140
diff
changeset
|
36 |
.QueryInterface(Ci.nsIResProtocolHandler); |
d6fa6dc539c1
Removed GRE reference for Firefox Sync
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
140
diff
changeset
|
37 |
|
d6fa6dc539c1
Removed GRE reference for Firefox Sync
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
140
diff
changeset
|
38 |
// Only create alias if resource://services-sync doesn't already exist. |
d6fa6dc539c1
Removed GRE reference for Firefox Sync
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
140
diff
changeset
|
39 |
if (resProt.hasSubstitution("services-sync")) |
d6fa6dc539c1
Removed GRE reference for Firefox Sync
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
140
diff
changeset
|
40 |
return; |
d6fa6dc539c1
Removed GRE reference for Firefox Sync
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
140
diff
changeset
|
41 |
|
d6fa6dc539c1
Removed GRE reference for Firefox Sync
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
140
diff
changeset
|
42 |
- let uri = ioService.newURI("resource://gre/modules/services-sync/", |
144
c77d3787a02d
Fix integration of Sync (non-GRE)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
142
diff
changeset
|
43 |
+ let uri = ioService.newURI("resource:///modules/services-sync/", |
142
d6fa6dc539c1
Removed GRE reference for Firefox Sync
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
140
diff
changeset
|
44 |
null, null); |
d6fa6dc539c1
Removed GRE reference for Firefox Sync
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
140
diff
changeset
|
45 |
resProt.setSubstitution("services-sync", uri); |
d6fa6dc539c1
Removed GRE reference for Firefox Sync
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
140
diff
changeset
|
46 |
} |
d6fa6dc539c1
Removed GRE reference for Firefox Sync
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
140
diff
changeset
|
47 |
}; |
d6fa6dc539c1
Removed GRE reference for Firefox Sync
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
140
diff
changeset
|
48 |
|
d6fa6dc539c1
Removed GRE reference for Firefox Sync
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
140
diff
changeset
|
49 |
function AboutWeaveLog() {} |
d6fa6dc539c1
Removed GRE reference for Firefox Sync
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
140
diff
changeset
|
50 |
AboutWeaveLog.prototype = { |
d6fa6dc539c1
Removed GRE reference for Firefox Sync
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
140
diff
changeset
|
51 |
classID: Components.ID("{d28f8a0b-95da-48f4-b712-caf37097be41}"), |
140
c5e051ab6cb8
install sync components with Firefox-on-xulrunner builds (bmo#590411)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
52 |
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
|
53 |
--- a/toolkit/toolkit-tiers.mk |
c5e051ab6cb8
install sync components with Firefox-on-xulrunner builds (bmo#590411)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
54 |
+++ b/toolkit/toolkit-tiers.mk |
153 | 55 |
@@ -270,20 +270,15 @@ endif |
140
c5e051ab6cb8
install sync components with Firefox-on-xulrunner builds (bmo#590411)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
56 |
ifdef MOZ_LEAKY |
c5e051ab6cb8
install sync components with Firefox-on-xulrunner builds (bmo#590411)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
57 |
tier_platform_dirs += tools/leaky |
c5e051ab6cb8
install sync components with Firefox-on-xulrunner builds (bmo#590411)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
58 |
endif |
c5e051ab6cb8
install sync components with Firefox-on-xulrunner builds (bmo#590411)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
59 |
|
c5e051ab6cb8
install sync components with Firefox-on-xulrunner builds (bmo#590411)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
60 |
ifdef MOZ_MAPINFO |
c5e051ab6cb8
install sync components with Firefox-on-xulrunner builds (bmo#590411)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
61 |
tier_platform_dirs += tools/codesighs |
c5e051ab6cb8
install sync components with Firefox-on-xulrunner builds (bmo#590411)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
62 |
endif |
c5e051ab6cb8
install sync components with Firefox-on-xulrunner builds (bmo#590411)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
63 |
|
c5e051ab6cb8
install sync components with Firefox-on-xulrunner builds (bmo#590411)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
64 |
-ifdef MOZ_SERVICES_SYNC |
c5e051ab6cb8
install sync components with Firefox-on-xulrunner builds (bmo#590411)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
65 |
-tier_platform_dirs += services/crypto |
c5e051ab6cb8
install sync components with Firefox-on-xulrunner builds (bmo#590411)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
66 |
-tier_platform_dirs += services/sync |
c5e051ab6cb8
install sync components with Firefox-on-xulrunner builds (bmo#590411)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
67 |
-endif |
c5e051ab6cb8
install sync components with Firefox-on-xulrunner builds (bmo#590411)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
68 |
- |
c5e051ab6cb8
install sync components with Firefox-on-xulrunner builds (bmo#590411)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
69 |
ifdef ENABLE_TESTS |
c5e051ab6cb8
install sync components with Firefox-on-xulrunner builds (bmo#590411)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
70 |
tier_platform_dirs += testing/mochitest |
c5e051ab6cb8
install sync components with Firefox-on-xulrunner builds (bmo#590411)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
71 |
tier_platform_dirs += testing/xpcshell |
c5e051ab6cb8
install sync components with Firefox-on-xulrunner builds (bmo#590411)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
72 |
tier_platform_dirs += testing/mozmill |
153 | 73 |
tier_platform_dirs += testing/tools/screenshot |
140
c5e051ab6cb8
install sync components with Firefox-on-xulrunner builds (bmo#590411)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
74 |
endif |
c5e051ab6cb8
install sync components with Firefox-on-xulrunner builds (bmo#590411)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
75 |