Bug 600133 - Fix about:buildconfig unification after bug 538890, and future-proof the process a little bit. r=gavin, a2.0=gavin
authorSmokey Ardisson <alqahira@ardisson.org>
Fri, 08 Oct 2010 22:10:51 -0400
changeset 55239 7e7c7a311e0dd4e0b29dd3badadfb90945a15113
parent 55238 2e5c5d72f4fcb969fdd5fe0624a496ef4ea5e4ca
child 55240 495f10f3a139928a6fdc845a1cdc1ac325c9481d
push id16173
push useralqahira@ardisson.org
push dateSat, 09 Oct 2010 02:11:26 +0000
treeherdermozilla-central@7e7c7a311e0d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgavin
bugs600133, 538890
milestone2.0b8pre
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
Bug 600133 - Fix about:buildconfig unification after bug 538890, and future-proof the process a little bit. r=gavin, a2.0=gavin
build/macosx/universal/fix-buildconfig
toolkit/content/buildconfig.html
--- a/build/macosx/universal/fix-buildconfig
+++ b/build/macosx/universal/fix-buildconfig
@@ -121,19 +121,19 @@ sub fixBuildconfig($$$) {
       last;
     }
     push(@linesNew, $line);
   }
 
   # Insert a <hr> between the two files.
   push (@linesNew, '<hr> </hr>');
 
-  # Copy the second file's content beginning after its leading <h1> and <p>.
+  # Copy the second file's content beginning after its leading <h1>.
   while ($line = shift(@lines2)) {
-    if ($line eq '<p> </p>') {
+    if ($line eq '<h1>about:buildconfig</h1>') {
       last;
     }
   }
   while ($line = shift(@lines2)) {
     push(@linesNew, $line);
   }
 
   my ($contentsNew);
--- a/toolkit/content/buildconfig.html
+++ b/toolkit/content/buildconfig.html
@@ -15,18 +15,18 @@
 # The Original Code is mozilla.org code.
 #
 # The Initial Developer of the Original Code is
 # Netscape Communications Corporation.
 # Portions created by the Initial Developer are Copyright (C) 2003
 # the Initial Developer. All Rights Reserved.
 #
 # Contributor(s):
-#   Seawood <netscape@seawood.org> (original author)
-#   Christian Biesinger <cbiesinger@gmail.com>
+#   Christopher Seawood <cls@seawood.org> (original author)
+#   Christian Biesinger <cbiesinger@web.de>
 #   Ehsan Akhgari <ehsan.akhgari@gmail.com>
 #   Ted Mielczarek <ted.mielczarek@gmail.com>
 #   Steffen Wilberg <steffen.wilberg@web.de>
 #
 # 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
@@ -34,17 +34,20 @@
 # 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 *****
-
+#
+# IMPORTANT: Do not modify this file without checking the results of 
+# build/macosx/universal/fix-buildconfig in a Mac Universal binary.
+#
 #filter substitution
 <html>
 <head>
   <meta charset="UTF-8">
   <title>about:buildconfig</title>
   <link rel="stylesheet" href="chrome://global/skin/about.css" type="text/css">
   <style type="text/css">
     th { text-align: start; }