Bug 574380: make constants useful on trunk. r=mconnor
authorRichard Newman <rnewman@mozilla.com>
Mon, 31 Jan 2011 23:19:04 -0800
changeset 62003 aa9d8ceefe9afa1640923e2a26a355cbdde28554
parent 62002 c4ae1660dee9285c0176f82366b7c1b8cc8103f9
child 62004 0f4b93da5a8a00b04338951735a6cd06a44bfa75
push idunknown
push userunknown
push dateunknown
reviewersmconnor
bugs574380
Bug 574380: make constants useful on trunk. r=mconnor
services/sync/modules/constants.js
services/sync/version.txt
--- a/services/sync/modules/constants.js
+++ b/services/sync/modules/constants.js
@@ -1,8 +1,9 @@
+#filter substitution
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
  *
@@ -33,26 +34,26 @@
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 // Process each item in the "constants hash" to add to "global" and give a name
 let EXPORTED_SYMBOLS = [((this[key] = val), key) for ([key, val] in Iterator({
 
-WEAVE_CHANNEL:                         "@xpi_type@",
+WEAVE_CHANNEL:                         "@weave_channel@",
 WEAVE_VERSION:                         "@weave_version@",
 WEAVE_ID:                              "@weave_id@",
 
 // Version of the data format this client supports. The data format describes
 // how records are packaged; this is separate from the Server API version and
 // the per-engine cleartext formats.
 STORAGE_VERSION:                       5,
 
-UPDATED_DEV_URL:                       "https://services.mozilla.com/sync/updated/?version=@weave_version@&channel=@xpi_type@",
+UPDATED_DEV_URL:                       "https://services.mozilla.com/sync/updated/?version=@weave_version@&channel=@weave_channel@",
 UPDATED_REL_URL:                       "http://www.mozilla.com/firefox/sync/updated.html",
 
 PREFS_BRANCH:                          "services.sync.",
 
 // Host "key" to access Weave Identity in the password manager
 PWDMGR_HOST:                           "chrome://weave",
 PWDMGR_PASSWORD_REALM:                 "Mozilla Services Password",
 PWDMGR_PASSPHRASE_REALM:               "Mozilla Services Encryption Passphrase",
new file mode 100644
--- /dev/null
+++ b/services/sync/version.txt
@@ -0,0 +1,1 @@
+1.7b1pre