More changes to get Transformiix to build as a Mozilla component on windows. Not part of the mozilla build.

git-svn-id: svn://10.0.0.236/trunk@66474 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
nisheeth%netscape.com
2000-04-19 23:07:33 +00:00
parent a267b65ead
commit c2106f0282
4 changed files with 25 additions and 13 deletions

View File

@@ -30,12 +30,14 @@ CPPSRCS= \
AttributeExpr.cpp \
AttributeValueTemplate.cpp \
BasicNodeExpr.cpp \
BooleanExpr.cpp \
BooleanFunctionCall.cpp \
BooleanResult.cpp \
ElementExpr.cpp \
ErrorFunctionCall.cpp \
ExprLexer.cpp \
ExprParser.cpp \
ExtensionFunctionCall.cpp \
FilterExpr.cpp \
FunctionCall.cpp \
IdentityExpr.cpp \
@@ -58,6 +60,7 @@ CPPSRCS= \
UnionExpr.cpp \
VariableRefExpr.cpp \
WildCardExpr.cpp \
XPathNames.cpp \
$(NULL)
CPP_OBJS= \
@@ -65,12 +68,14 @@ CPP_OBJS= \
.\$(OBJDIR)\AttributeExpr.obj \
.\$(OBJDIR)\AttributeValueTemplate.obj \
.\$(OBJDIR)\BasicNodeExpr.obj \
.\$(OBJDIR)\BooleanExpr.obj \
.\$(OBJDIR)\BooleanFunctionCall.obj \
.\$(OBJDIR)\BooleanResult.obj \
.\$(OBJDIR)\ElementExpr.obj \
.\$(OBJDIR)\ErrorFunctionCall.obj \
.\$(OBJDIR)\ExprLexer.obj \
.\$(OBJDIR)\ExprParser.obj \
.\$(OBJDIR)\ExtensionFunctionCall.obj \
.\$(OBJDIR)\FilterExpr.obj \
.\$(OBJDIR)\FunctionCall.obj \
.\$(OBJDIR)\IdentityExpr.obj \
@@ -93,6 +98,7 @@ CPP_OBJS= \
.\$(OBJDIR)\UnionExpr.obj \
.\$(OBJDIR)\VariableRefExpr.obj \
.\$(OBJDIR)\WildCardExpr.obj \
.\$(OBJDIR)\XPathNames.obj \
$(NULL)
EXPORTS = \

View File

@@ -20,7 +20,7 @@
* Keith Visco, kvisco@ziplink.net
* -- original author.
*
* $Id: GenerateIdFunctionCall.cpp,v 1.2 2000-04-19 11:06:09 kvisco%ziplink.net Exp $
* $Id: GenerateIdFunctionCall.cpp,v 1.3 2000-04-19 23:07:31 nisheeth%netscape.com Exp $
*/
#include "XSLTFunctions.h"
@@ -55,7 +55,7 @@ ExprResult* GenerateIdFunctionCall::evaluate(Node* context, ContextState* cs) {
if (argc > 0) {
ListIterator* iter = params.iterator();
Expr* param = iter->next();
Expr* param = (Expr*) iter->next();
delete iter;
ExprResult* exprResult = param->evaluate(context, cs);
if (!exprResult) return new StringResult("");

View File

@@ -21,7 +21,7 @@
DEPTH=..\..\..\..
DIRS=util
DIRS=util functions
LIBRARY_NAME=transformix_xsl
MODULE=transformix
@@ -29,24 +29,30 @@ REQUIRES=xpcom raptor
DEFINES=-DMOZILLA
CPPSRCS= \
XSLTProcessor.cpp \
CPPSRCS= \
Names.cpp \
Numbering.cpp \
OutputFormat.cpp \
ProcessorState.cpp \
Names.cpp \
VariableBinding.cpp \
XSLTProcessor.cpp \
$(NULL)
CPP_OBJS= \
.\$(OBJDIR)\XSLTProcessor.obj \
.\$(OBJDIR)\ProcessorState.obj \
.\$(OBJDIR)\Names.obj \
.\$(OBJDIR)\Names.obj \
.\$(OBJDIR)\Numbering.obj \
.\$(OBJDIR)\OutputFormat.obj \
.\$(OBJDIR)\ProcessorState.obj \
.\$(OBJDIR)\VariableBinding.obj \
.\$(OBJDIR)\XSLTProcessor.obj \
$(NULL)
EXPORTS = \
XSLTProcessor.h \
XSLTProcessor.h \
$(NULL)
LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\raptor -I..\xpath -I..\xml\dom \
-I..\base -I ..\xml -I ..\xml\util -I .\util -I ..\net -I ..\xml\parser
LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\raptor -I..\xpath -I..\xml\dom -I..\xml\dom\mozImpl \
-I..\base -I ..\xml -I ..\xml\util -I .\util -I ..\net -I..\xml\parser -I.\functions
LCFLAGS = \
$(LCFLAGS) \

View File

@@ -39,7 +39,7 @@ EXPORTS = \
$(NULL)
LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\raptor -I..\..\base -I..\..\xml\dom \
-I..\..\xpath -I..\..\xml -I..\ -I..\..\xml\util
-I..\..\xpath -I..\..\xml -I..\ -I..\..\xml\util -I..\functions
LCFLAGS = \
$(LCFLAGS) \