Bug 428333 - Make Camino/xpfe use toolkit's license and build an appropriate app-specific copy for Camino. Fighting license.html proliferation since 2008! r=mento, sr=pinkerton ('rs=hyatt'), a/1.9.0.12=ss

git-svn-id: svn://10.0.0.236/trunk@257342 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/camino/config/app-license.html

@@ -0,0 +1,4 @@
+    <p><b>Binaries</b> of this product released by the 
+    <a href="http://www.mozilla.org/">Mozilla Foundation</a>
+    are made available under the corresponding
+    <a href="http://www.mozilla.org/legal/eula/">EULA</a>.</p>

mozilla/camino/pinstripe/Makefile.in

@@ -44,6 +44,17 @@ include $(DEPTH)/config/autoconf.mk
 
 include $(topsrcdir)/config/rules.mk
 
+# The next three lines, along with corresponding entries in jar.mn, are a hack
+# to keep generation of a Camino-specific license.html out of the main Camino 
+# Makefile.  The generated license.html file overwrites the existing 
+# content/global/license.html file.
+
+CHROME_DEPS += $(topsrcdir)/camino/config/app-license.html
+
+DEFINES += -DAPP_LICENSE_BLOCK=$(CM_APP_LICENSE_FILE)
+
+CM_APP_LICENSE_FILE = $(topsrcdir)/camino/config/app-license.html
+
 # The presence of jar.mn causes $(SOURCE_CHROME_DIR)/$(JAR_FILE).jar to be
 # built and $(SOURCE_CHROME_DIR)/installed-chrome.txt to be updated.  Camino
 # uses $(TARGET_CHROME_DIR)/installed-chrome.txt instead, though, so copy

mozilla/camino/pinstripe/jar.mn

@@ -1,4 +1,7 @@
 embed.jar:
+# Replace the generic Toolkit license with one appropriate for Camino
+*  content/global/license.html                                        (/toolkit/content/license.html)
+# Use up-to-date skin files from pinstripe instead of outdated ones from xpfe
    skin/classic/global/contents.rdf                                   (global/contents.rdf)
 +  skin/classic/global/10pct_transparent_grey.png                     (/toolkit/themes/pinstripe/global/10pct_transparent_grey.png)
 +  skin/classic/global/10pct_transparent_pixel.png                    (/toolkit/themes/pinstripe/global/10pct_transparent_pixel.png)

mozilla/xpfe/global/jar.mn

@@ -35,7 +35,7 @@ toolkit.jar:
         content/global/printPreviewProgress.xul     (resources/content/printPreviewProgress.xul)
         content/global/printPreviewProgress.js      (resources/content/printPreviewProgress.js)
 *       content/global/about.xhtml                  (resources/content/about.xhtml) 
-        content/global/license.html                 (resources/content/license.html)
+*       content/global/license.html                 (/toolkit/content/license.html)
         content/global/bindings/browser.xml         (resources/content/bindings/browser.xml)
         content/global/bindings/button.xml          (resources/content/bindings/button.xml)
         content/global/bindings/checkbox.xml        (resources/content/bindings/checkbox.xml)