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
2000-05-25 01:03:29 +00:00
parent 35c6afda66
commit 15c6b2f1a9
15 changed files with 163 additions and 8 deletions
--- 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
--- a/mozilla/extensions/transformiix/build/Makefile.in
+++ b/mozilla/extensions/transformiix/build/Makefile.in
@@ -19,13 +19,120 @@
 #	Axel Hecht <axel@pike.org>
 # 

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


--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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
--- 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)
+install:: $(OBJS)