Bug 293004 - svgBindings.xml not included in installer packages. r+a=bsmedberg

layout/svg/base/src/Makefile.in

@@ -42,8 +42,6 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS = resources
-
 MODULE		= layout
 LIBRARY_NAME	= gksvgbase_s
 LIBXUL_LIBRARY	= 1

layout/svg/base/src/resources/Makefile.in

@@ -1,44 +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 SVG project.
-#
-# The Initial Developer of the Original Code is
-# Crocodile Clips Ltd.
-# Portions created by the Initial Developer are Copyright (C) 2002
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# 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 *****
-
-DEPTH		= ../../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-include $(topsrcdir)/config/rules.mk

layout/svg/base/src/resources/content/contents.rdf

@@ -1,15 +0,0 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
- <RDF:Seq about="urn:mozilla:package:root">
-   <RDF:li resource="urn:mozilla:package:svg"/>
- </RDF:Seq>
-
- <RDF:Description about="urn:mozilla:package:svg"
-   chrome:displayName="SVG Bindings"
-   chrome:author="Crocodile Clips Ltd."
-   chrome:name="svg">
- </RDF:Description>
-
-</RDF:RDF>

layout/svg/base/src/resources/jar.mn

@@ -1,3 +0,0 @@
-svg.jar:
-    content/svg/contents.rdf    (content/contents.rdf)
-    content/svg/svgBindings.xml (content/svgBindings.xml)

layout/svg/base/src/svg.css

@@ -39,7 +39,7 @@
 @namespace url(http://www.w3.org/2000/svg);
 
 a {
-  -moz-binding:url('chrome://svg/content/svgBindings.xml#a'); 
+  -moz-binding:url('chrome://global/content/svg/svgBindings.xml#a'); 
   cursor: pointer;
 }
                

toolkit/content/jar.mn

@@ -70,3 +70,6 @@ toolkit.jar:
 #ifdef XP_MACOSX
 *  content/global/macWindowMenu.js             (macWindowMenu.js)
 #endif
+#ifdef MOZ_SVG
+   content/global/svg/svgBindings.xml          (/layout/svg/base/src/resources/content/svgBindings.xml)
+#endif

xpfe/global/jar.mn

@@ -75,6 +75,9 @@ toolkit.jar:
         content/global/fontpackage.xul              (resources/content/fontpackage.xul)
         content/global/fontpackage.js               (resources/content/fontpackage.js)
         content/global/XPCNativeWrapper.js          (resources/content/XPCNativeWrapper.js) 
+#ifdef MOZ_SVG
+        content/global/svg/svgBindings.xml          (/layout/svg/base/src/resources/content/svgBindings.xml)
+#endif
 
 #ifndef MOZ_XUL_APP
 en-US.jar: