You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by ja...@apache.org on 2006/01/02 05:56:43 UTC
svn commit: r365289 [1/4] - in /xerces/xerces-p/trunk: ./ Handler/ docs/
interface/ interface/Perl/ t/
Author: jasons
Date: Sun Jan 1 20:55:53 2006
New Revision: 365289
URL: http://svn.apache.org/viewcvs?rev=365289&view=rev
Log:
interface/Perl - now all language specific interface files live in a directory
interface/defines.i - removed Perl-specific includes and code
interface/DOM.i
interface/parsers.i - made exception code macro to reduce code size
memtest.pl
docs/memtest.txt - cruft
META.yml
MANIFEST
MANIFEST.SKIP
Changes
Xerces.pm
Xerces.cpp - new
Xerces.i - made exception code macro to reduce code size
- wrapped perl-specific code in ifdef
Makefile.PL - updated for 2.7.0
- fixed interface file dependency list
interface/Perl.i - moved to interface/Perl/shadow.i
interface/typemaps-xmlch.i
interface/typemaps-general.i - removed perl-specific code
interface/typemaps.i - added ifdef for Perl
t/01utf8.t - new test for BBC contract to fix UTF8 support
t/DOMWriter.t
t/DOMNode.t - added names to tests
t/MemBufInputSource.t - test use 'is' now
Handler/PerlCallbackHandler.cpp
Handler/PerlCallbackHandler.hpp - added XMLString2Perl()
Handler/PerlNodeFilterCallbackHandler.i
Handler/PerlEntityResolverHandler.i - minor change
Added:
xerces/xerces-p/trunk/interface/Perl/
xerces/xerces-p/trunk/interface/Perl/callback.i
xerces/xerces-p/trunk/interface/Perl/defines.i
xerces/xerces-p/trunk/interface/Perl/errors.i
xerces/xerces-p/trunk/interface/Perl/shadow.i
- copied, changed from r357987, xerces/xerces-p/trunk/interface/Perl.i
xerces/xerces-p/trunk/interface/Perl/transcode.i
xerces/xerces-p/trunk/interface/Perl/typemaps-xmlch.i
- copied unchanged from r357987, xerces/xerces-p/trunk/interface/typemaps-xmlch.i
xerces/xerces-p/trunk/interface/Perl/typemaps.i
xerces/xerces-p/trunk/t/01utf8.t
Removed:
xerces/xerces-p/trunk/docs/memtest.txt
xerces/xerces-p/trunk/interface/Perl.i
xerces/xerces-p/trunk/interface/typemaps-xmlch.i
xerces/xerces-p/trunk/memtest.pl
Modified:
xerces/xerces-p/trunk/Changes
xerces/xerces-p/trunk/Handler/PerlCallbackHandler.cpp
xerces/xerces-p/trunk/Handler/PerlCallbackHandler.hpp
xerces/xerces-p/trunk/Handler/PerlContentCallbackHandler.cpp
xerces/xerces-p/trunk/Handler/PerlDocumentCallbackHandler.cpp
xerces/xerces-p/trunk/Handler/PerlEntityResolverHandler.i
xerces/xerces-p/trunk/Handler/PerlNodeFilterCallbackHandler.i
xerces/xerces-p/trunk/MANIFEST
xerces/xerces-p/trunk/MANIFEST.SKIP
xerces/xerces-p/trunk/META.yml
xerces/xerces-p/trunk/Makefile.PL
xerces/xerces-p/trunk/Xerces.cpp
xerces/xerces-p/trunk/Xerces.i
xerces/xerces-p/trunk/Xerces.pm
xerces/xerces-p/trunk/interface/DOM.i
xerces/xerces-p/trunk/interface/defines.i
xerces/xerces-p/trunk/interface/parsers.i
xerces/xerces-p/trunk/interface/typemaps-general.i
xerces/xerces-p/trunk/interface/typemaps.i
xerces/xerces-p/trunk/t/DOMNode.t
xerces/xerces-p/trunk/t/DOMWriter.t
xerces/xerces-p/trunk/t/MemBufInputSource.t
Modified: xerces/xerces-p/trunk/Changes
URL: http://svn.apache.org/viewcvs/xerces/xerces-p/trunk/Changes?rev=365289&r1=365288&r2=365289&view=diff
==============================================================================
--- xerces/xerces-p/trunk/Changes (original)
+++ xerces/xerces-p/trunk/Changes Sun Jan 1 20:55:53 2006
@@ -1,5 +1,11 @@
Revision history for Perl extension XML::Xerces.
+2.7.0-0 Sun Jan 1 08:44:27 IST 2006
+ - first public 2.7 release
+ - working with SWIG-1.3.28 pre-release
+ - removed all uses of XMLString::transcode() from the Perl
+ callback handler classes in Handler/
+
2.6.0-2
- first public 2.6 release
- all known memory leaks fixed
Modified: xerces/xerces-p/trunk/Handler/PerlCallbackHandler.cpp
URL: http://svn.apache.org/viewcvs/xerces/xerces-p/trunk/Handler/PerlCallbackHandler.cpp?rev=365289&r1=365288&r2=365289&view=diff
==============================================================================
--- xerces/xerces-p/trunk/Handler/PerlCallbackHandler.cpp (original)
+++ xerces/xerces-p/trunk/Handler/PerlCallbackHandler.cpp Sun Jan 1 20:55:53 2006
@@ -17,7 +17,22 @@
#include <stdlib.h>
#include "PerlCallbackHandler.hpp"
+XMLTranscoder* UTF8_TRANSCODER = NULL;
+
PerlCallbackHandler::PerlCallbackHandler() {
+ if (UTF8_TRANSCODER == NULL)
+ {
+ XMLTransService::Codes failReason;
+ XMLCh* UTF8_ENCODING = XMLString::transcode("UTF-8");
+ UTF8_TRANSCODER =
+ XMLPlatformUtils::fgTransService->makeNewTranscoderFor(UTF8_ENCODING,
+ failReason,
+ 1024,
+ XMLPlatformUtils::fgMemoryManager);
+ if (UTF8_TRANSCODER == NULL) {
+ croak("ERROR: PerlCallbackHandler Could not create UTF-8 transcoder");
+ }
+ }
callbackObj = NULL;
// printf("PerlCallback: constructor");
}
@@ -58,3 +73,29 @@
return oldRef;
}
+SV*
+PerlCallbackHandler::XMLString2Perl(const XMLCh* input) {
+ SV *output;
+ unsigned int charsEaten = 0;
+ int length = XMLString::stringLen(input); // string length
+ // use +1 to make room for the '\0' at the end of the string
+ // in the pathological case when each character of the string
+ // is UTF8_MAXLEN bytes long
+ XMLByte* res = new XMLByte[(length * UTF8_MAXLEN) + 1]; // output string
+
+ unsigned int total_chars =
+ UTF8_TRANSCODER->transcodeTo((const XMLCh*) input,
+ (unsigned int) length,
+ (XMLByte*) res,
+ (unsigned int) (length*UTF8_MAXLEN),
+ charsEaten,
+ XMLTranscoder::UnRep_Throw
+ );
+ res[total_chars] = '\0';
+
+ output = sv_newmortal();
+ sv_setpv((SV*)output, (char *)res );
+ SvUTF8_on((SV*)output);
+ delete[] res;
+ return output;
+}
Modified: xerces/xerces-p/trunk/Handler/PerlCallbackHandler.hpp
URL: http://svn.apache.org/viewcvs/xerces/xerces-p/trunk/Handler/PerlCallbackHandler.hpp?rev=365289&r1=365288&r2=365289&view=diff
==============================================================================
--- xerces/xerces-p/trunk/Handler/PerlCallbackHandler.hpp (original)
+++ xerces/xerces-p/trunk/Handler/PerlCallbackHandler.hpp Sun Jan 1 20:55:53 2006
@@ -56,6 +56,12 @@
#define PERLCALLBACKHANDLER_CONTENT_TYPE 3
#define PERLCALLBACKHANDLER_DOCUMENT_TYPE 4
+#include "xercesc/util/TransService.hpp"
+#include "xercesc/util/XMLString.hpp"
+#include "xercesc/util/PlatformUtils.hpp"
+
+XERCES_CPP_NAMESPACE_USE
+
class PerlCallbackHandler {
private:
@@ -74,6 +80,7 @@
virtual int type() {return PERLCALLBACKHANDLER_BASE_TYPE;}
SV* set_callback_obj(SV*);
+ SV* XMLString2Perl(const XMLCh*);
};
#endif /* __PERLCALLBACKHANDLER */
Modified: xerces/xerces-p/trunk/Handler/PerlContentCallbackHandler.cpp
URL: http://svn.apache.org/viewcvs/xerces/xerces-p/trunk/Handler/PerlContentCallbackHandler.cpp?rev=365289&r1=365288&r2=365289&view=diff
==============================================================================
--- xerces/xerces-p/trunk/Handler/PerlContentCallbackHandler.cpp (original)
+++ xerces/xerces-p/trunk/Handler/PerlContentCallbackHandler.cpp Sun Jan 1 20:55:53 2006
@@ -61,21 +61,15 @@
XPUSHs(callbackObj);
// the next argument is the uri
- char *cptr1 = XMLString::transcode(uri);
- SV *string1 = sv_newmortal();
- sv_setpv(string1, (char *)cptr1);
+ SV *string1 = XMLString2Perl(uri);
XPUSHs(string1);
// the next argument is the localname
- char *cptr2 = XMLString::transcode(localname);
- SV *string2 = sv_newmortal();
- sv_setpv(string2, (char *)cptr2);
+ SV *string2 = XMLString2Perl(localname);
XPUSHs(string2);
// the next argument is the qname
- char *cptr3 = XMLString::transcode(qname);
- SV *string3 = sv_newmortal();
- sv_setpv(string3, (char *)cptr3);
+ SV *string3 = XMLString2Perl(qname);
XPUSHs(string3);
// next is the attributes
@@ -87,11 +81,6 @@
perl_call_method("start_element", G_VOID);
- // transcode mallocs this and leaves it up to us to free the memory
- delete [] cptr1;
- delete [] cptr2;
- delete [] cptr3;
-
FREETMPS;
LEAVE;
}
@@ -113,32 +102,21 @@
XPUSHs(callbackObj);
// the next argument is the uri
- char *cptr1 = XMLString::transcode(uri);
- SV *string1 = sv_newmortal();
- sv_setpv(string1, (char *)cptr1);
+ SV *string1 = XMLString2Perl(uri);
XPUSHs(string1);
// the next argument is the localname
- char *cptr2 = XMLString::transcode(localname);
- SV *string2 = sv_newmortal();
- sv_setpv(string2, (char *)cptr2);
+ SV *string2 = XMLString2Perl(localname);
XPUSHs(string2);
// the next argument is the qname
- char *cptr3 = XMLString::transcode(qname);
- SV *string3 = sv_newmortal();
- sv_setpv(string3, (char *)cptr3);
+ SV *string3 = XMLString2Perl(qname);
XPUSHs(string3);
PUTBACK;
perl_call_method("end_element", G_VOID);
- // transcode mallocs this and leaves it up to us to free the memory
- delete [] cptr1;
- delete [] cptr2;
- delete [] cptr3;
-
FREETMPS;
LEAVE;
}
@@ -158,10 +136,8 @@
// first put the callback object on the stack
XPUSHs(callbackObj);
- // the next argument is the element name
- char *cptr = XMLString::transcode(chars);
- SV *string = sv_newmortal();
- sv_setpv(string, (char *)cptr);
+ // the next argument is the char data
+ SV *string = XMLString2Perl(chars);
XPUSHs(string);
// next is the length
@@ -171,9 +147,6 @@
perl_call_method("characters", G_VOID);
- // transcode mallocs this and leaves it up to us to free the memory
- delete [] cptr;
-
FREETMPS;
LEAVE;
}
@@ -192,10 +165,8 @@
// first put the callback object on the stack
XPUSHs(callbackObj);
- // the next argument is the element name
- char *cptr = XMLString::transcode(chars);
- SV *string = sv_newmortal();
- sv_setpv(string, (char *)cptr);
+ // the next argument is the char data
+ SV *string = XMLString2Perl(chars);
XPUSHs(string);
// next is the length
@@ -205,9 +176,6 @@
perl_call_method("ignorable_whitespace", G_VOID);
- // transcode mallocs this and leaves it up to us to free the memory
- delete [] cptr;
-
FREETMPS;
LEAVE;
}
@@ -296,25 +264,17 @@
XPUSHs(callbackObj);
// the next argument is the target
- char *cptr1 = XMLString::transcode(target);
- SV *string1 = sv_newmortal();
- sv_setpv(string1, (char *)cptr1);
+ SV *string1 = XMLString2Perl(target);
XPUSHs(string1);
// the next argument is the data
- char *cptr2 = XMLString::transcode(data);
- SV *string2 = sv_newmortal();
- sv_setpv(string2, (char *)cptr2);
+ SV *string2 = XMLString2Perl(data);
XPUSHs(string2);
PUTBACK;
perl_call_method("processing_instruction", G_VOID);
- // transcode mallocs this and leaves it up to us to free the memory
- delete [] cptr1;
- delete [] cptr2;
-
FREETMPS;
LEAVE;
}
@@ -363,25 +323,17 @@
XPUSHs(callbackObj);
// the next argument is the prefix
- char *cptr1 = XMLString::transcode(prefix);
- SV *string1 = sv_newmortal();
- sv_setpv(string1, (char *)cptr1);
+ SV *string1 = XMLString2Perl(prefix);
XPUSHs(string1);
// the next argument is the uri
- char *cptr2 = XMLString::transcode(uri);
- SV *string2 = sv_newmortal();
- sv_setpv(string2, (char *)cptr2);
+ SV *string2 = XMLString2Perl(uri);
XPUSHs(string2);
PUTBACK;
perl_call_method("start_prefix_mapping", G_VOID);
- // transcode mallocs this and leaves it up to us to free the memory
- delete [] cptr1;
- delete [] cptr2;
-
FREETMPS;
LEAVE;
}
@@ -401,18 +353,13 @@
XPUSHs(callbackObj);
// the next argument is the prefix
- char *cptr1 = XMLString::transcode(prefix);
- SV *string1 = sv_newmortal();
- sv_setpv(string1, (char *)cptr1);
+ SV *string1 = XMLString2Perl(prefix);
XPUSHs(string1);
PUTBACK;
perl_call_method("end_prefix_mapping", G_VOID);
- // transcode mallocs this and leaves it up to us to free the memory
- delete [] cptr1;
-
FREETMPS;
LEAVE;
}
@@ -432,17 +379,12 @@
XPUSHs(callbackObj);
// the next argument is the name
- char *cptr1 = XMLString::transcode(name);
- SV *string1 = sv_newmortal();
- sv_setpv(string1, (char *)cptr1);
+ SV *string1 = XMLString2Perl(name);
XPUSHs(string1);
PUTBACK;
perl_call_method("skipped_entity", G_VOID);
-
- // transcode mallocs this and leaves it up to us to free the memory
- delete [] cptr1;
FREETMPS;
LEAVE;
Modified: xerces/xerces-p/trunk/Handler/PerlDocumentCallbackHandler.cpp
URL: http://svn.apache.org/viewcvs/xerces/xerces-p/trunk/Handler/PerlDocumentCallbackHandler.cpp?rev=365289&r1=365288&r2=365289&view=diff
==============================================================================
--- xerces/xerces-p/trunk/Handler/PerlDocumentCallbackHandler.cpp (original)
+++ xerces/xerces-p/trunk/Handler/PerlDocumentCallbackHandler.cpp Sun Jan 1 20:55:53 2006
@@ -64,9 +64,7 @@
XPUSHs(callbackObj);
// the next argument is the element name
- char *cptr = XMLString::transcode(name);
- SV *string = sv_newmortal();
- sv_setpv(string, (char *)cptr);
+ SV *string = XMLString2Perl(name);
XPUSHs(string);
// next is the attribute list
@@ -79,9 +77,6 @@
perl_call_method("start_element", G_DISCARD);
- // transcode mallocs this and leaves it up to us to free the memory
- delete [] cptr;
-
FREETMPS;
LEAVE;
}
@@ -101,18 +96,13 @@
XPUSHs(callbackObj);
// the next argument is the element name
- char *cptr = XMLString::transcode(name);
- SV *string = sv_newmortal();
- sv_setpv(string, (char *)cptr);
+ SV *string = XMLString2Perl(name);
XPUSHs(string);
PUTBACK;
perl_call_method("end_element", G_DISCARD);
- // transcode mallocs this and leaves it up to us to free the memory
- delete [] cptr;
-
FREETMPS;
LEAVE;
}
@@ -132,10 +122,8 @@
// first put the callback object on the stack
XPUSHs(callbackObj);
- // the next argument is the element name
- char *cptr = XMLString::transcode(chars);
- SV *string = sv_newmortal();
- sv_setpv(string, (char *)cptr);
+ // the next argument is the char data
+ SV *string = XMLString2Perl(chars);
XPUSHs(string);
// next is the length
@@ -145,9 +133,6 @@
perl_call_method("characters", G_DISCARD);
- // transcode mallocs this and leaves it up to us to free the memory
- delete [] cptr;
-
FREETMPS;
LEAVE;
}
@@ -167,9 +152,7 @@
XPUSHs(callbackObj);
// the next argument is the element name
- char *cptr = XMLString::transcode(chars);
- SV *string = sv_newmortal();
- sv_setpv(string, (char *)cptr);
+ SV *string = XMLString2Perl(chars);
XPUSHs(string);
// next is the length
@@ -179,9 +162,6 @@
perl_call_method("ignorable_whitespace", G_DISCARD);
- // transcode mallocs this and leaves it up to us to free the memory
- delete [] cptr;
-
FREETMPS;
LEAVE;
}
@@ -270,24 +250,16 @@
XPUSHs(callbackObj);
// the next argument is the target
- char *cptr1 = XMLString::transcode(target);
- SV *string1 = sv_newmortal();
- sv_setpv(string1, (char *)cptr1);
+ SV *string1 = XMLString2Perl(target);
XPUSHs(string1);
// the next argument is the data
- char *cptr2 = XMLString::transcode(data);
- SV *string2 = sv_newmortal();
- sv_setpv(string2, (char *)cptr2);
+ SV *string2 = XMLString2Perl(data);
XPUSHs(string2);
PUTBACK;
perl_call_method("processing_instruction", G_DISCARD);
-
- // transcode mallocs this and leaves it up to us to free the memory
- delete [] cptr1;
- delete [] cptr2;
FREETMPS;
LEAVE;
Modified: xerces/xerces-p/trunk/Handler/PerlEntityResolverHandler.i
URL: http://svn.apache.org/viewcvs/xerces/xerces-p/trunk/Handler/PerlEntityResolverHandler.i?rev=365289&r1=365288&r2=365289&view=diff
==============================================================================
--- xerces/xerces-p/trunk/Handler/PerlEntityResolverHandler.i (original)
+++ xerces/xerces-p/trunk/Handler/PerlEntityResolverHandler.i Sun Jan 1 20:55:53 2006
@@ -65,6 +65,7 @@
}
dSP;
+ InputSource *source;
ENTER;
SAVETMPS;
@@ -108,7 +109,6 @@
source_sv = POPs;
}
- InputSource *source;
if (count == 1 && SvOK(source_sv) && !sv_derived_from(source_sv,"XML::Xerces::InputSource")) {
croak("EntityResolver did not return an InputSource\n") ;
}
@@ -126,6 +126,5 @@
FREETMPS;
LEAVE;
-
return source;
}
Modified: xerces/xerces-p/trunk/Handler/PerlNodeFilterCallbackHandler.i
URL: http://svn.apache.org/viewcvs/xerces/xerces-p/trunk/Handler/PerlNodeFilterCallbackHandler.i?rev=365289&r1=365288&r2=365289&view=diff
==============================================================================
--- xerces/xerces-p/trunk/Handler/PerlNodeFilterCallbackHandler.i (original)
+++ xerces/xerces-p/trunk/Handler/PerlNodeFilterCallbackHandler.i Sun Jan 1 20:55:53 2006
@@ -55,6 +55,7 @@
croak("\nacceptNode: no NodeFilter set\n");
return 0;
}
+ short accept = 0;
dSP;
@@ -80,10 +81,11 @@
if (count != 1)
croak("NodeFilter did not return an answer\n") ;
- short accept = POPi;
+ accept = POPi;
PUTBACK ;
FREETMPS;
LEAVE;
+
return accept;
}
Modified: xerces/xerces-p/trunk/MANIFEST
URL: http://svn.apache.org/viewcvs/xerces/xerces-p/trunk/MANIFEST?rev=365289&r1=365288&r2=365289&view=diff
==============================================================================
--- xerces/xerces-p/trunk/MANIFEST (original)
+++ xerces/xerces-p/trunk/MANIFEST Sun Jan 1 20:55:53 2006
@@ -121,7 +121,8 @@
t/actualCast.t
# test Unicode
-t/UTF8.t
+t/01utf8.t testing callback methods which broke UTF8
+t/UTF8.t original tests
t/letter.xml
t/TestUtils.pm
@@ -138,11 +139,11 @@
postModule.pl
postSource.pl
+
+# scripting language independent SWIG files
interface/DOM.i
-interface/Perl.i
interface/defines.i
interface/typemaps-general.i
-interface/typemaps-xmlch.i
interface/typemaps.i
interface/callback.i
interface/grammars.i
@@ -153,10 +154,20 @@
interface/SAX2.i
interface/util.i
+# scripting language specific SWIG files
+interface/Perl/shadow.i
+interface/Perl/typemaps.i
+interface/Perl/transcode.i
+interface/Perl/defines.i
+interface/Perl/callback.i
+interface/Perl/typemaps-xmlch.i
+interface/Perl/errors.i
+
# scripts for testing XML::Xerces
scripts/memtest-light.pl
scripts/memtest.pl
scripts/xercesc-memtest.pl
+scripts/xmluni-output.pl
# Document which parts of the Xerces-C API have been included
xerces-headers.txt
Modified: xerces/xerces-p/trunk/MANIFEST.SKIP
URL: http://svn.apache.org/viewcvs/xerces/xerces-p/trunk/MANIFEST.SKIP?rev=365289&r1=365288&r2=365289&view=diff
==============================================================================
--- xerces/xerces-p/trunk/MANIFEST.SKIP (original)
+++ xerces/xerces-p/trunk/MANIFEST.SKIP Sun Jan 1 20:55:53 2006
@@ -1,4 +1,5 @@
--tmp.{cpp,pm}$
+-tmp.cpp
+-tmp.pm
^chars.pl$
^doxyparse.pl$
^t/UTF8.test$
@@ -24,8 +25,6 @@
pm_to_blib$
pod2html
\.old$
-Xerces.C$
-Xerces.pm$
\.so$
\.\#
docs/apidocs.xml
@@ -43,6 +42,9 @@
docs/feedback.xml
docs/install.xml
docs/readme.xml
+docs/readme.xsl
+docs/readme.pl
docs/releases.xml
docs/samples.xml
docs/xerces-perl_book.xml
+ANNOUNCE
\ No newline at end of file
Modified: xerces/xerces-p/trunk/META.yml
URL: http://svn.apache.org/viewcvs/xerces/xerces-p/trunk/META.yml?rev=365289&r1=365288&r2=365289&view=diff
==============================================================================
--- xerces/xerces-p/trunk/META.yml (original)
+++ xerces/xerces-p/trunk/META.yml Sun Jan 1 20:55:53 2006
@@ -1,7 +1,7 @@
# http://module-build.sourceforge.net/META-spec.html
#XXXXXXX This is a prototype!!! It will change in the future!!! XXXXX#
name: XML-Xerces
-version: 2.6.0-2
+version: 2.7.0-0
version_from:
installdirs: site
requires:
Modified: xerces/xerces-p/trunk/Makefile.PL
URL: http://svn.apache.org/viewcvs/xerces/xerces-p/trunk/Makefile.PL?rev=365289&r1=365288&r2=365289&view=diff
==============================================================================
--- xerces/xerces-p/trunk/Makefile.PL (original)
+++ xerces/xerces-p/trunk/Makefile.PL Sun Jan 1 20:55:53 2006
@@ -27,10 +27,10 @@
# We need to know which version of libxerces we are to use.
# As of Xerces-C 1.5.1, minor version numbers are used
-my $XERCES_MAJOR_VERSION = '2.6';
+my $XERCES_MAJOR_VERSION = '2.7';
my $XERCES_MINOR_VERSION = '0';
my $XERCES_LIB_VERSION = "$XERCES_MAJOR_VERSION.$XERCES_MINOR_VERSION";
-my $XERCES_PERL_VERSION = $XERCES_LIB_VERSION . '-2';
+my $XERCES_PERL_VERSION = $XERCES_LIB_VERSION . '-0';
my $XERCES_VERSION = "$XERCES_LIB_VERSION";
eval {
@@ -284,7 +284,7 @@
push(@header_files,@handler_headers,@import_files);
chomp(my @interface_files = `$FIND interface -name "*.i"`);
- @interface_files = grep {$_ ne 'Perl.i'} @interface_files;
+ @interface_files = grep {$_ ne 'interface/Perl/shadow.i'} @interface_files;
local $" = ' ';
my $OS_DEF;
my $CC_DEF;
@@ -311,7 +311,7 @@
### We no longer need to munge the C++ code thanks to SWIG improvements
# perl postSource.pl Xerces.cpp
my $retval = <<TERMINUS;
-Xerces-tmp.pm: postModule.pl interface/Perl.i
+Xerces-tmp.pm: postModule.pl interface/Perl/shadow.i
\$(SWIG) $SWIG_ARGS -o Xerces-tmp.cpp Xerces.i
mv Xerces.pm Xerces-tmp.pm
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org