X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e9b37a2fadb82105b51470b53e31936dc39888d..75e14ed5ee73dfdcee100d4d2aef84a247b5dde6:/wxPython/SWIG/swig.xmlout.patch?ds=sidebyside diff --git a/wxPython/SWIG/swig.xmlout.patch b/wxPython/SWIG/swig.xmlout.patch index 05015d8d95..ae17e1899e 100644 --- a/wxPython/SWIG/swig.xmlout.patch +++ b/wxPython/SWIG/swig.xmlout.patch @@ -1,11 +1,11 @@ Index: Source/Swig/swig.h =================================================================== RCS file: /cvsroot/SWIG/Source/Swig/swig.h,v -retrieving revision 1.76 -diff -u -4 -r1.76 swig.h ---- Source/Swig/swig.h 11 Nov 2003 20:16:35 -0000 1.76 -+++ Source/Swig/swig.h 11 Dec 2003 18:12:49 -0000 -@@ -350,8 +350,10 @@ +retrieving revision 1.81 +diff -u -4 -r1.81 swig.h +--- Source/Swig/swig.h 27 Jan 2004 23:39:35 -0000 1.81 ++++ Source/Swig/swig.h 30 Jan 2004 22:22:10 -0000 +@@ -364,8 +364,10 @@ extern void Swig_print_tags(File *obj, Node *root); extern void Swig_print_tree(Node *obj); extern void Swig_print_node(Node *obj); @@ -19,16 +19,16 @@ diff -u -4 -r1.76 swig.h Index: Source/Modules/main.cxx =================================================================== RCS file: /cvsroot/SWIG/Source/Modules/main.cxx,v -retrieving revision 1.23 -diff -u -4 -r1.23 main.cxx ---- Source/Modules/main.cxx 8 Dec 2003 23:42:37 -0000 1.23 -+++ Source/Modules/main.cxx 11 Dec 2003 18:12:50 -0000 -@@ -85,15 +85,17 @@ - -v - Run in verbose mode\n\ - -version - Print SWIG version number\n\ - -Wall - Enable all warning messages\n\ - -w - Suppress warning number \n\ -+ -xmlout - Write an XML version of the parse tree to file after normal processing\n\ +retrieving revision 1.33 +diff -u -4 -r1.33 main.cxx +--- Source/Modules/main.cxx 22 Jan 2004 22:42:15 -0000 1.33 ++++ Source/Modules/main.cxx 30 Jan 2004 22:22:11 -0000 +@@ -91,15 +91,17 @@ + -w+321,401,-402 \n\ + \n\ + where code 321(+) is added, and 401(no sign) and 402(-) \n\ + are suppressed. See documentation for code meanings.\n\ ++ -xmlout - Write an XML version of the parse tree to file after normal processing\n\ \n"; // Local variables @@ -41,9 +41,9 @@ diff -u -4 -r1.23 main.cxx // ----------------------------------------------------------------------------- // check_suffix(char *name) // -@@ -222,8 +224,9 @@ +@@ -215,8 +217,9 @@ + char *includefiles[256]; int includecount = 0; - extern int check_suffix(char *); int dump_tags = 0; int dump_tree = 0; + int dump_xml = 0; @@ -51,7 +51,7 @@ diff -u -4 -r1.23 main.cxx int dump_typedef = 0; int dump_classes = 0; int werror = 0; -@@ -482,8 +485,20 @@ +@@ -483,8 +486,20 @@ Swig_mark_arg(i); } else if (strcmp(argv[i],"-dump_tree") == 0) { dump_tree = 1; @@ -72,7 +72,7 @@ diff -u -4 -r1.23 main.cxx Swig_mark_arg(i); Swig_contract_mode_set(0); } else if (strcmp(argv[i],"-browse") == 0) { -@@ -725,8 +740,11 @@ +@@ -734,8 +749,11 @@ } } if (dump_tree) { @@ -87,32 +87,11 @@ diff -u -4 -r1.23 main.cxx Index: Source/Modules/xml.cxx =================================================================== RCS file: /cvsroot/SWIG/Source/Modules/xml.cxx,v -retrieving revision 1.8 -diff -u -4 -r1.8 xml.cxx ---- Source/Modules/xml.cxx 31 Oct 2003 17:42:40 -0000 1.8 -+++ Source/Modules/xml.cxx 11 Dec 2003 18:12:50 -0000 -@@ -24,9 +24,8 @@ - //static Node *view_top = 0; - static File *out = 0; - static int xmllite = 0; - -- - class XML - : public Language - { - -@@ -109,9 +108,9 @@ - Printf(stderr,"*** Can't open '%s'\n", outfile); - SWIG_exit(EXIT_FAILURE); - } - } -- Printf( out, " \n" ); -+ Printf( out, " \n" ); - Xml_print_tree(n); - return SWIG_OK; - } - -@@ -197,18 +196,19 @@ +retrieving revision 1.10 +diff -u -4 -r1.10 xml.cxx +--- Source/Modules/xml.cxx 22 Jan 2004 22:42:18 -0000 1.10 ++++ Source/Modules/xml.cxx 30 Jan 2004 22:22:11 -0000 +@@ -197,18 +197,19 @@ Replaceall( o, "&", "&" ); Replaceall( o, "<", "<" ); Replaceall( o, "\"", """ ); @@ -134,7 +113,7 @@ diff -u -4 -r1.8 xml.cxx } } ki = Next(ki); -@@ -318,11 +318,10 @@ +@@ -318,11 +319,10 @@ { print_indent(0); Printf( out, "<%ssitem id=\"%ld\" addr=\"%x\" >\n", markup, ++id, n.item ); @@ -147,11 +126,11 @@ diff -u -4 -r1.8 xml.cxx } indent_level -= 4; print_indent(0); -@@ -337,5 +336,36 @@ - Language * swig_xml( void ) - { - return new XML(); - } +@@ -336,5 +336,36 @@ + return new XML(); + } + extern "C" Language * swig_xml( void ) { + return new_swig_xml(); +} + +