From 15c6b2f1a9675b0684de678e5f3ee5833314996c Mon Sep 17 00:00:00 2001 From: "axel%pike.org" Date: Thu, 25 May 2000 01:03:29 +0000 Subject: [PATCH] Getting us a step closer to xslt on mozilla, see 36038, [NOT PART OF THE BUILD] git-svn-id: svn://10.0.0.236/trunk@70780 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/extensions/transformiix/Makefile.in | 4 + .../extensions/transformiix/build/Makefile.in | 111 +++++++++++++++++- .../transformiix/source/Makefile.in | 6 +- .../transformiix/source/base/Makefile.in | 4 + .../transformiix/source/net/Makefile.in | 4 + .../transformiix/source/xml/Makefile.in | 8 +- .../transformiix/source/xml/dom/Makefile.in | 4 + .../transformiix/source/xml/dom/dom.h | 4 +- .../source/xml/dom/mozImpl/Makefile.in | 6 +- .../source/xml/parser/Makefile.in | 3 + .../transformiix/source/xml/util/Makefile.in | 3 + .../transformiix/source/xpath/Makefile.in | 3 + .../transformiix/source/xslt/Makefile.in | 3 + .../source/xslt/functions/Makefile.in | 3 + .../transformiix/source/xslt/util/Makefile.in | 5 +- 15 files changed, 163 insertions(+), 8 deletions(-) diff --git a/mozilla/extensions/transformiix/Makefile.in b/mozilla/extensions/transformiix/Makefile.in index d07ef1961e0..a6a32cac235 100644 --- a/mozilla/extensions/transformiix/Makefile.in +++ b/mozilla/extensions/transformiix/Makefile.in @@ -28,4 +28,8 @@ include $(DEPTH)/config/autoconf.mk DIRS = source +ifdef MOZ_XSL +DIRS += build +endif + include $(topsrcdir)/config/rules.mk diff --git a/mozilla/extensions/transformiix/build/Makefile.in b/mozilla/extensions/transformiix/build/Makefile.in index 2a628199d84..f44558056bd 100644 --- a/mozilla/extensions/transformiix/build/Makefile.in +++ b/mozilla/extensions/transformiix/build/Makefile.in @@ -19,13 +19,120 @@ # Axel Hecht # -DEPTH = .. +DEPTH = ../../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = junksss +MODULE = transformiix +LIBRARY_NAME = transformiix +SHORT_LIBNAME = t8iix +REQUIRES = xpcom raptor +IS_COMPONENT = 1 + + +CPPSRCS = XSLTProcessorModule.cpp +OBJS =../source/base/ArrayList.o \ + ../source/base/CommandLineUtils.o \ + ../source/base/DefaultStringComparator.o \ + ../source/base/Double.o \ + ../source/base/HashTable.o \ + ../source/base/Integer.o \ + ../source/base/List.o \ + ../source/base/MITREObjectWrapper.o \ + ../source/base/Map.o \ + ../source/base/NamedMap.o \ + ../source/base/SimpleErrorObserver.o \ + ../source/base/Stack.o \ + ../source/base/StringComparator.o \ + ../source/base/StringList.o \ + ../source/base/Tokenizer.o \ + ../source/base/TxString.o \ + ../source/net/URIUtils.o \ + ../source/xml/dom/mozImpl/MozillaAttr.o \ + ../source/xml/dom/mozImpl/MozillaCDATASection.o \ + ../source/xml/dom/mozImpl/MozillaCharacterData.o \ + ../source/xml/dom/mozImpl/MozillaComment.o \ + ../source/xml/dom/mozImpl/MozillaDOMImplementation.o \ + ../source/xml/dom/mozImpl/MozillaDocument.o \ + ../source/xml/dom/mozImpl/MozillaDocumentFragment.o \ + ../source/xml/dom/mozImpl/MozillaDocumentType.o \ + ../source/xml/dom/mozImpl/MozillaElement.o \ + ../source/xml/dom/mozImpl/MozillaEntity.o \ + ../source/xml/dom/mozImpl/MozillaEntityReference.o \ + ../source/xml/dom/mozImpl/MozillaNamedNodeMap.o \ + ../source/xml/dom/mozImpl/MozillaNode.o \ + ../source/xml/dom/mozImpl/MozillaNodeList.o \ + ../source/xml/dom/mozImpl/MozillaNotation.o \ + ../source/xml/dom/mozImpl/MozillaProcInstruction.o \ + ../source/xml/dom/mozImpl/MozillaText.o \ + ../source/xpath/AdditiveExpr.o \ + ../source/xpath/AttributeExpr.o \ + ../source/xpath/AttributeValueTemplate.o \ + ../source/xpath/BasicNodeExpr.o \ + ../source/xpath/BooleanExpr.o \ + ../source/xpath/BooleanFunctionCall.o \ + ../source/xpath/BooleanResult.o \ + ../source/xpath/ElementExpr.o \ + ../source/xpath/ErrorFunctionCall.o \ + ../source/xpath/ExprLexer.o \ + ../source/xpath/ExprParser.o \ + ../source/xpath/ExtensionFunctionCall.o \ + ../source/xpath/FilterExpr.o \ + ../source/xpath/FunctionCall.o \ + ../source/xpath/IdentityExpr.o \ + ../source/xpath/LocationStep.o \ + ../source/xpath/MultiplicativeExpr.o \ + ../source/xpath/NodeSet.o \ + ../source/xpath/NodeSetFunctionCall.o \ + ../source/xpath/NumberExpr.o \ + ../source/xpath/NumberFunctionCall.o \ + ../source/xpath/NumberResult.o \ + ../source/xpath/ParentExpr.o \ + ../source/xpath/PathExpr.o \ + ../source/xpath/PredicateList.o \ + ../source/xpath/RelationalExpr.o \ + ../source/xpath/RootExpr.o \ + ../source/xpath/StringExpr.o \ + ../source/xpath/StringFunctionCall.o \ + ../source/xpath/StringResult.o \ + ../source/xpath/TextExpr.o \ + ../source/xpath/UnionExpr.o \ + ../source/xpath/VariableRefExpr.o \ + ../source/xpath/WildCardExpr.o \ + ../source/xpath/XPathNames.o \ + ../source/xml/XMLUtils.o \ + ../source/xml/XMLDOMUtils.o \ + ../source/xml/util/DOMHelper.o \ + ../source/xml/parser/XMLParser.o \ + ../source/xml/parser/hashtable.o \ + ../source/xml/parser/xmlrole.o \ + ../source/xml/parser/xmlparse.o \ + ../source/xml/parser/xmltok.o \ + ../source/xml/printer/XMLPrinter.o \ + ../source/xml/printer/HTMLPrinter.o \ + ../source/xslt/OutputFormat.o \ + ../source/xslt/Names.o \ + ../source/xslt/Numbering.o \ + ../source/xslt/ProcessorState.o \ + ../source/xslt/VariableBinding.o \ + ../source/xslt/XSLTProcessor.o \ + ../source/xslt/functions/DocumentFunctionCall.o \ + ../source/xslt/functions/GenerateIdFunctionCall.o \ + ../source/xslt/util/NodeSorter.o \ + ../source/xslt/util/NodeStack.o \ + XSLTProcessorModule.o include $(topsrcdir)/config/rules.mk + +DEFINES += -DMOZILLA + +INCLUDES += -I$(srcdir)/../source/xslt -I$(srcdir)/../source/base \ + -I$(srcdir)/../source/net \ + -I$(srcdir)/../source/xml -I$(srcdir)/../source/xml/dom \ + -I$(srcdir)/../source/xml/util \ + -I$(srcdir)/../source/xml/parser -I$(srcdir)/../source/xml/parser/xmlparse \ + -I$(srcdir)/../source/xml/printer -I$(srcdir)/../source/xpath \ + -I$(srcdir)/../source/xslt/util -I$(srcdir)/../source/xslt/functions diff --git a/mozilla/extensions/transformiix/source/Makefile.in b/mozilla/extensions/transformiix/source/Makefile.in index aafd465ee6f..7e4af069c47 100644 --- a/mozilla/extensions/transformiix/source/Makefile.in +++ b/mozilla/extensions/transformiix/source/Makefile.in @@ -26,6 +26,10 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = base net xml xpath xslt main +DIRS = base net xml xpath xslt + +ifndef MOZ_XSL +DIRS += main +endif include $(topsrcdir)/config/rules.mk diff --git a/mozilla/extensions/transformiix/source/base/Makefile.in b/mozilla/extensions/transformiix/source/base/Makefile.in index 5dff5737ad3..c63400becf4 100644 --- a/mozilla/extensions/transformiix/source/base/Makefile.in +++ b/mozilla/extensions/transformiix/source/base/Makefile.in @@ -45,4 +45,8 @@ CPPSRCS = ArrayList.cpp \ include $(topsrcdir)/config/rules.mk +ifdef MOZ_XSL +DEFINES += -DMOZILLA +endif + install:: $(OBJS) \ No newline at end of file diff --git a/mozilla/extensions/transformiix/source/net/Makefile.in b/mozilla/extensions/transformiix/source/net/Makefile.in index 44cac8fc69b..d9d8fae76db 100644 --- a/mozilla/extensions/transformiix/source/net/Makefile.in +++ b/mozilla/extensions/transformiix/source/net/Makefile.in @@ -31,5 +31,9 @@ CPPSRCS = URIUtils.cpp include $(topsrcdir)/config/rules.mk INCLUDES += -I$(srcdir)/../base +ifdef MOZ_XSL +DEFINES += -DMOZILLA +endif + install:: $(OBJS) \ No newline at end of file diff --git a/mozilla/extensions/transformiix/source/xml/Makefile.in b/mozilla/extensions/transformiix/source/xml/Makefile.in index 9824de79f11..edcb5b8d743 100644 --- a/mozilla/extensions/transformiix/source/xml/Makefile.in +++ b/mozilla/extensions/transformiix/source/xml/Makefile.in @@ -26,12 +26,18 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = dom parser printer util +DIRS = dom parser util +ifndef MOZ_XSL +DIRS += printer +endif CPPSRCS = XMLDOMUtils.cpp XMLUtils.cpp include $(topsrcdir)/config/rules.mk INCLUDES += -I$(srcdir)/../base -I$(srcdir)/dom +ifdef MOZ_XSL +DEFINES += -DMOZILLA +endif install:: $(OBJS) \ No newline at end of file diff --git a/mozilla/extensions/transformiix/source/xml/dom/Makefile.in b/mozilla/extensions/transformiix/source/xml/dom/Makefile.in index 3499096da67..b8d04d8a6c1 100644 --- a/mozilla/extensions/transformiix/source/xml/dom/Makefile.in +++ b/mozilla/extensions/transformiix/source/xml/dom/Makefile.in @@ -26,6 +26,10 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk +ifdef MOZ_XSL +DIRS = mozImpl +else DIRS = standalone +endif include $(topsrcdir)/config/rules.mk diff --git a/mozilla/extensions/transformiix/source/xml/dom/dom.h b/mozilla/extensions/transformiix/source/xml/dom/dom.h index fde46c13747..8c755fcc33d 100644 --- a/mozilla/extensions/transformiix/source/xml/dom/dom.h +++ b/mozilla/extensions/transformiix/source/xml/dom/dom.h @@ -16,13 +16,13 @@ * Peter Van der Beken * -- original author * - * $Id: dom.h,v 1.6 2000-05-18 09:17:41 kvisco%ziplink.net Exp $ + * $Id: dom.h,v 1.7 2000-05-25 01:03:20 axel%pike.org Exp $ */ #ifndef MOZILLA #include "standalone/dom.h" #else -#include "mozImpl/dom.h" +#include "mozImpl/mozilladom.h" #endif diff --git a/mozilla/extensions/transformiix/source/xml/dom/mozImpl/Makefile.in b/mozilla/extensions/transformiix/source/xml/dom/mozImpl/Makefile.in index e5e4959a339..0c8c2ff0182 100644 --- a/mozilla/extensions/transformiix/source/xml/dom/mozImpl/Makefile.in +++ b/mozilla/extensions/transformiix/source/xml/dom/mozImpl/Makefile.in @@ -45,6 +45,10 @@ CPPSRCS = MozillaAttr.cpp \ MozillaNotation.cpp \ MozillaProcInstruction.cpp \ MozillaText.cpp \ - testMozDOM.cpp include $(topsrcdir)/config/rules.mk + +INCLUDES += -I$(srcdir)/../../../base +DEFINES += -DMOZILLA + +install:: $(OBJS) diff --git a/mozilla/extensions/transformiix/source/xml/parser/Makefile.in b/mozilla/extensions/transformiix/source/xml/parser/Makefile.in index 821039c82b2..248bcbdc86e 100644 --- a/mozilla/extensions/transformiix/source/xml/parser/Makefile.in +++ b/mozilla/extensions/transformiix/source/xml/parser/Makefile.in @@ -33,5 +33,8 @@ include $(topsrcdir)/config/rules.mk COMPILE_CFLAGS += -DXML_UNICODE -I$(srcdir)/xmltok INCLUDES += -I$(srcdir)/../../base -I$(srcdir)/../dom -I$(srcdir)/xmlparse +ifdef MOZ_XSL +DEFINES += -DMOZILLA +endif install:: $(OBJS) \ No newline at end of file diff --git a/mozilla/extensions/transformiix/source/xml/util/Makefile.in b/mozilla/extensions/transformiix/source/xml/util/Makefile.in index 974ef1d95ae..63bbafa51ea 100644 --- a/mozilla/extensions/transformiix/source/xml/util/Makefile.in +++ b/mozilla/extensions/transformiix/source/xml/util/Makefile.in @@ -31,5 +31,8 @@ CPPSRCS = DOMHelper.cpp include $(topsrcdir)/config/rules.mk INCLUDES += -I$(srcdir)/../../base -I$(srcdir)/../dom +ifdef MOZ_XSL +DEFINES += -DMOZILLA +endif install:: $(OBJS) diff --git a/mozilla/extensions/transformiix/source/xpath/Makefile.in b/mozilla/extensions/transformiix/source/xpath/Makefile.in index 3037ab7d601..f88d1bb9f0d 100644 --- a/mozilla/extensions/transformiix/source/xpath/Makefile.in +++ b/mozilla/extensions/transformiix/source/xpath/Makefile.in @@ -67,5 +67,8 @@ include $(topsrcdir)/config/rules.mk INCLUDES += -I$(srcdir)/../base -I$(srcdir)/../xml \ -I$(srcdir)/../xml/dom -I$(srcdir)/../xslt +ifdef MOZ_XSL +DEFINES += -DMOZILLA +endif install:: $(OBJS) \ No newline at end of file diff --git a/mozilla/extensions/transformiix/source/xslt/Makefile.in b/mozilla/extensions/transformiix/source/xslt/Makefile.in index df6617c4f6c..70b46054785 100644 --- a/mozilla/extensions/transformiix/source/xslt/Makefile.in +++ b/mozilla/extensions/transformiix/source/xslt/Makefile.in @@ -43,5 +43,8 @@ INCLUDES += -I$(srcdir) -I$(srcdir)/../base -I$(srcdir)/../net \ -I$(srcdir)/../xml/printer -I$(srcdir)/../xpath -I$(srcdir)/../xslt/util \ -I$(srcdir)/../xslt/functions COMPILE_CXXFLAGS += -D__cplusplus +ifdef MOZ_XSL +DEFINES += -DMOZILLA +endif install:: $(OBJS) \ No newline at end of file diff --git a/mozilla/extensions/transformiix/source/xslt/functions/Makefile.in b/mozilla/extensions/transformiix/source/xslt/functions/Makefile.in index d8f73e1c4d5..4b5b8b9f2b3 100644 --- a/mozilla/extensions/transformiix/source/xslt/functions/Makefile.in +++ b/mozilla/extensions/transformiix/source/xslt/functions/Makefile.in @@ -38,3 +38,6 @@ INCLUDES += -I$(srcdir)/../../base -I$(srcdir)/../../net \ -I$(srcdir)/../../xslt install:: $(OBJS) +ifdef MOZ_XSL +DEFINES += -DMOZILLA +endif diff --git a/mozilla/extensions/transformiix/source/xslt/util/Makefile.in b/mozilla/extensions/transformiix/source/xslt/util/Makefile.in index 6b4856d3c0a..1b29241cfbb 100644 --- a/mozilla/extensions/transformiix/source/xslt/util/Makefile.in +++ b/mozilla/extensions/transformiix/source/xslt/util/Makefile.in @@ -33,5 +33,8 @@ include $(topsrcdir)/config/rules.mk INCLUDES += -I$(srcdir) -I$(srcdir)/../../base -I$(srcdir)/../../xpath \ -I$(srcdir)/../../xml -I$(srcdir)/../../xml/util -I$(srcdir)/../../xml/dom \ -I$(srcdir)/../../xslt -I$(srcdir)/../../xslt/functions +ifdef MOZ_XSL +DEFINES += -DMOZILLA +endif -install:: $(OBJS) \ No newline at end of file +install:: $(OBJS)