[sword-svn] r2728 - in trunk: bindings/swig cmake

[greg.hellings at crosswire.org]

Author: greg.hellings
Date: 2012-08-28 20:30:20 -0700 (Tue, 28 Aug 2012)
New Revision: 2728

Modified:
   trunk/bindings/swig/swmodule.i
   trunk/bindings/swig/versekey.i
   trunk/cmake/bindings.cmake
Log:
Clean up a pair of ignores which were improperly crafted.
Removed the warning suppression which resulted from those improper ignores.
Cleaned up other warnings.
Updated warning suppressions.

Bindings now build with only about 3 or 4 warnings during SWIG compile
and the Perl bindings have a pair of warnings in the code that SWIG
generates which I can't seem to shake. I could add a gcc flag to the build
script but that seems unnecessary.

Modified: trunk/bindings/swig/swmodule.i
===================================================================
--- trunk/bindings/swig/swmodule.i	2012-08-29 02:52:01 UTC (rev 2727)
+++ trunk/bindings/swig/swmodule.i	2012-08-29 03:30:20 UTC (rev 2728)
@@ -2,8 +2,8 @@
 #include "swmodule.h"
 %}
 
-%ignore sword::SWModule::operator sword::SWKey &;
-%ignore sword::SWModule::operator sword::SWKey *;
+%ignore sword::SWModule::operator SWKey &;
+%ignore sword::SWModule::operator SWKey *;
 
 %ignore sword::SWModule::Search;
 
@@ -12,6 +12,8 @@
 %ignore sword::SWModule::getEntryAttributes;
 %ignore sword::SWModule::getConfig;
 %ignore sword::SWModule::setConfig;
+%ignore sword::SWModule::SetKey(SWKey const &);
+%ignore sword::SWModule::setKey(SWKey const &);
 
 %include "swmodule.h"
 

Modified: trunk/bindings/swig/versekey.i
===================================================================
--- trunk/bindings/swig/versekey.i	2012-08-29 02:52:01 UTC (rev 2727)
+++ trunk/bindings/swig/versekey.i	2012-08-29 03:30:20 UTC (rev 2728)
@@ -12,6 +12,7 @@
 %ignore sword::VerseKey::builtin_books;
 %ignore sword::VerseKey::BMAX;
 %ignore sword::VerseKey::books;
+%ignore sword::VerseKey::VerseKey(SWKey const &);
 
 %immutable sword::VerseKey::builtin_abbrevs;
 %immutable sword::sbook::name;

Modified: trunk/cmake/bindings.cmake
===================================================================
--- trunk/cmake/bindings.cmake	2012-08-29 02:52:01 UTC (rev 2727)
+++ trunk/cmake/bindings.cmake	2012-08-29 03:30:20 UTC (rev 2728)
@@ -51,7 +51,7 @@
 		# This should add the pythonswig target to be built when the "make" command is executed
 		ADD_CUSTOM_TARGET(pythonswig ALL
 				mkdir -p "${SWORD_SWIG_BINARY}/python"
-			COMMAND	${SWIG_EXECUTABLE}  "-w503,+509" -python -c++ -shadow -o "${SWORD_SWIG_BINARY}/python/Sword.cxx" "-I${SWORD_SWIG_SOURCE}" ${SWIG_INCLUDES} "${SWORD_SWIG_SOURCE}/sword.i"
+			COMMAND	${SWIG_EXECUTABLE}  "-w-451,-402" -python -c++ -shadow -o "${SWORD_SWIG_BINARY}/python/Sword.cxx" "-I${SWORD_SWIG_SOURCE}" ${SWIG_INCLUDES} "${SWORD_SWIG_SOURCE}/sword.i"
 			COMMAND	echo "#! /usr/bin/python" > ${SWORD_SWIG_BINARY}/python/setup.py
 			COMMAND echo "" >> ${SWORD_SWIG_BINARY}/python/setup.py
 			COMMAND echo "from distutils.core import setup, Extension" >> ${SWORD_SWIG_BINARY}/python/setup.py
@@ -82,7 +82,7 @@
 			# This should add the perlswig target to be build with the "make" command is executed
 			ADD_CUSTOM_TARGET(perlswig ALL
 				mkdir -p "${SWORD_SWIG_BINARY}/perl"
-				COMMAND ${SWIG_EXECUTABLE} "-w503,+509" -perl -c++ -shadow -o "${SWORD_SWIG_BINARY}/perl/Sword.cxx" "-I${SWORD_SWIG_SOURCE}" ${SWIG_INCLUDES} "${SWORD_SWIG_SOURCE}/sword.i"
+				COMMAND ${SWIG_EXECUTABLE} "-w-451,-402" -perl -c++ -shadow -o "${SWORD_SWIG_BINARY}/perl/Sword.cxx" "-I${SWORD_SWIG_SOURCE}" ${SWIG_INCLUDES} "${SWORD_SWIG_SOURCE}/sword.i"
 				COMMAND echo "Writing ${SWORD_SWIG_BINARY}/perl/Makefile.PL"
 				COMMAND echo "#! /usr/bin/perl" > ${SWORD_SWIG_BINARY}/perl/Makefile.PL
 				COMMAND echo "" >> ${SWORD_SWIG_BINARY}/perl/Makefile.PL