Bug 122710, dtd folder in dist/bin should be moved into res. r=rbs@maths.uq.edu.au&harishd, sr=sfraser.

This commit is contained in:
heikki%netscape.com 2002-02-01 22:28:55 +00:00
parent 2707adc521
commit 3a6fb922c1
20 changed files with 29 additions and 30 deletions

View File

@ -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})
{

View File

@ -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

View File

@ -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

View File

@ -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
*

View File

@ -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
*

View File

@ -119,7 +119,7 @@ components/jsurl.xpt
; layout
components/libgkcontent.so
dtd/*
res/dtd/*
components/libgklayout.so
components/libhtmlpars.so
components/libgkview.so

View File

@ -127,7 +127,7 @@ components\jsurl.xpt
; layout
components\gkcontent.dll
dtd\*
res\dtd\*
components\gklayout.dll
components\gkparser.dll
components\gkview.dll

View File

@ -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
*

View File

@ -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
*

View File

@ -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<nsIURI>* aDTD)
{

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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<nsIURI>* aDTD)
{

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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