richter 01/09/20 01:23:56
Modified: . Tag: Embperl2c Makefile.PL ep.h epapinit.c epmain.c
epparse.c test.pl
driver Tag: Embperl2c epxalan.MAKEPL epxalan.cpp
Log:
XALAN
Revision Changes Path
No revision
No revision
1.31.4.25 +2 -1 embperl/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/embperl/Makefile.PL,v
retrieving revision 1.31.4.24
retrieving revision 1.31.4.25
diff -u -r1.31.4.24 -r1.31.4.25
--- Makefile.PL 2001/09/20 06:01:39 1.31.4.24
+++ Makefile.PL 2001/09/20 08:23:55 1.31.4.25
@@ -3,7 +3,7 @@
#
# (C) 1997-2001 G.Richter ([EMAIL PROTECTED]) / ECOS
#
-# $Id: Makefile.PL,v 1.31.4.24 2001/09/20 06:01:39 richter Exp $
+# $Id: Makefile.PL,v 1.31.4.25 2001/09/20 08:23:55 richter Exp $
#
@@ -182,10 +182,11 @@
my $txt = $self -> MM::c_o (@_) ;
- $txt =~ s/\$\*/-o \$*.o \$*/ ;
+ $txt =~ s/\$\*/-o \$*\$(OBJ_EXT) \$*/g ;
return $txt ;
}
+
sub MY::cflags
1.27.4.18 +1 -1 embperl/ep.h
Index: ep.h
===================================================================
RCS file: /home/cvs/embperl/ep.h,v
retrieving revision 1.27.4.17
retrieving revision 1.27.4.18
diff -u -r1.27.4.17 -r1.27.4.18
--- ep.h 2001/08/29 08:25:22 1.27.4.17
+++ ep.h 2001/09/20 08:23:55 1.27.4.18
@@ -144,7 +144,7 @@
#endif
-module MODULE_VAR_EXPORT embperl_module;
+void embperl_ApacheAddModule () ;
#endif
1.1.2.5 +27 -19 embperl/epapinit.c
Index: epapinit.c
===================================================================
RCS file: /home/cvs/embperl/epapinit.c,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- epapinit.c 2001/04/26 06:44:26 1.1.2.4
+++ epapinit.c 2001/09/20 08:23:55 1.1.2.5
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epapinit.c,v 1.1.2.4 2001/04/26 06:44:26 richter Exp $
+# $Id: epapinit.c,v 1.1.2.5 2001/09/20 08:23:55 richter Exp $
#
###################################################################################*/
@@ -19,33 +19,19 @@
#ifdef APACHE
-static void embperl_ApacheInitCleanup (void * p)
-
- {
- /* make sure embperl module is removed before mod_perl */
- ap_remove_module (&embperl_module) ;
- }
-
-static void embperl_ApacheInit (server_rec *s, pool *p)
+static void embperl_ApacheInit (server_rec *s, pool *p) ;
+static void embperl_ApacheInitCleanup (void * p) ;
- {
- pool * subpool = ap_make_sub_pool(p);
- ap_register_cleanup(subpool, NULL, embperl_ApacheInitCleanup,
embperl_ApacheInitCleanup);
- ap_add_version_component ("Embperl/"VERSION) ;
- }
-
-
-
-
static const command_rec embperl_cmds[] =
{
{NULL}
};
-module MODULE_VAR_EXPORT embperl_module = {
+/* static module MODULE_VAR_EXPORT embperl_module = { */
+static module embperl_module = {
STANDARD_MODULE_STUFF,
embperl_ApacheInit, /* initializer */
NULL, /* dir config creater */
@@ -67,5 +53,27 @@
NULL /* post read-request */
};
+
+void embperl_ApacheAddModule ()
+
+ {
+ ap_add_module (&embperl_module) ;
+ }
+
+static void embperl_ApacheInit (server_rec *s, pool *p)
+
+ {
+ pool * subpool = ap_make_sub_pool(p);
+
+ ap_register_cleanup(subpool, NULL, embperl_ApacheInitCleanup,
embperl_ApacheInitCleanup);
+ ap_add_version_component ("Embperl/"VERSION) ;
+ }
+
+static void embperl_ApacheInitCleanup (void * p)
+
+ {
+ /* make sure embperl module is removed before mod_perl */
+ ap_remove_module (&embperl_module) ;
+ }
#endif
1.75.4.44 +15 -2 embperl/epmain.c
Index: epmain.c
===================================================================
RCS file: /home/cvs/embperl/epmain.c,v
retrieving revision 1.75.4.43
retrieving revision 1.75.4.44
diff -u -r1.75.4.43 -r1.75.4.44
--- epmain.c 2001/09/19 12:23:59 1.75.4.43
+++ epmain.c 2001/09/20 08:23:55 1.75.4.44
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epmain.c,v 1.75.4.43 2001/09/19 12:23:59 richter Exp $
+# $Id: epmain.c,v 1.75.4.44 2001/09/20 08:23:55 richter Exp $
#
###################################################################################*/
@@ -1393,7 +1393,7 @@
r -> pApacheReq = NULL ;
if (_nIOType == epIOMod_Perl)
{
- ap_add_module (&embperl_module) ;
+ embperl_ApacheAddModule () ;
}
#endif
r -> bReqRunning = 0 ;
@@ -3054,6 +3054,19 @@
return rc ;
#else
strcpy (r -> errdat1, "libxslt not supported") ;
+ return 9999 ;
+#endif
+ }
+ else if (strstr (r -> pConf -> sRecipe, "Xalan"))
+ {
+#ifdef XALAN
+ if (r -> bDebug & dbgXSLT)
+ lprintf (r, "[%d]XSLT: call xalan\n", r -> nPid) ;
+
+ if ((rc = embperl_Xalan_Text2Text (r, r -> pConf ->
pReqParameter, pOut)) != ok)
+ return rc ;
+#else
+ strcpy (r -> errdat1, "xalan not supported") ;
return 9999 ;
#endif
}
1.4.2.35 +4 -4 embperl/Attic/epparse.c
Index: epparse.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epparse.c,v
retrieving revision 1.4.2.34
retrieving revision 1.4.2.35
diff -u -r1.4.2.34 -r1.4.2.35
--- epparse.c 2001/09/18 18:01:45 1.4.2.34
+++ epparse.c 2001/09/20 08:23:55 1.4.2.35
@@ -9,7 +9,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epparse.c,v 1.4.2.34 2001/09/18 18:01:45 richter Exp $
+# $Id: epparse.c,v 1.4.2.35 2001/09/20 08:23:55 richter Exp $
#
###################################################################################*/
@@ -550,8 +550,8 @@
struct tTokenTable * pTokenTable,
const char * sEndText,
const unsigned char * pParentContains,
- enum tNodeType nCDataType,
- enum tNodeType nForceType,
+ tNodeType nCDataType,
+ tNodeType nForceType,
int bUnescape,
int bInsideMustExist,
int bRemoveSpaces,
@@ -595,7 +595,7 @@
{ /* valid token start char found */
struct tTokenTable * pNextTokenTab = pTokenTable ;
tStringIndex nNodeName = 0 ;
- enum tNodeType nNodeType = 0 ;
+ tNodeType nNodeType = 0 ;
char * pCurrTokenStart = pCurr ;
1.70.4.76 +8 -1 embperl/test.pl
Index: test.pl
===================================================================
RCS file: /home/cvs/embperl/test.pl,v
retrieving revision 1.70.4.75
retrieving revision 1.70.4.76
diff -u -r1.70.4.75 -r1.70.4.76
--- test.pl 2001/09/19 12:23:59 1.70.4.75
+++ test.pl 2001/09/20 08:23:55 1.70.4.76
@@ -11,7 +11,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: test.pl,v 1.70.4.75 2001/09/19 12:23:59 richter Exp $
+# $Id: test.pl,v 1.70.4.76 2001/09/20 08:23:55 richter Exp $
#
###################################################################################
@@ -710,6 +710,13 @@
'version' => 2,
'recipe' => 'LibXSLT',
'xsltstylesheet' => 'pod.xsl',
+ 'condition' => '$LIBXSLTVERSION',
+ },
+ 'xml/pod.xml' => {
+ 'version' => 2,
+ 'recipe' => 'XALAN-XSLT',
+ 'xsltstylesheet' => 'pod.xsl',
+ 'condition' => '$XALANPATH',
},
'pod/pod.asc' => {
'version' => 2,
No revision
No revision
1.1.2.3 +1 -1 embperl/driver/Attic/epxalan.MAKEPL
Index: epxalan.MAKEPL
===================================================================
RCS file: /home/cvs/embperl/driver/Attic/epxalan.MAKEPL,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- epxalan.MAKEPL 2001/09/20 06:01:39 1.1.2.2
+++ epxalan.MAKEPL 2001/09/20 08:23:56 1.1.2.3
@@ -62,7 +62,7 @@
"$xalanlib $xerceslib" =~ /^lib(.*?)\.so lib(.*?)\.so$/ ;
- return { cflags => "-I$path/src -I$xerceslibpath/../include ",
+ return { cflags => "-I$path/src -I$xerceslibpath/../include -instances=static
-D_REENTRANT ",
libs => "-L$xalanlibpath -L$xerceslibpath -l$1 -l$2",
defines => '-DXALAN',
objects => 'driver/epxalan$(OBJ_EXT)',
1.1.2.3 +17 -11 embperl/driver/Attic/epxalan.cpp
Index: epxalan.cpp
===================================================================
RCS file: /home/cvs/embperl/driver/Attic/epxalan.cpp,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- epxalan.cpp 2001/09/20 06:01:39 1.1.2.2
+++ epxalan.cpp 2001/09/20 08:23:56 1.1.2.3
@@ -10,17 +10,23 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epxalan.cpp,v 1.1.2.2 2001/09/20 06:01:39 richter Exp $
+# $Id: epxalan.cpp,v 1.1.2.3 2001/09/20 08:23:56 richter Exp $
#
###################################################################################*/
+extern "C"
+{
-#include <Include/PlatformDefinitions.hpp>
-#include <util/PlatformUtils.hpp>
-#include <XalanTransformer/XalanTransformer.hpp>
+#include "../ep.h"
+#include "../epmacro.h"
+}
+
+#undef bool
+#undef HAS_BOOL
+#undef assert
+#include <Include/PlatformDefinitions.hpp>
-#ifdef x
#if defined(XALAN_OLD_STREAM_HEADERS)
#include <iostream.h>
#include <strstream.h>
@@ -29,16 +35,16 @@
#include <iostream>
#include <strstream>
#include <fstream>
-#endif
#endif
+#include <util/PlatformUtils.hpp>
+#include <XalanTransformer/XalanTransformer.hpp>
+
extern "C"
{
-//#include "../ep.h"
-//#include "../epmacro.h"
static int bInitDone = 0 ;
@@ -52,8 +58,8 @@
/* */
/* ------------------------------------------------------------------------ */
-static int iowrite (const char *buffer,
- int len,
+static long unsigned int iowrite (const char *buffer,
+ long unsigned int len,
void *context)
{
@@ -126,7 +132,7 @@
n++ ;
}
- if (!(pParamArray = _malloc(r, sizeof (const char *) * (n + 1) * 2)))
+ if (!(pParamArray = (const char * *)_malloc(r, sizeof (const char *) * (n + 1)
* 2)))
return rcOutOfMemory ;
n = 0 ;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
