Bug 368091 - Toolkit's about:license needs to allow for different 'official binaries' line (make toolkit/content/license.html generic and let apps build a customized copy from it; app changes for Firefox here; others in follow-up bugs). r=bsmedberg, mpa=gavin on the browser bits, r=philor on the ugly line in Thunderbird until bug 428144 lands, a1.9=beltzner
authoralqahira@ardisson.org
Thu, 10 Apr 2008 09:07:21 -0700
changeset 14168 f99170ab5d1a3fcf1c057e0c2176574c74a0b69e
parent 14167 0ec2dc149cb0c80cae80e36463bf1a14a2a9b4de
child 14169 072c321141e8d96ff2d48b11203079d012fdd0f9
push id11
push userbsmedberg@mozilla.com
push dateTue, 15 Apr 2008 18:11:53 +0000
treeherdermozilla-central@40e4b99f0dea [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbsmedberg, philor
bugs368091, 428144
milestone1.9pre
Bug 368091 - Toolkit's about:license needs to allow for different 'official binaries' line (make toolkit/content/license.html generic and let apps build a customized copy from it; app changes for Firefox here; others in follow-up bugs). r=bsmedberg, mpa=gavin on the browser bits, r=philor on the ugly line in Thunderbird until bug 428144 lands, a1.9=beltzner
browser/base/Makefile.in
browser/base/content/overrides/app-license.html
browser/base/jar.mn
toolkit/content/jar.mn
toolkit/content/license.html
--- a/browser/base/Makefile.in
+++ b/browser/base/Makefile.in
@@ -39,23 +39,28 @@ DEPTH   = ../..
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH   = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 include $(topsrcdir)/config/config.mk
 
+CHROME_DEPS += $(srcdir)/content/overrides/app-license.html
+
 ifdef MOZ_MOCHITEST
 DIRS += content/test
 endif
 
 include $(topsrcdir)/config/rules.mk
 
-DEFINES += -DMOZ_APP_VERSION=$(MOZ_APP_VERSION)
+DEFINES += \
+	-DMOZ_APP_VERSION=$(MOZ_APP_VERSION) \
+	-DAPP_EULA_BLOCK=$(srcdir)/content/overrides/app-license.html \
+	$(NULL)
 
 ifndef MOZ_BRANDING_DIRECTORY
 DEFINES += -DMOZ_USE_GENERIC_BRANDING
 endif
 
 ifneq (,$(filter windows gtk2 mac cocoa, $(MOZ_WIDGET_TOOLKIT)))
 DEFINES += -DHAVE_SHELL_SERVICE=1
 endif
new file mode 100644
--- /dev/null
+++ b/browser/base/content/overrides/app-license.html
@@ -0,0 +1,5 @@
+    <p>Official <b>binaries</b> of this product released by the 
+    <a href="http://www.mozilla.com/">Mozilla Corporation</a> 
+    are made available under 
+    <a href="http://www.mozilla.org/foundation/EULA/">the corresponding 
+    EULA</a>.
--- a/browser/base/jar.mn
+++ b/browser/base/jar.mn
@@ -66,13 +66,16 @@ browser.jar:
 #ifdef MOZ_USE_GENERIC_BRANDING
 % content branding %content/branding/ xpcnativewrappers=yes
   content/branding/about.png                     (branding/about.png)
   content/branding/aboutCredits.png              (branding/aboutCredits.png)
   content/branding/aboutFooter.png               (branding/aboutFooter.png)
   content/branding/icon48.png                    (branding/icon48.png)
   content/branding/icon64.png                    (branding/icon64.png)
 #endif
+# the following files are browser-specific overrides
+*       content/browser/license.html                  (/toolkit/content/license.html)
+% override chrome://global/content/license.html chrome://browser/content/license.html
 
 #ifdef TOOLBAR_CUSTOMIZATION_SHEET
 toolkit.jar:
 *+      content/global/customizeToolbar.xul           (content/customizeToolbarSheet.xul)
 #endif
--- a/toolkit/content/jar.mn
+++ b/toolkit/content/jar.mn
@@ -1,16 +1,16 @@
 toolkit.jar:
 %  content global %content/global/ xpcnativewrappers=yes
 %  content global-platform %content/global-platform/ platform xpcnativewrappers=yes
 %  content global-region %content/global-region/ xpcnativewrappers=yes
 # provide the nsTransferable in nsDragAndDrop.js to extensions that have to
 # work with Geckos from before 1.9, when there was a separate file
 %  override chrome://global/content/nsTransferable.js chrome://global/content/nsDragAndDrop.js
-+  content/global/license.html                (license.html)
+*  content/global/license.html                (license.html)
    content/global/XPCNativeWrapper.js         (XPCNativeWrapper.js)
 *  content/global/xul.css                     (xul.css)
 *  content/global/about.xhtml                 (about.xhtml)
    content/global/plugins.html
    content/global/plugins.css
 +  content/global/buildconfig.html            (buildconfig.html)
 +  content/global/charsetOverlay.js           (charsetOverlay.js)
 +  content/global/charsetOverlay.xul          (charsetOverlay.xul)
--- a/toolkit/content/license.html
+++ b/toolkit/content/license.html
@@ -115,22 +115,20 @@
     window.onload = correctSpelling;
     </script>    
   </head>
 
   <body id="lic-info">
     <h1 class="correctme"><a name="top"></a>about:license</h1>
 
     <div class="correctme">
-    
-    <p>Official <b>binaries</b> of this product released by the 
-    <a href="http://www.mozilla.com/">Mozilla Corporation</a>
-    are made available under 
-    <a href="http://www.mozilla.org/foundation/EULA/">the corresponding 
-    EULA</a>.</p>
+
+#ifdef APP_EULA_BLOCK
+#includesubst @APP_EULA_BLOCK@
+#endif
     
     <p>Except as described
        <a id="exceptions-link" href="about:license#exceptions">here</a>, all 
        of the <b>source code</b> to this product is 
        <a href="http://developer.mozilla.org/en/docs/Mozilla_Source_Code_Via_CVS">available</a> 
        under licenses which are both 
        <a href="http://www.gnu.org/philosophy/free-sw.html">free</a> and 
        <a href="http://www.opensource.org/docs/definition.php">open source</a>.