richter 01/09/19 23:01:39
Modified: . Tag: Embperl2c Makefile.PL epdat.h epdom.h
driver Tag: Embperl2c eplibxslt.MAKEPL epxalan.MAKEPL
epxalan.cpp
Log:
Xalan
Revision Changes Path
No revision
No revision
1.31.4.24 +19 -12 embperl/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/embperl/Makefile.PL,v
retrieving revision 1.31.4.23
retrieving revision 1.31.4.24
diff -u -r1.31.4.23 -r1.31.4.24
--- Makefile.PL 2001/09/19 10:45:21 1.31.4.23
+++ Makefile.PL 2001/09/20 06:01:39 1.31.4.24
@@ -3,7 +3,7 @@
#
# (C) 1997-2001 G.Richter ([EMAIL PROTECTED]) / ECOS
#
-# $Id: Makefile.PL,v 1.31.4.23 2001/09/19 10:45:21 richter Exp $
+# $Id: Makefile.PL,v 1.31.4.24 2001/09/20 06:01:39 richter Exp $
#
@@ -455,10 +455,11 @@
}
}
+eval 'do "test/conf/config.pl"' ;
+
+
if (!$apache && $apache_src eq '')
{
- eval 'do "test/conf/config.pl"' ;
-
$apache_src = $EPAPACHESRC ;
$loadmodules = $EPMODPERL ;
}
@@ -961,7 +962,6 @@
- close FH ;
}
else
{
@@ -998,7 +998,6 @@
print FH "\$EPWIN32='$win32' ;\n" ;
print FH "\$EPAPACHESRC='" . cnvpath($EPAPACHESRC) . "' ;\n" ;
print FH "\$EPMODPERL='" . cnvpath2unix($loadmodules) . "';\n" ;
- close FH ;
}
# $d .= ' -DPERL_IS_5_6 ' if $] >= 5.006;
@@ -1016,19 +1015,19 @@
my $os_h = "$inc_dir/os.h" ;
$os_h = "$inc_dir/../os/win32/os.h" if (!-e $os_h) ;
- if (open FH, $os_h )
+ if (open FH2, $os_h )
{
- my @conf = <FH> ;
- close FH ;
+ my @conf = <FH2> ;
+ close FH2 ;
if (grep (/winsock2\.h/, @conf))
{
$d .= ' -D_WINSOCK2API_ -D_MSWSOCK_ ' ;
}
- elsif (open FH, "$inc_dir/ap_config.h")
+ elsif (open FH2, "$inc_dir/ap_config.h")
{
- @conf = <FH> ;
- close FH ;
+ @conf = <FH2> ;
+ close FH2 ;
if (grep (/winsock2\.h/, @conf))
{
@@ -1059,7 +1058,7 @@
foreach my $makepl (@makefiles)
{
- print "Exec driver/$makepl\n" ;
+ #print "Exec driver/$makepl\n" ;
my $result = do "driver/$makepl" ;
if ($@)
{
@@ -1075,12 +1074,20 @@
$i .= ' ' . $result->{cflags} ;
$d .= ' ' . $result->{defines} ;
$o .= ' ' . $result->{objects} ;
+ if ($result->{save})
+ {
+ while (($k, $v) = each (%{$result->{save}}))
+ {
+ print FH "$k='" . $v . "';\n" ;
+ }
+ }
}
}
}
+close FH ;
1.20.4.24 +4 -4 embperl/epdat.h
Index: epdat.h
===================================================================
RCS file: /home/cvs/embperl/epdat.h,v
retrieving revision 1.20.4.23
retrieving revision 1.20.4.24
diff -u -r1.20.4.23 -r1.20.4.24
--- epdat.h 2001/09/19 10:45:21 1.20.4.23
+++ epdat.h 2001/09/20 06:01:39 1.20.4.24
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epdat.h,v 1.20.4.23 2001/09/19 10:45:21 richter Exp $
+# $Id: epdat.h,v 1.20.4.24 2001/09/20 06:01:39 richter Exp $
#
###################################################################################*/
@@ -108,9 +108,9 @@
const char * sEndText ; /* string which ends the block */
const char * sNodeName; /* name of the node to create */
int nNodeName ; /* index in string table of node name
*/
- enum tNodeType nNodeType ; /* type of the node that should be created */
- enum tNodeType nCDataType ;/* type for sub nodes that contains text */
- enum tNodeType nForceType ;/* force this type for sub nodes */
+ tNodeType nNodeType ; /* type of the node that should be
created */
+ tNodeType nCDataType ;/* type for sub nodes that contains
text */
+ tNodeType nForceType ;/* force this type for sub nodes */
int bUnescape ; /* translate input? */
int bAddFlags ; /* add flags to node */
int bRemoveSpaces ; /* 1 remove spaces before tag,
2 remove after */
1.4.2.24 +2 -2 embperl/Attic/epdom.h
Index: epdom.h
===================================================================
RCS file: /home/cvs/embperl/Attic/epdom.h,v
retrieving revision 1.4.2.23
retrieving revision 1.4.2.24
diff -u -r1.4.2.23 -r1.4.2.24
--- epdom.h 2001/09/10 10:06:08 1.4.2.23
+++ epdom.h 2001/09/20 06:01:39 1.4.2.24
@@ -9,7 +9,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epdom.h,v 1.4.2.23 2001/09/10 10:06:08 richter Exp $
+# $Id: epdom.h,v 1.4.2.24 2001/09/20 06:01:39 richter Exp $
#
###################################################################################*/
@@ -104,7 +104,7 @@
*/
-enum tNodeType
+enum tNodeTypeValues
{
ntypTag = 1,
ntypStartTag = 1 + 0x20,
No revision
No revision
1.1.2.2 +2 -1 embperl/driver/Attic/eplibxslt.MAKEPL
Index: eplibxslt.MAKEPL
===================================================================
RCS file: /home/cvs/embperl/driver/Attic/eplibxslt.MAKEPL,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- eplibxslt.MAKEPL 2001/09/19 10:45:22 1.1.2.1
+++ eplibxslt.MAKEPL 2001/09/20 06:01:39 1.1.2.2
@@ -45,7 +45,8 @@
libs => "$libs $libs2",
inc => $prefix eq $prefix2?"-I$prefix/include":"-I$prefix/include
-I$prefix2/include",
defines => '-DLIBXSLT',
- objects => 'driver/eplibxslt$(OBJ_EXT)'} ;
+ objects => 'driver/eplibxslt$(OBJ_EXT)',
+ save => { '$LIBXSLTVERSION' => $version2 }} ;
}
print "Win32 currently does not support libxml2\n" ;
1.1.2.2 +62 -5 embperl/driver/Attic/epxalan.MAKEPL
Index: epxalan.MAKEPL
===================================================================
RCS file: /home/cvs/embperl/driver/Attic/epxalan.MAKEPL,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- epxalan.MAKEPL 2001/09/19 21:25:19 1.1.2.1
+++ epxalan.MAKEPL 2001/09/20 06:01:39 1.1.2.2
@@ -1,12 +1,20 @@
+use File::Find ;
+use Cwd ;
$win32 = ($^O eq 'MSWin32') ;
if (!$win32)
{
- $path = GetString ("Enter path of XALAN base directory", '') ;
+ $path = GetString ("Enter path of XALAN base directory or single dot for not
using XALAN", $XALANPATH) ;
+ if (!$path || $path eq '.')
+ {
+ print "Xalan will not be linked into Embperl\n" ;
+ return undef ;
+ }
+
if (!-f "$path/src/XalanTransformer/XalanTransformer.hpp")
{
if (!-f "$path/c/src/XalanTransformer/XalanTransformer.hpp")
@@ -27,13 +35,62 @@
}
}
+ my $currdir = Cwd::fastcwd ;
- return { cflags => "-I $path/src",
- libs => "-L $path/lib -lxalan",
+ eval { find (\&xalanlib, "$path/lib") ; } ;
+ $@ = '' ;
+ chdir ($currdir);
+ if (!$xalanlib)
+ {
+ print "Xalan library not found under $path\n" ;
+ return undef ;
+ }
+
+ my $xpath = Cwd::fast_abs_path ("$path/../..") ;
+ eval { find (\&xerceslib, $xpath) ; } ;
+ $@ = '' ;
+ chdir ($currdir);
+ if (!$xerceslib)
+ {
+ print "Xerces library not found under $xpath/../..\n" ;
+ return undef ;
+ }
+
+
+ print "Found Xalan library $xalanlib at $xalanlibpath\n" ;
+ print "Found Xerces library $xerceslib at $xerceslibpath\n" ;
+
+ "$xalanlib $xerceslib" =~ /^lib(.*?)\.so lib(.*?)\.so$/ ;
+
+ return { cflags => "-I$path/src -I$xerceslibpath/../include ",
+ libs => "-L$xalanlibpath -L$xerceslibpath -l$1 -l$2",
defines => '-DXALAN',
- objects => 'driver/epxalan$(OBJ_EXT)'} ;
+ objects => 'driver/epxalan$(OBJ_EXT)',
+ save => { '$XALANPATH' => $path }} ;
}
-print "xalan is currently does not supported on Win32\n" ;
+print "Xalan is currently does not supported on Win32\n" ;
return undef ;
+
+
+sub xalanlib
+
+ {
+ if (/^libxalan.*\.so/)
+ {
+ $xalanlibpath = $File::Find::dir ;
+ die $xalanlib = $_ ;
+ }
+ }
+
+
+sub xerceslib
+
+ {
+ if (/^libxerces.*\.so/)
+ {
+ $xerceslibpath = $File::Find::dir ;
+ die $xerceslib = $_ ;
+ }
+ }
1.1.2.2 +10 -6 embperl/driver/Attic/epxalan.cpp
Index: epxalan.cpp
===================================================================
RCS file: /home/cvs/embperl/driver/Attic/epxalan.cpp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- epxalan.cpp 2001/09/19 21:25:19 1.1.2.1
+++ epxalan.cpp 2001/09/20 06:01:39 1.1.2.2
@@ -10,16 +10,17 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epxalan.cpp,v 1.1.2.1 2001/09/19 21:25:19 richter Exp $
+# $Id: epxalan.cpp,v 1.1.2.2 2001/09/20 06:01:39 richter Exp $
#
###################################################################################*/
-#include "../ep.h"
-#include "../epmacro.h"
-
#include <Include/PlatformDefinitions.hpp>
+#include <util/PlatformUtils.hpp>
+#include <XalanTransformer/XalanTransformer.hpp>
+
+#ifdef x
#if defined(XALAN_OLD_STREAM_HEADERS)
#include <iostream.h>
#include <strstream.h>
@@ -29,13 +30,16 @@
#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 ;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
