From f13de56e5f88aaed94a2fe143ee766755ee82cf1 Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Thu, 13 Oct 2022 21:14:44 +0100
Subject: [PATCH] Revert "[xml] Move to "Experimental" target language status"

This reverts commit 22a4355f340e9a844d5e5d8d0528d767c4808ebb.

Conflicts:
	CHANGES.current
	RELEASENOTES
---
 CHANGES.current             | 6 ------
 Doc/Manual/SWIG.html        | 2 +-
 Examples/xml/Makefile.in    | 4 +---
 Source/Modules/swigmain.cxx | 2 +-
 4 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/CHANGES.current b/CHANGES.current
index 301370780..4a94edca2 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -290,12 +290,6 @@ Version 4.1.0 (in progress)
 2022-07-12: erezgeva
             [Perl] Add std::unique_ptr support in std_unique_ptr.i library file.
 
-2022-07-07: olly
-	    [xml] #2213 XML has been moved to "Experimental" target language
-	    status. It's not in good shape and is likely to be removed unless
-	    somebody steps up to bring it up to the expected standard (it fails
-	    to even meet the criteria for "Experimental" currently).
-
 2022-07-07: jmarrec
 	    #1158 #2286 Add basic support for C++11 attributes.  These are now
 	    crudely ignored by SWIG's parser's tokeniser, which is better that
diff --git a/Doc/Manual/SWIG.html b/Doc/Manual/SWIG.html
index 68c980771..3fb41e522 100644
--- a/Doc/Manual/SWIG.html
+++ b/Doc/Manual/SWIG.html
@@ -134,11 +134,11 @@ Supported Target Language Options
      -ruby           - Generate Ruby wrappers
      -scilab         - Generate Scilab wrappers
      -tcl8           - Generate Tcl 8 wrappers
+     -xml            - Generate XML wrappers
 
 Experimental Target Language Options
      -mzscheme       - Generate MzScheme/Racket wrappers
      -ocaml          - Generate OCaml wrappers
-     -xml            - Generate XML wrappers
 
 General Options
      -addextern      - Add extra extern declarations
diff --git a/Examples/xml/Makefile.in b/Examples/xml/Makefile.in
index eaabe0ac5..44894b8ea 100644
--- a/Examples/xml/Makefile.in
+++ b/Examples/xml/Makefile.in
@@ -5,11 +5,9 @@ top_srcdir	= @top_srcdir@
 top_builddir	= @top_builddir@
 
 SWIGEXE         = $(top_builddir)/swig
-# Suppress "experimental target language" warning
-SWIGOPT         = -w524
 SWIG_LIB_DIR    = $(top_srcdir)/Lib
 SWIG_LIB_SET    = @SWIG_LIB_SET@
-SWIGINVOKE      = $(SWIG_LIB_SET) $(SWIGTOOL) $(SWIGEXE) $(SWIGOPT)
+SWIGINVOKE      = $(SWIG_LIB_SET) $(SWIGTOOL) $(SWIGEXE)
 
 cleanup		= tail +2 \
 		  | sed -e 's/ident="ID[0-9A-F]*"//g' \
diff --git a/Source/Modules/swigmain.cxx b/Source/Modules/swigmain.cxx
index bb5bf34e5..ad24d0fee 100644
--- a/Source/Modules/swigmain.cxx
+++ b/Source/Modules/swigmain.cxx
@@ -80,7 +80,7 @@ static TargetLanguageModule modules[] = {
   {"-tcl", swig_tcl, NULL, Supported},
   {"-tcl8", swig_tcl, "Tcl 8", Supported},
   {"-uffi", NULL, "Common Lisp / UFFI", Disabled},
-  {"-xml", swig_xml, "XML", Experimental},
+  {"-xml", swig_xml, "XML", Supported},
   {NULL, NULL, NULL, Disabled}
 };