From b57af84d2ab50d34c20911725ee56fc6fc12aed8 Mon Sep 17 00:00:00 2001 From: "tor%cs.brown.edu" Date: Fri, 6 May 2005 15:15:40 +0000 Subject: [PATCH] Bug 293004 - svgBindings.xml not included in installer packages. r+a=bsmedberg --- layout/svg/base/src/Makefile.in | 2 - layout/svg/base/src/resources/Makefile.in | 44 ------------------- .../base/src/resources/content/contents.rdf | 15 ------- layout/svg/base/src/resources/jar.mn | 3 -- layout/svg/base/src/svg.css | 2 +- toolkit/content/jar.mn | 3 ++ xpfe/global/jar.mn | 3 ++ 7 files changed, 7 insertions(+), 65 deletions(-) delete mode 100644 layout/svg/base/src/resources/Makefile.in delete mode 100644 layout/svg/base/src/resources/content/contents.rdf delete mode 100644 layout/svg/base/src/resources/jar.mn diff --git a/layout/svg/base/src/Makefile.in b/layout/svg/base/src/Makefile.in index fb5cabad9825..af8765f35c41 100644 --- a/layout/svg/base/src/Makefile.in +++ b/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 diff --git a/layout/svg/base/src/resources/Makefile.in b/layout/svg/base/src/resources/Makefile.in deleted file mode 100644 index 751e9aee7545..000000000000 --- a/layout/svg/base/src/resources/Makefile.in +++ /dev/null @@ -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 diff --git a/layout/svg/base/src/resources/content/contents.rdf b/layout/svg/base/src/resources/content/contents.rdf deleted file mode 100644 index ee8b2d8e8fae..000000000000 --- a/layout/svg/base/src/resources/content/contents.rdf +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - diff --git a/layout/svg/base/src/resources/jar.mn b/layout/svg/base/src/resources/jar.mn deleted file mode 100644 index 8b363d17e528..000000000000 --- a/layout/svg/base/src/resources/jar.mn +++ /dev/null @@ -1,3 +0,0 @@ -svg.jar: - content/svg/contents.rdf (content/contents.rdf) - content/svg/svgBindings.xml (content/svgBindings.xml) diff --git a/layout/svg/base/src/svg.css b/layout/svg/base/src/svg.css index 188a5c6bcf97..7f9d602cd2d9 100644 --- a/layout/svg/base/src/svg.css +++ b/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; } diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn index ebcae55b937a..33ec0175a9dd 100644 --- a/toolkit/content/jar.mn +++ b/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 diff --git a/xpfe/global/jar.mn b/xpfe/global/jar.mn index 53cfee3dba08..6c5628acdcf7 100644 --- a/xpfe/global/jar.mn +++ b/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: