From b3c7820e85f66f243534bfa9312d39f4e6fbc26d Mon Sep 17 00:00:00 2001 From: "heikki%netscape.com" Date: Fri, 1 Feb 2002 22:28:55 +0000 Subject: [PATCH] Bug 122710, dtd folder in dist/bin should be moved into res. r=rbs@maths.uq.edu.au&harishd, sr=sfraser. --- build/mac/build_scripts/MozillaBuildList.pm | 2 +- content/xml/content/src/Makefile.in | 2 +- content/xml/content/src/makefile.win | 3 +- content/xml/document/src/nsFIXptr.cpp | 2 +- content/xml/document/src/nsFIXptr.h | 73 ------------------- embedding/config/basebrowser-unix | 2 +- embedding/config/basebrowser-win | 2 +- .../xmlextras/pointers/src/nsFIXptr.cpp | 2 +- extensions/xmlextras/pointers/src/nsFIXptr.h | 2 +- htmlparser/src/nsExpatDriver.cpp | 9 +-- layout/mathml/content/src/Makefile.in | 2 +- layout/mathml/content/src/makefile.win | 4 +- layout/svg/base/src/Makefile.in | 2 +- layout/svg/base/src/makefile.win | 4 +- parser/htmlparser/src/nsExpatDriver.cpp | 9 +-- xpinstall/packager/packages-mac | 2 +- xpinstall/packager/packages-static-unix | 2 +- xpinstall/packager/packages-static-win | 2 +- xpinstall/packager/packages-unix | 2 +- xpinstall/packager/packages-win | 2 +- 20 files changed, 28 insertions(+), 102 deletions(-) diff --git a/build/mac/build_scripts/MozillaBuildList.pm b/build/mac/build_scripts/MozillaBuildList.pm index e4182e79ffd..cb90c4c7794 100644 --- a/build/mac/build_scripts/MozillaBuildList.pm +++ b/build/mac/build_scripts/MozillaBuildList.pm @@ -192,7 +192,7 @@ sub InstallNonChromeResources() #// Make aliases of resource files #// - MakeAlias(":mozilla:content:xml:content:src:xhtml11.dtd", "$dist_dir"."dtd:"); + MakeAlias(":mozilla:content:xml:content:src:xhtml11.dtd", "$dist_dir"."res:dtd:"); if (! $main::options{mathml}) { diff --git a/content/xml/content/src/Makefile.in b/content/xml/content/src/Makefile.in index d3efcba2701..ea1e148cf2f 100644 --- a/content/xml/content/src/Makefile.in +++ b/content/xml/content/src/Makefile.in @@ -68,4 +68,4 @@ EXPORT_RESOURCE_CONTENT = \ $(srcdir)/xhtml11.dtd \ $(NULL) libs:: - $(INSTALL) $(EXPORT_RESOURCE_CONTENT) $(DIST)/bin/dtd + $(INSTALL) $(EXPORT_RESOURCE_CONTENT) $(DIST)/bin/res/dtd diff --git a/content/xml/content/src/makefile.win b/content/xml/content/src/makefile.win index 0d3c325023c..dd63eeb6d2c 100644 --- a/content/xml/content/src/makefile.win +++ b/content/xml/content/src/makefile.win @@ -63,7 +63,8 @@ include <$(DEPTH)\config\rules.mak> libs:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib - $(MAKE_INSTALL) xhtml11.dtd $(DIST)\bin\dtd + $(MAKE_INSTALL) xhtml11.dtd $(DIST)\bin\res\dtd clobber:: rm -f $(DIST)\lib\$(LIBRARY_NAME).lib + rm -f $(DIST)\bin\res\dtd\xhtml11.dtd diff --git a/content/xml/document/src/nsFIXptr.cpp b/content/xml/document/src/nsFIXptr.cpp index 8962b5c2f19..0c47ca4f95d 100644 --- a/content/xml/document/src/nsFIXptr.cpp +++ b/content/xml/document/src/nsFIXptr.cpp @@ -38,7 +38,7 @@ * ***** END LICENSE BLOCK ***** */ /** - * Implementation for FIXptr, a W3C NOTE. + * Implementation for FIXptr, a W3C proposal. * * http://lists.w3.org/Archives/Public/www-xml-linking-comments/2001AprJun/att-0074/01-NOTE-FIXptr-20010425.htm * diff --git a/content/xml/document/src/nsFIXptr.h b/content/xml/document/src/nsFIXptr.h index 307038e240d..e69de29bb2d 100644 --- a/content/xml/document/src/nsFIXptr.h +++ b/content/xml/document/src/nsFIXptr.h @@ -1,73 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- -*/ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: NPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Netscape 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/NPL/ - * - * 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.org code. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by the Initial Developer are Copyright (C) 2001 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * Heikki Toivonen (original author) - * - * 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 NPL, 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 NPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ - - -/** - * Implementation for FIXptr, a W3C NOTE. - * - * http://lists.w3.org/Archives/Public/www-xml-linking-comments/2001AprJun/att-0074/01-NOTE-FIXptr-20010425.htm - * - */ -#ifndef nsFIXptr_h__ -#define nsFIXptr_h__ - -class nsIDOMDocument; -class nsIDOMRange; -class nsISelection; - -#include "nsString.h" - -class nsFIXptr { - nsFIXptr(); // Use the static members for now - ~nsFIXptr(); - -public: - /** - * Evaluate a FIXptr expression. - * - * @param aDocument The document in which to evaluate. - * @param aExpression The FIXptr expression string to evaluate. - * @param aRange The range. - */ - static nsresult Evaluate(nsIDOMDocument *aDocument, - const nsAString& aExpression, - nsIDOMRange **aRange); -}; - -#endif diff --git a/embedding/config/basebrowser-unix b/embedding/config/basebrowser-unix index 2f087d53922..3df935c8d59 100644 --- a/embedding/config/basebrowser-unix +++ b/embedding/config/basebrowser-unix @@ -119,7 +119,7 @@ components/jsurl.xpt ; layout components/libgkcontent.so -dtd/* +res/dtd/* components/libgklayout.so components/libhtmlpars.so components/libgkview.so diff --git a/embedding/config/basebrowser-win b/embedding/config/basebrowser-win index 1536c10c22e..dbbf6da33e0 100644 --- a/embedding/config/basebrowser-win +++ b/embedding/config/basebrowser-win @@ -127,7 +127,7 @@ components\jsurl.xpt ; layout components\gkcontent.dll -dtd\* +res\dtd\* components\gklayout.dll components\gkparser.dll components\gkview.dll diff --git a/extensions/xmlextras/pointers/src/nsFIXptr.cpp b/extensions/xmlextras/pointers/src/nsFIXptr.cpp index 8962b5c2f19..0c47ca4f95d 100644 --- a/extensions/xmlextras/pointers/src/nsFIXptr.cpp +++ b/extensions/xmlextras/pointers/src/nsFIXptr.cpp @@ -38,7 +38,7 @@ * ***** END LICENSE BLOCK ***** */ /** - * Implementation for FIXptr, a W3C NOTE. + * Implementation for FIXptr, a W3C proposal. * * http://lists.w3.org/Archives/Public/www-xml-linking-comments/2001AprJun/att-0074/01-NOTE-FIXptr-20010425.htm * diff --git a/extensions/xmlextras/pointers/src/nsFIXptr.h b/extensions/xmlextras/pointers/src/nsFIXptr.h index 307038e240d..eae67475918 100644 --- a/extensions/xmlextras/pointers/src/nsFIXptr.h +++ b/extensions/xmlextras/pointers/src/nsFIXptr.h @@ -39,7 +39,7 @@ /** - * Implementation for FIXptr, a W3C NOTE. + * Implementation for FIXptr, a W3C proposal. * * http://lists.w3.org/Archives/Public/www-xml-linking-comments/2001AprJun/att-0074/01-NOTE-FIXptr-20010425.htm * diff --git a/htmlparser/src/nsExpatDriver.cpp b/htmlparser/src/nsExpatDriver.cpp index daa0c818867..1da0240db4c 100644 --- a/htmlparser/src/nsExpatDriver.cpp +++ b/htmlparser/src/nsExpatDriver.cpp @@ -52,7 +52,7 @@ #include "nsTextFormatter.h" static const PRUint32 kNotInDoctype = PRUint32(-1); -static const char* kDTDDirectory = "dtd/"; +static const char* kDTDDirectory = "res/dtd/"; /***************************** EXPAT CALL BACKS *******************************/ @@ -436,10 +436,9 @@ RemapDTD(const XML_Char* aPublicID, nsAWritableCString& aLocalDTD) } // aDTD is an in/out parameter. Returns true if the aDTD is a chrome url or if the -// filename contained within the url exists in the special DTD directory ("dtd" -// relative to the current process directory). For the latter case, aDTD is set -// to the file: url that points to the DTD file found in the local DTD directory -// AND the old URI is relased. +// filename contained within the url exists in the special DTD directory. +// For the latter case, aDTD is set to the file: url that points to the DTD +// file found in the local DTD directory AND the old URI is relased. static PRBool IsLoadableDTD(const XML_Char* aFPIStr, nsCOMPtr* aDTD) { diff --git a/layout/mathml/content/src/Makefile.in b/layout/mathml/content/src/Makefile.in index dabb864a00e..ca8f422010a 100644 --- a/layout/mathml/content/src/Makefile.in +++ b/layout/mathml/content/src/Makefile.in @@ -59,6 +59,6 @@ EXPORT_RESOURCE_CONTENT = \ $(srcdir)/mathml.dtd \ $(NULL) libs:: - $(INSTALL) $(EXPORT_RESOURCE_CONTENT) $(DIST)/bin/dtd + $(INSTALL) $(EXPORT_RESOURCE_CONTENT) $(DIST)/bin/res/dtd $(INSTALL) $(srcdir)/mathml.css $(DIST)/bin/res $(PERL) $(srcdir)/mathml-css.pl $(DIST)/bin/res/ua.css diff --git a/layout/mathml/content/src/makefile.win b/layout/mathml/content/src/makefile.win index 610fcbf9818..0822f77cb15 100644 --- a/layout/mathml/content/src/makefile.win +++ b/layout/mathml/content/src/makefile.win @@ -51,11 +51,11 @@ libs:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib libs:: - $(MAKE_INSTALL) mathml.dtd $(DIST)\bin\dtd + $(MAKE_INSTALL) mathml.dtd $(DIST)\bin\res\dtd $(MAKE_INSTALL) mathml.css $(DIST)\bin\res $(PERL) mathml-css.pl $(DIST)\bin\res\ua.css clobber:: rm -f $(DIST)\lib\$(LIBRARY_NAME).lib - rm -f $(DIST)\bin\dtd\mathml.dtd + rm -f $(DIST)\bin\res\dtd\mathml.dtd rm -f $(DIST)\bin\res\mathml.css diff --git a/layout/svg/base/src/Makefile.in b/layout/svg/base/src/Makefile.in index 47230e2ee13..d4c90555a41 100644 --- a/layout/svg/base/src/Makefile.in +++ b/layout/svg/base/src/Makefile.in @@ -93,4 +93,4 @@ EXPORT_RESOURCE_CONTENT = \ $(srcdir)/svg.dtd \ $(NULL) libs:: - $(INSTALL) $(EXPORT_RESOURCE_CONTENT) $(DIST)/bin/dtd + $(INSTALL) $(EXPORT_RESOURCE_CONTENT) $(DIST)/bin/res/dtd diff --git a/layout/svg/base/src/makefile.win b/layout/svg/base/src/makefile.win index bd86da5d46c..46cd9a23bce 100644 --- a/layout/svg/base/src/makefile.win +++ b/layout/svg/base/src/makefile.win @@ -87,11 +87,11 @@ include <$(DEPTH)\config\rules.mak> libs:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib - $(MAKE_INSTALL) svg.dtd $(DIST)\bin\dtd + $(MAKE_INSTALL) svg.dtd $(DIST)\bin\res\dtd $(MAKE_INSTALL) svg.css $(DIST)\bin\res $(PERL) install-svg-css.pl $(DIST)\bin\res\ua.css clobber:: rm -f $(DIST)\lib\$(LIBRARY_NAME).lib - rm -f $(DIST)\bin\dtd\svg.dtd + rm -f $(DIST)\bin\res\dtd\svg.dtd rm -f $(DIST)\bin\res\svg.css diff --git a/parser/htmlparser/src/nsExpatDriver.cpp b/parser/htmlparser/src/nsExpatDriver.cpp index daa0c818867..1da0240db4c 100644 --- a/parser/htmlparser/src/nsExpatDriver.cpp +++ b/parser/htmlparser/src/nsExpatDriver.cpp @@ -52,7 +52,7 @@ #include "nsTextFormatter.h" static const PRUint32 kNotInDoctype = PRUint32(-1); -static const char* kDTDDirectory = "dtd/"; +static const char* kDTDDirectory = "res/dtd/"; /***************************** EXPAT CALL BACKS *******************************/ @@ -436,10 +436,9 @@ RemapDTD(const XML_Char* aPublicID, nsAWritableCString& aLocalDTD) } // aDTD is an in/out parameter. Returns true if the aDTD is a chrome url or if the -// filename contained within the url exists in the special DTD directory ("dtd" -// relative to the current process directory). For the latter case, aDTD is set -// to the file: url that points to the DTD file found in the local DTD directory -// AND the old URI is relased. +// filename contained within the url exists in the special DTD directory. +// For the latter case, aDTD is set to the file: url that points to the DTD +// file found in the local DTD directory AND the old URI is relased. static PRBool IsLoadableDTD(const XML_Char* aFPIStr, nsCOMPtr* aDTD) { diff --git a/xpinstall/packager/packages-mac b/xpinstall/packager/packages-mac index 0dc69d96fa5..df14f231ddc 100644 --- a/xpinstall/packager/packages-mac +++ b/xpinstall/packager/packages-mac @@ -246,7 +246,7 @@ viewer:defaults:wallet:DistinguishedSchema.tbl viewer:defaults:wallet:SchemaStrings.tbl viewer:defaults:wallet:PositionalSchema.tbl viewer:defaults:wallet:StateSchema.tbl -viewer:dtd:* +viewer:res:dtd:* viewer:res:html:* viewer:res:html.css viewer:res:quirk.css diff --git a/xpinstall/packager/packages-static-unix b/xpinstall/packager/packages-static-unix index 2366ea9d58f..467ff365605 100644 --- a/xpinstall/packager/packages-static-unix +++ b/xpinstall/packager/packages-static-unix @@ -207,7 +207,7 @@ bin/res/rdf/folder-open.gif bin/res/rdf/loading.gif bin/res/ua.css bin/res/forms.css -bin/dtd/* +bin/res/dtd/* ;debug menus reference samples dir - remove for actual releases: bin/res/samples/* bin/res/builtin/htmlBindings.xml diff --git a/xpinstall/packager/packages-static-win b/xpinstall/packager/packages-static-win index 98025b158ab..4f19c618d3f 100644 --- a/xpinstall/packager/packages-static-win +++ b/xpinstall/packager/packages-static-win @@ -207,7 +207,7 @@ bin\res\loading-image.gif bin\res\broken-image.gif bin\res\html\* bin\res\fonts\* -bin\dtd\* +bin\res\dtd\* bin\defaults\wallet\VcardSchema.tbl bin\defaults\wallet\FieldSchema.tbl bin\defaults\wallet\SchemaConcat.tbl diff --git a/xpinstall/packager/packages-unix b/xpinstall/packager/packages-unix index c8288a066a0..0b0319dd0db 100644 --- a/xpinstall/packager/packages-unix +++ b/xpinstall/packager/packages-unix @@ -296,7 +296,7 @@ bin/res/rdf/folder-open.gif bin/res/rdf/loading.gif bin/res/ua.css bin/res/forms.css -bin/dtd/* +bin/res/dtd/* ;debug menus reference samples dir - remove for actual releases: bin/res/samples/* bin/res/builtin/htmlBindings.xml diff --git a/xpinstall/packager/packages-win b/xpinstall/packager/packages-win index 6913cb00022..1f38bc9e112 100644 --- a/xpinstall/packager/packages-win +++ b/xpinstall/packager/packages-win @@ -294,7 +294,7 @@ bin\res\loading-image.gif bin\res\broken-image.gif bin\res\html\* bin\res\fonts\* -bin\dtd\* +bin\res\dtd\* bin\defaults\wallet\VcardSchema.tbl bin\defaults\wallet\FieldSchema.tbl bin\defaults\wallet\SchemaConcat.tbl