Hi,
building the java swig bindings under windows (vc7) throws a lot of
warnings because it doesn't include swigutil_java.h. The #include is
there but it is ifdef'ed SWIGJAVA in the generated .c file and
SWIGJAVA is not set in the build.
One solution would be to define SWIGJAVA but i think the better
solution is to change the include instructions in such a way that
each language just includes its language header. See the patch.
--
Martin
* subversion/bindings/swig/core.i,subversion/bindings/swig/svn_ra.i,
subversion/bindings/swig/svn_fs.i,subversion/bindings/swig/svn_wc.i,
subversion/bindings/swig/svn_repos.i,
subversion/bindings/swig/svn_delta.i
Modified language specific #includes so each generated file only
includes the specific header for the current language.
Index: subversion/bindings/swig/core.i
===================================================================
--- subversion/bindings/swig/core.i (revision 8016)
+++ subversion/bindings/swig/core.i (working copy)
@@ -343,20 +343,27 @@
#include "svn_md5.h"
#include "svn_diff.h"
#include "svn_error_codes.h"
+%}
#ifdef SWIGPYTHON
+%{
#include "swigutil_py.h"
+%}
#endif
#ifdef SWIGJAVA
+%{
#include "swigutil_java.h"
+%}
#endif
#ifdef SWIGPERL
+%{
#include "swigutil_pl.h"
+%}
#endif
-%}
+
#ifdef SWIGPYTHON
%init %{
/* This is a hack. I dunno if we can count on SWIG calling the module "m" */
Index: subversion/bindings/swig/svn_ra.i
===================================================================
--- subversion/bindings/swig/svn_ra.i (revision 8016)
+++ subversion/bindings/swig/svn_ra.i (working copy)
@@ -78,19 +78,25 @@
%include svn_ra.h
%{
#include "svn_ra.h"
+%}
#ifdef SWIGPYTHON
+%{
#include "swigutil_py.h"
+%}
#endif
#ifdef SWIGJAVA
+%{
#include "swigutil_java.h"
+%}
#endif
#ifdef SWIGPERL
+%{
#include "swigutil_pl.h"
+%}
#endif
-%}
#ifdef SWIGPERL
%include ra_plugin.hi
Index: subversion/bindings/swig/svn_fs.i
===================================================================
--- subversion/bindings/swig/svn_fs.i (revision 8016)
+++ subversion/bindings/swig/svn_fs.i (working copy)
@@ -160,16 +160,22 @@
%{
#include "svn_md5.h"
#include "svn_fs.h"
+%}
#ifdef SWIGPYTHON
+%{
#include "swigutil_py.h"
+%}
#endif
#ifdef SWIGJAVA
+%{
#include "swigutil_java.h"
+%}
#endif
#ifdef SWIGPERL
+%{
#include "swigutil_pl.h"
+%}
#endif
-%}
Index: subversion/bindings/swig/svn_wc.i
===================================================================
--- subversion/bindings/swig/svn_wc.i (revision 8016)
+++ subversion/bindings/swig/svn_wc.i (working copy)
@@ -102,16 +102,22 @@
%include svn_wc.h
%{
#include "svn_wc.h"
+%}
#ifdef SWIGPYTHON
+%{
#include "swigutil_py.h"
+%}
#endif
#ifdef SWIGJAVA
+%{
#include "swigutil_java.h"
+%}
#endif
#ifdef SWIGPERL
+%{
#include "swigutil_pl.h"
+%}
#endif
-%}
Index: subversion/bindings/swig/svn_client.i
===================================================================
--- subversion/bindings/swig/svn_client.i (revision 8016)
+++ subversion/bindings/swig/svn_client.i (working copy)
@@ -254,18 +254,24 @@
%{
#include "svn_client.h"
+%}
#ifdef SWIGPYTHON
+%{
#include "swigutil_py.h"
+%}
#endif
#ifdef SWIGJAVA
+%{
#include "swigutil_java.h"
+%}
#endif
#ifdef SWIGPERL
+%{
#include "swigutil_pl.h"
+%}
#endif
-%}
%include svn_client.h
Index: subversion/bindings/swig/svn_repos.i
===================================================================
--- subversion/bindings/swig/svn_repos.i (revision 8016)
+++ subversion/bindings/swig/svn_repos.i (working copy)
@@ -115,16 +115,22 @@
%include svn_repos.h
%{
#include "svn_repos.h"
+%}
#ifdef SWIGPYTHON
+%{
#include "swigutil_py.h"
+%}
#endif
#ifdef SWIGJAVA
+%{
#include "swigutil_java.h"
+%}
#endif
#ifdef SWIGPERL
+%{
#include "swigutil_pl.h"
+%}
#endif
-%}
Index: subversion/bindings/swig/svn_delta.i
===================================================================
--- subversion/bindings/swig/svn_delta.i (revision 8016)
+++ subversion/bindings/swig/svn_delta.i (working copy)
@@ -62,20 +62,27 @@
%{
#include "svn_md5.h"
#include "svn_delta.h"
+%}
#ifdef SWIGPYTHON
+%{
#include "swigutil_py.h"
+%}
#endif
#ifdef SWIGJAVA
+%{
#include "swigutil_java.h"
+%}
#endif
#ifdef SWIGPERL
+%{
#include "swigutil_pl.h"
+%}
#endif
-%}
+
/* -----------------------------------------------------------------------
editor callback invokers
*/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Dec 17 16:54:31 2003