Bug 820546 - Reduce the number of files that are preprocessed while building fennec. r=mfinkle
authorKartikaya Gupta <kgupta@mozilla.com>
Wed, 12 Dec 2012 10:10:50 -0500
changeset 115795 a18d27e6d78addf4da0a1e387f7e76fae1ef204e
parent 115794 53c35671c6c2f1c9c85aec6448fa43f815c27e8b
child 115796 d75e7bfff5544fced13ce6a950a31d019f846fde
push id24028
push useremorley@mozilla.com
push dateThu, 13 Dec 2012 15:56:02 +0000
treeherderautoland@9db79b97abbb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmfinkle
bugs820546
milestone20.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
Bug 820546 - Reduce the number of files that are preprocessed while building fennec. r=mfinkle
mobile/android/chrome/content/aboutApps.xhtml
mobile/android/chrome/content/aboutRights.xhtml
mobile/android/chrome/jar.mn
--- a/mobile/android/chrome/content/aboutApps.xhtml
+++ b/mobile/android/chrome/content/aboutApps.xhtml
@@ -1,31 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-# ***** BEGIN LICENSE BLOCK *****
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this file,
-# You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# ***** END LICENSE BLOCK *****
-
 <!DOCTYPE html [
   <!ENTITY % htmlDTD
     PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
     "DTD/xhtml1-strict.dtd">
   %htmlDTD;
   <!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
   %globalDTD;
   <!ENTITY % aboutAppsDTD SYSTEM "chrome://browser/locale/aboutApps.dtd">
   %aboutAppsDTD;
   <!ENTITY % browserDTD SYSTEM "chrome://browser/locale/browser.dtd" >
   %browserDTD;
 ]>
 
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <title>&aboutApps.title2;</title>
     <meta name="viewport" content="width=480; initial-scale=.6667; user-scalable=0" />
     <link rel="icon" type="image/png" href="chrome://branding/content/favicon32.png" />
     <link rel="stylesheet" type="text/css" href="chrome://browser/skin/aboutApps.css" media="all" />
     <script type="text/javascript;version=1.8" src="chrome://browser/content/aboutApps.js"></script>
   </head>
--- a/mobile/android/chrome/content/aboutRights.xhtml
+++ b/mobile/android/chrome/content/aboutRights.xhtml
@@ -2,38 +2,39 @@
 <!DOCTYPE html [
   <!ENTITY % htmlDTD PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd">
   %htmlDTD;
   <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
   %brandDTD;
   <!ENTITY % aboutRightsDTD SYSTEM "chrome://global/locale/aboutRights.dtd">
   %aboutRightsDTD;
 ]>
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 
 <head>
   <title>&rights.pagetitle;</title>
   <link rel="stylesheet" href="chrome://global/skin/about.css" type="text/css"/>
 </head>
 
 <body id="your-rights" dir="&rights.locale-direction;" class="aboutPageWideContainer">
 
 <h1>&rights.intro-header;</h1>
 
 <p>&rights.intro;</p>
 
 <ul>
   <li>&rights.intro-point1a;<a href="http://www.mozilla.org/MPL/">&rights.intro-point1b;</a>&rights.intro-point1c;</li>
-# Point 2 discusses Mozilla trademarks, and isn't needed when the build is unbranded.
-# Point 3 discusses privacy policy, unbranded builds get a placeholder (for the vendor to replace)
-# Point 4 discusses web service terms, unbranded builds gets a placeholder (for the vendor to replace)
+  <!-- Point 2 discusses Mozilla trademarks, and isn't needed when the build is unbranded.
+       Point 3 discusses privacy policy, unbranded builds get a placeholder (for the vendor to replace)
+       Point 4 discusses web service terms, unbranded builds gets a placeholder (for the vendor to replace) -->
   <li>&rights.intro-point2-a;<a href="http://www.mozilla.org/foundation/trademarks/policy.html">&rights.intro-point2-b;</a>&rights.intro-point2-c;</li>
   <li>&rights.intro-point2.5;</li>
   <li>&rights2.intro-point3a;<a href="http://www.mozilla.com/legal/privacy/">&rights2.intro-point3b;</a>&rights.intro-point3c;</li>
   <li>&rights2.intro-point4a;<a href="about:rights#webservices" onclick="showServices();">&rights.intro-point4b;</a>&rights.intro-point4c;</li>
 </ul>
 
 <div id="webservices-container">
   <a name="webservices"/>
@@ -59,17 +60,17 @@
       <li>&rights.locationawarebrowsing-term1a;<code>&rights.locationawarebrowsing-term1b;</code></li>
       <li>&rights.locationawarebrowsing-term2;</li>
       <li>&rights.locationawarebrowsing-term3;</li>
       <li>&rights.locationawarebrowsing-term4;</li>
     </ul>
   </div>
 
   <ol>
-# Terms only apply to official builds, unbranded builds get a placeholder.
+    <!-- Terms only apply to official builds, unbranded builds get a placeholder. -->
     <li>&rights2.webservices-term1;</li>
     <li>&rights.webservices-term2;</li>
     <li>&rights2.webservices-term3;</li>
     <li><strong>&rights.webservices-term4;</strong></li>
     <li><strong>&rights.webservices-term5;</strong></li>
     <li>&rights.webservices-term6;</li>
     <li>&rights.webservices-term7;</li>
   </ol>
--- a/mobile/android/chrome/jar.mn
+++ b/mobile/android/chrome/jar.mn
@@ -16,29 +16,29 @@ chrome.jar:
   content/aboutDownloads.js            (content/aboutDownloads.js)
   content/aboutFeedback.xhtml          (content/aboutFeedback.xhtml)
   content/aboutReader.html             (content/aboutReader.html)
   content/aboutReader.js               (content/aboutReader.js)
   content/Readability.js               (content/Readability.js)
   content/JSDOMParser.js               (content/JSDOMParser.js)
   content/readerWorker.js              (content/readerWorker.js)
   content/aboutHome.xhtml              (content/aboutHome.xhtml)
-* content/aboutRights.xhtml            (content/aboutRights.xhtml)
-* content/aboutApps.xhtml              (content/aboutApps.xhtml)
+  content/aboutRights.xhtml            (content/aboutRights.xhtml)
+  content/aboutApps.xhtml              (content/aboutApps.xhtml)
   content/aboutApps.js                 (content/aboutApps.js)
   content/blockedSite.xhtml            (content/blockedSite.xhtml)
   content/languages.properties         (content/languages.properties)
-* content/browser.xul                  (content/browser.xul)
+  content/browser.xul                  (content/browser.xul)
 * content/browser.js                   (content/browser.js)
   content/bindings/checkbox.xml        (content/bindings/checkbox.xml)
   content/bindings/menulist.xml        (content/bindings/menulist.xml)
   content/bindings/settings.xml        (content/bindings/settings.xml)
   content/sanitize.js                  (content/sanitize.js)
   content/exceptions.js                (content/exceptions.js)
-* content/downloads.js                 (content/downloads.js)
+  content/downloads.js                 (content/downloads.js)
   content/netError.xhtml               (content/netError.xhtml)
   content/SelectHelper.js              (content/SelectHelper.js)
   content/HelperApps.js                (content/HelperApps.js)
   content/dbg-browser-actors.js        (content/dbg-browser-actors.js)
 * content/WebAppRT.js                  (content/WebAppRT.js)
   content/InputWidgetHelper.js         (content/InputWidgetHelper.js)
 
 % content branding %content/branding/