Use omnijar.
authorFlorian Quèze <florian@instantbird.org>
Tue, 31 Aug 2010 23:40:20 +0200
changeset 14384 684802d3a7f1fd5f7e679a1e145f18f45257ec78
parent 14383 8312af216c3bd14e7e1dcc0e48656b2c9e562069
child 14385 b09082e1a4b932983bc5a326fb171497118e41ba
push id9778
push userflorian@queze.net
push dateSun, 12 Jan 2014 18:25:45 +0000
treeherdercomm-central@f81a23bfefcd [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
Use omnijar.
im/components/smileProtocolHandler.js
im/confvars.sh
im/content/blist.js
im/content/convbrowser.xml
im/content/conversation.xml
im/content/instantbird.js
im/content/preferences/smileys.js
im/content/topicNotification.xml
im/content/viewlog.js
purple/purplexpcom/src/facebookOverrideProtocol.js
purple/purplexpcom/src/gtalkOverrideProtocol.js
purple/purplexpcom/src/jsTestProtocol.js
--- a/im/components/smileProtocolHandler.js
+++ b/im/components/smileProtocolHandler.js
@@ -31,17 +31,17 @@
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * 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 ***** */
 
 Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
-Components.utils.import("resource://app/modules/imSmileys.jsm");
+Components.utils.import("resource:///modules/imSmileys.jsm");
 
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 const smileRegexp = /^smile:\/\//;
 
 function smileProtocolHandler() { }
 
 smileProtocolHandler.prototype = {
--- a/im/confvars.sh
+++ b/im/confvars.sh
@@ -35,16 +35,17 @@
 # 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 *****
 
 MOZ_APP_NAME=instantbird
 MOZ_XUL_APP=1
 MOZ_ENABLE_LIBXUL=1
+MOZ_CHROME_FILE_FORMAT=omni
 MOZ_UPDATER=1
 MOZ_MATHML=
 
 MOZ_APP_VERSION_TXT=${_topsrcdir}/$MOZ_BUILD_APP/config/version.txt
 MOZ_APP_VERSION=`cat $MOZ_APP_VERSION_TXT`
 INSTANTBIRD_VERSION=$MOZ_APP_VERSION
 
 MOZ_BRANDING_DIRECTORY=instantbird/branding/nightly
--- a/im/content/blist.js
+++ b/im/content/blist.js
@@ -342,17 +342,17 @@ var buddyList = {
           let pcs = Components.classes["@instantbird.org/purple/core;1"]
                         .getService(Ci.purpleICoreService);
           elt.setAttribute("value", pcs.currentStatusMessage);
         }
         else
           elt.removeAttribute("value");
       }
       if (!("TextboxSpellChecker" in window))
-        Components.utils.import("resource://app/modules/imTextboxUtils.jsm");
+        Components.utils.import("resource:///modules/imTextboxUtils.jsm");
       TextboxSpellChecker.registerTextbox(elt);
       // force binding attachmant by forcing layout
       elt.getBoundingClientRect();
       elt.select();
     }
 
     this.statusMessageRefreshTimer();
   },
@@ -517,17 +517,17 @@ var buddyList = {
         groupElt._showOffline = true;
       if (!groupElt.build(aTag))
         blistBox.removeChild(groupElt);
     });
 
     prefBranch.addObserver(showOfflineBuddiesPref, buddyList, false);
     addObservers(buddyList, events);
 
-    Components.utils.import("resource://app/modules/imWindows.jsm");
+    Components.utils.import("resource:///modules/imWindows.jsm");
     Conversations.init();
 
     buddyList.showAccountManagerIfNeeded(true);
     this.addEventListener("unload", buddyList.unload, false);
     this.addEventListener("close", buddyList.close, false);
   },
   unload: function bl_unload() {
     removeObservers(buddyList, events);
--- a/im/content/convbrowser.xml
+++ b/im/content/convbrowser.xml
@@ -200,21 +200,21 @@
 
       <constructor>
         <![CDATA[
           this.addEventListener("scroll", this.browserScroll, false);
           this.addEventListener("resize", this.browserResize, false);
           this.mPrefs.addObserver(this.magicCopyPref, this, false);
 
           if (!("cleanupImMarkup" in window))
-            Components.utils.import("resource://app/modules/imContentSink.jsm");
+            Components.utils.import("resource:///modules/imContentSink.jsm");
           if (!("smileImMarkup" in window))
-            Components.utils.import("resource://app/modules/imSmileys.jsm");
+            Components.utils.import("resource:///modules/imSmileys.jsm");
           if (!("getCurrentTheme" in window))
-            Components.utils.import("resource://app/modules/imThemes.jsm");
+            Components.utils.import("resource:///modules/imThemes.jsm");
         ]]>
       </constructor>
 
       <destructor>
         <![CDATA[
           this.destroy();
         ]]>
       </destructor>
--- a/im/content/conversation.xml
+++ b/im/content/conversation.xml
@@ -410,17 +410,17 @@
      </method>
 
      <method name="initTextboxFormat">
       <body>
       <![CDATA[
         let textbox = this.editor;
 
         if (!("MessageFormat" in window))
-          Components.utils.import("resource://app/modules/imTextboxUtils.jsm");
+          Components.utils.import("resource:///modules/imTextboxUtils.jsm");
         MessageFormat.registerTextbox(textbox);
 
         // Init the textbox size
         this.calculateTextboxDefaultHeight();
         textbox.parentNode.height = textbox.defaultHeight +
                                     this._TEXTBOX_VERTICAL_OVERHEAD;
         document.getAnonymousElementByAttribute(textbox, "anonid", "input")
                 .style.overflowY = "hidden";
--- a/im/content/instantbird.js
+++ b/im/content/instantbird.js
@@ -35,17 +35,17 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
 
 var TAB_DROP_TYPE = "application/x-moz-tabbrowser-tab";
 
 var convWindow = {
   load: function mo_load() {
-    Components.utils.import("resource://app/modules/imWindows.jsm");
+    Components.utils.import("resource:///modules/imWindows.jsm");
     Conversations.registerWindow(window);
 
     if ("arguments" in window) {
       while (window.arguments[0] instanceof XULElement) {
         // swap the given tab with the default dummy conversation tab
         // and then close the original tab in the other window.
         let tab = window.arguments.shift();
         document.getElementById("conversations").importConversation(tab);
--- a/im/content/preferences/smileys.js
+++ b/im/content/preferences/smileys.js
@@ -53,17 +53,17 @@ var smileysPreview = {
 
     let menulist = document.getElementById("smileythemename");
     themeList.forEach(function(aItem) {
       menulist.appendItem(aItem.name,
                           aItem.id.replace(/^emoticons-([^@]+)@.*/, "$1"));
     });
   },
   load: function() {
-    Components.utils.import("resource://app/modules/imSmileys.jsm");
+    Components.utils.import("resource:///modules/imSmileys.jsm");
 
     smileysPreview.buildThemeList();
     let themeName = document.getElementById("smileythemename");
     // force the setter to execute again now that the menuitem exists
     themeName.value = themeName.value;
     this._loaded = true;
     this.displayCurrentTheme();
   },
--- a/im/content/topicNotification.xml
+++ b/im/content/topicNotification.xml
@@ -89,17 +89,17 @@
       <method name="editTopic">
         <body>
           <![CDATA[
             this.deck.selectedIndex = 1;
             let textboxElt = this.textbox;
             textboxElt.value = this.label;
             textboxElt.focus();
             if (!("TextboxSpellChecker" in window))
-              Components.utils.import("resource://app/modules/imTextboxUtils.jsm");
+              Components.utils.import("resource:///modules/imTextboxUtils.jsm");
             TextboxSpellChecker.registerTextbox(textboxElt);
           ]]>
         </body>
       </method>
 
       <method name="setTopic">
         <body>
           <![CDATA[
--- a/im/content/viewlog.js
+++ b/im/content/viewlog.js
@@ -84,14 +84,14 @@ var logWindow = {
 
     let link = doc.createElement("link");
     link.type = "text/css";
     link.rel = "stylesheet";
     link.href = "data:text/css,pre{white-space: pre-wrap;word-wrap: break-word;}.ib-img-smile {vertical-align: text-bottom;}";
     doc.getElementsByTagName("head")[0].appendChild(link);
 
     if (!("smileTextNode" in window))
-      Components.utils.import("resource://app/modules/imSmileys.jsm");
+      Components.utils.import("resource:///modules/imSmileys.jsm");
     smileTextNode(doc.getElementsByTagName("pre")[0].firstChild);
   }
 };
 
 this.addEventListener("load", logWindow.load, false);
--- a/purple/purplexpcom/src/facebookOverrideProtocol.js
+++ b/purple/purplexpcom/src/facebookOverrideProtocol.js
@@ -31,17 +31,17 @@
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * 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 ***** */
 
 Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
-Components.utils.import("resource://app/modules/jsProtoHelper.jsm");
+Components.utils.import("resource:///modules/jsProtoHelper.jsm");
 const Ci = Components.interfaces;
 
 function UsernameSplit(aBase, aDefaultValue)
 {
   this.base = aBase;
   this.defaultValue = aDefaultValue;
 }
 UsernameSplit.prototype = {
--- a/purple/purplexpcom/src/gtalkOverrideProtocol.js
+++ b/purple/purplexpcom/src/gtalkOverrideProtocol.js
@@ -31,17 +31,17 @@
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * 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 ***** */
 
 Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
-Components.utils.import("resource://app/modules/jsProtoHelper.jsm");
+Components.utils.import("resource:///modules/jsProtoHelper.jsm");
 
 function gtalkProtocol() { }
 gtalkProtocol.prototype = {
   get normalizedName() "gtalk",
   get name() "Google Talk",
   get iconBaseURI() "chrome://prpl-gtalk/skin/",
   get baseId() "prpl-jabber",
   classID: Components.ID("{ad8a6454-2f5a-40c2-86ca-30062408125e}")
--- a/purple/purplexpcom/src/jsTestProtocol.js
+++ b/purple/purplexpcom/src/jsTestProtocol.js
@@ -31,17 +31,17 @@
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * 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 ***** */
 
 Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
-Components.utils.import("resource://app/modules/jsProtoHelper.jsm");
+Components.utils.import("resource:///modules/jsProtoHelper.jsm");
 
 function Conversation(aAccount)
 {
   this._init(aAccount);
 }
 Conversation.prototype = {
   _disconnected: false,
   _setDisconnected: function() {