Merge mozilla-central to mozilla-inbound
authorMarco Bonardo <mbonardo@mozilla.com>
Mon, 19 Dec 2011 12:51:55 +0100
changeset 84596 ac01181b4ad0dc453e70584ff6f81b140bd96438
parent 84595 7ed48b4ab9d1a463db52f521d52658e226a47252 (current diff)
parent 84586 bc9b34bb121e5a5fed8a1046c3c1da070d4ae8b9 (diff)
child 84597 c3438a4cc876048865035713489c5d42bc8ce3fe
child 92334 ff1ce52c8c1b6cf6d87918e22477a2b2fbfe7e46
push id519
push userakeybl@mozilla.com
push dateWed, 01 Feb 2012 00:38:35 +0000
treeherdermozilla-beta@788ea1ef610b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone11.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge mozilla-central to mozilla-inbound
ipc/ipdl/ipdl/mgen.py
--- a/browser/installer/removed-files.in
+++ b/browser/installer/removed-files.in
@@ -228,17 +228,16 @@ extensions/testpilot@labs.mozilla.com/sk
 extensions/testpilot@labs.mozilla.com/skin/win/feedback.css
 extensions/testpilot@labs.mozilla.com/skin/win/notification-tail-down.png
 extensions/testpilot@labs.mozilla.com/skin/win/notification-tail-up.png
 extensions/testpilot@labs.mozilla.com/tests/test_data_store.js
 greprefs/all.js
 greprefs/security-prefs.js
 greprefs/xpinstall.js
 install.rdf
-modules/ISO8601DateUtils.jsm
 modules/JSON.jsm
 modules/SpatialNavigation.js
 modules/utils.js
 mozilla-runtime@BIN_SUFFIX@
 old-homepage-default.properties
 README.txt
 res/arrow.gif
 res/arrowd.gif
@@ -991,16 +990,17 @@ xpicleanup@BIN_SUFFIX@
   #ifdef XP_WIN
     modules/DownloadTaskbarProgress.jsm
   #endif
   modules/DownloadUtils.jsm
   modules/FileUtils.jsm
   modules/Geometry.jsm
   modules/HUDService.jsm
   modules/InlineSpellChecker.jsm
+  modules/ISO8601DateUtils.jsm
   modules/LightweightThemeConsumer.jsm
   modules/LightweightThemeManager.jsm
   modules/Microformats.js
   modules/NetUtil.jsm
   modules/NetworkPrioritizer.jsm
   modules/openLocationLastURL.jsm
   modules/PerfMeasurement.jsm
   modules/PlacesDBUtils.jsm
--- a/ipc/ipdl/Makefile.in
+++ b/ipc/ipdl/Makefile.in
@@ -107,27 +107,23 @@ GARBAGE += $(CPPSRCS)
 
 LOCAL_INCLUDES += -I$(DEPTH)/ipc/ipdl/_ipdlheaders
 
 
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
 
--include $(ALL_IPDLSRCS:.ipdl=.ipdl.depends)
 
 # NB: the IPDL compiler manages .ipdl-->.h/.cpp dependencies itself,
 # which is why we don't have explicit .h/.cpp targets here
-export:: $(CPPSRCS)
-
-$(CPPSRCS) : $(ALL_IPDLSRCS)
+export:: $(ALL_IPDLSRCS)
 	$(PYTHON) $(topsrcdir)/config/pythonpath.py	\
 	  -I$(topsrcdir)/other-licenses/ply		\
 	  $(srcdir)/ipdl.py				\
 	  --outheaders-dir=_ipdlheaders			\
 	  --outcpp-dir=.				\
-	  --dependencies				\
 	  $(IPDLDIRS:%=-I$(topsrcdir)/%)		\
 	  $^
 
 # We #include some things in the dom/plugins/ directory that rely on
 # toolkit libraries.
 CXXFLAGS    += $(TK_CFLAGS)
--- a/ipc/ipdl/ipdl.py
+++ b/ipc/ipdl/ipdl.py
@@ -54,25 +54,22 @@ op.add_option('-d', '--outheaders-dir', 
 A protocol Foo in the namespace bar will cause the headers
   dir/bar/Foo.h, dir/bar/FooParent.h, and dir/bar/FooParent.h
 to be generated""")
 op.add_option('-o', '--outcpp-dir', dest='cppdir', default='.',
               help="""Directory into which C++ sources will be generated
 A protocol Foo in the namespace bar will cause the sources
   cppdir/FooParent.cpp, cppdir/FooChild.cpp
 to be generated""")
-op.add_option('-m', '--dependencies', dest='emitdependencies', default=False, action='store_true',
-              help="Emit Makefile dependencies for incremental rebuilds")
 
 
 options, files = op.parse_args()
 _verbosity = options.verbosity
 headersdir = options.headersdir
 cppdir = options.cppdir
-emitdependencies = options.emitdependencies
 includedirs = [ os.path.abspath(incdir) for incdir in options.includedirs ]
 
 if not len(files):
     op.error("No IPDL files specified")
 
 log(2, 'Generated C++ headers will be generated relative to "%s"', headersdir)
 log(2, 'Generated C++ sources will be generated in "%s"', cppdir)
 
@@ -104,26 +101,23 @@ for f in files:
     if not ipdl.typecheck(ast):
         print >>sys.stderr, 'Specification is not well typed.'
         sys.exit(1)
 
     if _verbosity > 2:
         log(3, '  pretty printed code:')
         ipdl.genipdl(ast, codedir)
 
-    if emitdependencies == 1:
-        ipdl.genm(ast, cppdir, normalizedFilename(f))
-
 # Second pass: generate code
 for f in files:
     # Read from parser cache
     filename = normalizedFilename(f)
     ast = ipdl.parse(None, filename, includedirs=includedirs)
     ipdl.gencxx(filename, ast, headersdir, cppdir)
-
+    
     allprotocols.append('%sMsgStart' % ast.protocol.name)
 
 allprotocols.sort()
 
 ipcmsgstart = StringIO()
 
 print >>ipcmsgstart, """
 // CODE GENERATED by ipdl.py. Do not edit.
@@ -141,10 +135,10 @@ print >>ipcmsgstart, """
   LastMsgIndex
 };
 
 COMPILE_ASSERT(LastMsgIndex <= 65536, need_to_update_IPC_MESSAGE_MACRO);
 
 #endif // ifndef IPCMessageStart_h
 """
 
-ipdl.writetofile(ipcmsgstart.getvalue(),
+ipdl.writeifmodified(ipcmsgstart.getvalue(),
                      os.path.join(headersdir, 'IPCMessageStart.h'))
--- a/ipc/ipdl/ipdl/__init__.py
+++ b/ipc/ipdl/ipdl/__init__.py
@@ -25,23 +25,22 @@
 # use your version of this file under the terms of the MPL, indicate your
 # 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 *****
 
-__all__ = [ 'gencxx', 'genipdl', 'parse', 'typecheck', 'writetofile' ]
+__all__ = [ 'gencxx', 'genipdl', 'parse', 'typecheck', 'writeifmodified' ]
 
-import os, sys, errno
+import os, sys
 from cStringIO import StringIO
 
 from ipdl.cgen import IPDLCodeGen
-from ipdl.mgen import DependGen
 from ipdl.lower import LowerToCxx
 from ipdl.parser import Parser
 from ipdl.type import TypeCheck
 
 from ipdl.cxx.cgen import CxxCodeGen
 
 
 def parse(specstring, filename='/stdin', includedirs=[ ], errout=sys.stderr):
@@ -68,37 +67,28 @@ def gencxx(ipdlfilename, ast, outheaders
         ]
     def resolveCpp(cpp):
         return [ cpp, os.path.join(outcppdir, cpp.name) ]
 
     for ast, filename in ([ resolveHeader(hdr) for hdr in headers ]
                           + [ resolveCpp(cpp) for cpp in cpps ]):
         tempfile = StringIO()
         CxxCodeGen(tempfile).cgen(ast)
-        writetofile(tempfile.getvalue(), filename)
+        writeifmodified(tempfile.getvalue(), filename)
 
 
 def genipdl(ast, outdir):
     return IPDLCodeGen().cgen(ast)
 
 
-def genm(ast, dir, filename):
-    tempfile = StringIO()
-    DependGen(tempfile).mgen(ast)
-    filename = dir + "/" + os.path.basename(filename) + ".depends"
-    writetofile(tempfile.getvalue(), filename)
-
-
-def writetofile(contents, file):
+def writeifmodified(contents, file):
     dir = os.path.dirname(file)
+    os.path.exists(dir) or os.makedirs(dir)
 
-    # Guard against race condition by using Try instead
-    # of |os.path.exists(dir) or os.makedirs(dir)|
-    try:
-        os.makedirs(dir)
-    except OSError, ex:
-        if ex.errno != errno.EEXIST:
-            raise ex
-        # else directory already exists. silently ignore and continue
-
-    fd = open(file, 'wb')
-    fd.write(contents)
-    fd.close()
+    oldcontents = None
+    if os.path.exists(file):
+        fd = open(file, 'rb')
+        oldcontents = fd.read()
+        fd.close()
+    if oldcontents != contents:
+        fd = open(file, 'wb')
+        fd.write(contents)
+        fd.close()
deleted file mode 100644
--- a/ipc/ipdl/ipdl/mgen.py
+++ /dev/null
@@ -1,54 +0,0 @@
-# ***** 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/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# Contributor(s):
-#   Benoit Girard <bgirard@mozilla.com>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either of the GNU General Public License Version 2 or later (the "GPL"),
-# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# 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 *****
-
-import sys
-
-from ipdl.cgen import CodePrinter
-from ipdl.cxx.ast import TypeArray, Visitor
-
-class DependGen(CodePrinter, Visitor):
-    def __init__(self, outf=sys.stdout, indentCols=4):
-        CodePrinter.__init__(self, outf, indentCols)
-
-    def mgen(self, cxxfile):
-        cxxfile.accept(self)
-
-    def visitTranslationUnit(self, tu):
-        self.write(tu.filename)
-        self.write(": ")
-
-        for pinc in tu.protocolIncludes:
-            self.write(pinc.file)
-            self.write(" ")
-
-        self.println();
-
new file mode 100644
--- /dev/null
+++ b/js/xpconnect/loader/ISO8601DateUtils.jsm
@@ -0,0 +1,176 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** 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/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Robert Sayre.
+ * Portions created by the Initial Developer are Copyright (C) 2006
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * Flock Inc. <erwan@flock.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * 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 ***** */
+
+const HOURS_TO_MINUTES = 60;
+const MINUTES_TO_SECONDS = 60;
+const SECONDS_TO_MILLISECONDS = 1000;
+const MINUTES_TO_MILLISECONDS = MINUTES_TO_SECONDS * SECONDS_TO_MILLISECONDS;
+const HOURS_TO_MILLISECONDS = HOURS_TO_MINUTES * MINUTES_TO_MILLISECONDS;
+
+var EXPORTED_SYMBOLS = ["ISO8601DateUtils"];
+
+debug("*** loading ISO8601DateUtils\n");
+
+var ISO8601DateUtils = {
+
+  /**
+  * XXX Thunderbird's W3C-DTF function
+  *
+  * Converts a W3C-DTF (subset of ISO 8601) date string to a Javascript
+  * date object. W3C-DTF is described in this note:
+  * http://www.w3.org/TR/NOTE-datetime IETF is obtained via the Date
+  * object's toUTCString() method.  The object's toString() method is
+  * insufficient because it spells out timezones on Win32
+  * (f.e. "Pacific Standard Time" instead of "PST"), which Mail doesn't
+  * grok.  For info, see
+  * http://lxr.mozilla.org/mozilla/source/js/src/jsdate.c#1526.
+  */
+  parse: function ISO8601_parse(aDateString) {
+    var dateString = aDateString;
+    if (!dateString.match('-')) {
+      // Workaround for server sending
+      // dates such as: 20030530T11:18:50-08:00
+      // instead of: 2003-05-30T11:18:50-08:00
+      var year = dateString.slice(0, 4);
+      var month = dateString.slice(4, 6);
+      var rest = dateString.slice(6, dateString.length);
+      dateString = year + "-" + month + "-" + rest;
+    }
+
+    var parts = dateString.match(/(\d{4})(-(\d{2,3}))?(-(\d{2}))?(T(\d{2}):(\d{2})(:(\d{2})(\.(\d+))?)?(Z|([+-])(\d{2}):(\d{2}))?)?/);
+
+    // Here's an example of a W3C-DTF date string and what .match returns for it.
+    //
+    // date: 2003-05-30T11:18:50.345-08:00
+    // date.match returns array values:
+    //
+    //   0: 2003-05-30T11:18:50-08:00,
+    //   1: 2003,
+    //   2: -05,
+    //   3: 05,
+    //   4: -30,
+    //   5: 30,
+    //   6: T11:18:50-08:00,
+    //   7: 11,
+    //   8: 18,
+    //   9: :50,
+    //   10: 50,
+    //   11: .345,
+    //   12: 345,
+    //   13: -08:00,
+    //   14: -,
+    //   15: 08,
+    //   16: 00
+
+    // Create a Date object from the date parts.  Note that the Date
+    // object apparently can't deal with empty string parameters in lieu
+    // of numbers, so optional values (like hours, minutes, seconds, and
+    // milliseconds) must be forced to be numbers.
+    var date = new Date(parts[1], parts[3] - 1, parts[5], parts[7] || 0,
+      parts[8] || 0, parts[10] || 0, parts[12] || 0);
+
+    // We now have a value that the Date object thinks is in the local
+    // timezone but which actually represents the date/time in the
+    // remote timezone (f.e. the value was "10:00 EST", and we have
+    // converted it to "10:00 PST" instead of "07:00 PST").  We need to
+    // correct that.  To do so, we're going to add the offset between
+    // the remote timezone and UTC (to convert the value to UTC), then
+    // add the offset between UTC and the local timezone //(to convert
+    // the value to the local timezone).
+
+    // Ironically, W3C-DTF gives us the offset between UTC and the
+    // remote timezone rather than the other way around, while the
+    // getTimezoneOffset() method of a Date object gives us the offset
+    // between the local timezone and UTC rather than the other way
+    // around.  Both of these are the additive inverse (i.e. -x for x)
+    // of what we want, so we have to invert them to use them by
+    // multipying by -1 (f.e. if "the offset between UTC and the remote
+    // timezone" is -5 hours, then "the offset between the remote
+    // timezone and UTC" is -5*-1 = 5 hours).
+
+    // Note that if the timezone portion of the date/time string is
+    // absent (which violates W3C-DTF, although ISO 8601 allows it), we
+    // assume the value to be in UTC.
+
+    // The offset between the remote timezone and UTC in milliseconds.
+    var remoteToUTCOffset = 0;
+    if (parts[13] && parts[13] != "Z") {
+      var direction = (parts[14] == "+" ? 1 : -1);
+      if (parts[15])
+        remoteToUTCOffset += direction * parts[15] * HOURS_TO_MILLISECONDS;
+      if (parts[16])
+        remoteToUTCOffset += direction * parts[16] * MINUTES_TO_MILLISECONDS;
+    }
+    remoteToUTCOffset = remoteToUTCOffset * -1; // invert it
+
+    // The offset between UTC and the local timezone in milliseconds.
+    var UTCToLocalOffset = date.getTimezoneOffset() * MINUTES_TO_MILLISECONDS;
+    UTCToLocalOffset = UTCToLocalOffset * -1; // invert it
+    date.setTime(date.getTime() + remoteToUTCOffset + UTCToLocalOffset);
+
+    return date;
+  },
+
+  create: function ISO8601_create(aDate) {
+    function zeropad (s, l) {
+      s = s.toString(); // force it to a string
+      while (s.length < l) {
+        s = '0' + s;
+      }
+      return s;
+    }
+
+    var myDate;
+    // if d is a number, turn it into a date
+    if (typeof aDate == 'number') {
+      myDate = new Date()
+      myDate.setTime(aDate);
+    } else {
+      myDate = aDate;
+    }
+
+    // YYYY-MM-DDThh:mm:ssZ
+    var result = zeropad(myDate.getUTCFullYear (), 4) +
+                 zeropad(myDate.getUTCMonth () + 1, 2) +
+                 zeropad(myDate.getUTCDate (), 2) + 'T' +
+                 zeropad(myDate.getUTCHours (), 2) + ':' +
+                 zeropad(myDate.getUTCMinutes (), 2) + ':' +
+                 zeropad(myDate.getUTCSeconds (), 2) + 'Z';
+
+    return result;
+  }
+}
--- a/js/xpconnect/loader/Makefile.in
+++ b/js/xpconnect/loader/Makefile.in
@@ -44,13 +44,13 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= jsloader
 LIBRARY_NAME	= jsloader_s
 FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY = 1
 LOCAL_INCLUDES += -I$(srcdir)/../src
 
 CPPSRCS		= mozJSComponentLoader.cpp mozJSSubScriptLoader.cpp mozJSLoaderUtils.cpp
 
-EXTRA_JS_MODULES = XPCOMUtils.jsm
+EXTRA_JS_MODULES = XPCOMUtils.jsm ISO8601DateUtils.jsm
 
 include $(topsrcdir)/config/rules.mk
 
 DEFINES		+= -DJSFILE -DJS_THREADSAFE