rename .i files in swig wrappers, correct dependendcies so touching any .i...

rename .i files in swig wrappers, correct dependendcies so touching any .i file will rebuild the wrappers

swig/CMakeLists.txt

@@ -34,6 +34,8 @@ if(CMAKE_COMPILER_IS_GNUCXX)
 	set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g -fno-omit-frame-pointer")
 endif(CMAKE_COMPILER_IS_GNUCXX)
 
+file(GLOB_RECURSE I_FILES "*.i")
+
 # -----------------------------------------------------------------------------
 # -----------------------------------------------------------------------------
 
@@ -44,10 +46,10 @@ SET(SWIG_SRC_DIR ${SWIG_DIR}/libcorpus2)
 # corous2
 SET_SOURCE_FILES_PROPERTIES(corpus2.i PROPERTIES CPLUSPLUS ON)
 SET_SOURCE_FILES_PROPERTIES(corpus2.i PROPERTIES SWIG_FLAGS "-includeall" )
+set(SWIG_MODULE_corpus2_EXTRA_DEPS ${I_FILES})
 SWIG_ADD_MODULE(corpus2 python corpus2.i )
 SWIG_LINK_LIBRARIES(corpus2 ${PYTHON_LIBRARIES} ${PWRUTILS_LIBS})
 SWIG_LINK_LIBRARIES(corpus2 ${PYTHON_LIBRARIES} ${CORPUS2_PWR_LIBS})
-
 # -----------------------------------------------------------------------------
 # -----------------------------------------------------------------------------
 
@@ -89,25 +91,7 @@ install(
 # -----------------------------------------------------------------------------
 
 install(
-	FILES libpwrnlperror.i
-	libcorpus2exception.i
-	libcorpus2exception.i
-	libcorpustag.i
-	libcorpustagset.i
-	libcorpustagsetmanager.i
-	libcorpuslexeme.i
-	libcorpustoken.i
-	libcorpussentence.i
-	libcorpuschunk.i
-	libcorpustokenwriter.i
-	libcorpustokenreader.i
-	libcorpusiob.i
-	libcorpusannotationchannel.i
-	libcorpusannotatedsentence.i
-	libcorpusannotationview.i
-	corpus2.i
-	boost_shared_ptr.i
-	unicodestring.i
+	FILES ${I_FILES}
 	DESTINATION ${SWIG_SRC_DIR}
 	PERMISSIONS ${PERM_SCRIPTS}
 )

swig/libcorpusannotatedsentence.i → swig/annotatedsentence.i

@@ -6,10 +6,10 @@
   #include <libcorpus2/ann/annotatedsentence.h>
 %}
 
-%include "libcorpustoken.i"
-%include "libcorpussentence.i"
-%include "libcorpus2exception.i"
-%include "libcorpusannotationchannel.i"
+%include "token.i"
+%include "sentence.i"
+%include "exception.i"
+%include "annotationchannel.i"
 
 %include "boost_shared_ptr.i"
 %include "std_map.i"

swig/libcorpusannotationchannel.i → swig/annotationchannel.i

@@ -8,7 +8,7 @@
 
 %include "std_string.i"
 %include "std_vector.i"
-%include "libcorpusiob.i"
+%include "iob.i"
 
 %template(IntVector) std::vector<int>;
 %template(IOBVector) std::vector<Corpus2::IOB::Enum>;

swig/libcorpusannotationview.i → swig/annotationview.i

@@ -6,9 +6,9 @@
   #include <libcorpus2/ann/view.h>
 %}
 
-%include "libcorpussentence.i"
-%include "libcorpusannotationchannel.i"
-%include "libcorpusannotatedsentence.i"
+%include "sentence.i"
+%include "annotationchannel.i"
+%include "annotatedsentence.i"
 
 %include "std_string.i"
 %include "boost_shared_ptr.i"

swig/libcorpuschunk.i → swig/chunk.i

@@ -14,7 +14,7 @@
 %include "std_vector.i"
 %include "boost_shared_ptr.i"
 
-%include "libcorpussentence.i"
+%include "sentence.i"
 
 %template(ChunkPtr) boost::shared_ptr<Corpus2::Chunk>;
 %template(SentencePtrVector) std::vector<boost::shared_ptr<Sentence> >;

swig/corpus2.i

@@ -5,20 +5,20 @@
 
 %include "boost_shared_ptr.i"
 %include "unicodestring.i"
-%include "libcorpus2exception.i"
-%include "libcorpusannotatedsentence.i"
-%include "libcorpusannotationchannel.i"
-%include "libcorpusannotationview.i"
-%include "libcorpuschunk.i"
-%include "libcorpusiob.i"
-%include "libcorpuslexeme.i"
-%include "libcorpussentence.i"
-%include "libcorpustag.i"
-%include "libcorpustagset.i"
-%include "libcorpustagsetmanager.i"
-%include "libcorpustoken.i"
-%include "libcorpustokenreader.i"
-%include "libcorpustokenwriter.i"
+%include "exception.i"
+%include "annotatedsentence.i"
+%include "annotationchannel.i"
+%include "annotationview.i"
+%include "chunk.i"
+%include "iob.i"
+%include "lexeme.i"
+%include "sentence.i"
+%include "tag.i"
+%include "tagset.i"
+%include "tagsetmanager.i"
+%include "token.i"
+%include "tokenreader.i"
+%include "tokenwriter.i"
 %include "libpwrnlperror.i"
 
 #endif /* SWIG_CORPUS2_I */

swig/libcorpus2exception.i → swig/exception.i

 #ifndef SWIG_LIBCORPUS2_EXCEPTION_I
 #define SWIG_LIBCORPUS2_EXCEPTION_I
 
-%module libcorpus2exception
+%module libcorpusexception
 %{
   #include <libcorpus2/exception.h>
 %}

swig/libcorpuslexeme.i → swig/lexeme.i

@@ -7,7 +7,7 @@
   #include <libcorpus2/lexeme.h>
 %}
 
-%include "libcorpustag.i"
+%include "tag.i"
 
 %include "std_string.i"
 %include "std_vector.i"

swig/libcorpussentence.i → swig/sentence.i

@@ -7,7 +7,7 @@
 %}
 
 %include "std_string.i"
-%include "libcorpustoken.i"
+%include "token.i"
 %include "boost_shared_ptr.i"
 
 %template(Ptr) boost::shared_ptr<Corpus2::Sentence>;

swig/libcorpustagset.i → swig/tagset.i

@@ -6,8 +6,8 @@
   #include <libcorpus2/tagset.h>
 %}
 
-%include "libcorpustag.i"
-%include "libcorpus2exception.i"
+%include "tag.i"
+%include "exception.i"
 
 %include "std_string.i"
 %include "std_vector.i"

swig/libcorpustagsetmanager.i → swig/tagsetmanager.i

@@ -6,8 +6,8 @@
   #include <libcorpus2/tagsetmanager.h>
 %}
 
-%include "libcorpustagset.i"
-%include "libcorpus2exception.i"
+%include "tagset.i"
+%include "exception.i"
 
 %include "std_string.i"
 %include "std_vector.i"

swig/libcorpustoken.i → swig/token.i

@@ -7,8 +7,8 @@
   #include <libcorpus2/token.h>
 %}
 
-%include "libcorpuslexeme.i"
-%include "libcorpustagset.i"
+%include "lexeme.i"
+%include "tagset.i"
 
 %include "std_string.i"
 %include "std_vector.i"

swig/libcorpustokenreader.i → swig/tokenreader.i

@@ -7,11 +7,11 @@
   #include <libcorpus2/io/helpers.h>
 %}
 
-%include "libcorpustag.i"
-%include "libcorpustoken.i"
-%include "libcorpuschunk.i"
-%include "libcorpustagset.i"
-%include "libcorpussentence.i"
+%include "tag.i"
+%include "token.i"
+%include "chunk.i"
+%include "tagset.i"
+%include "sentence.i"
 %include "std_string.i"
 %include "std_vector.i"
 %include "boost_shared_ptr.i"

swig/libcorpustokenwriter.i → swig/tokenwriter.i

@@ -6,11 +6,11 @@
   #include <libcorpus2/io/writer.h>
 %}
 
-%include "libcorpustag.i"
-%include "libcorpustoken.i"
-%include "libcorpuschunk.i"
-%include "libcorpustagset.i"
-%include "libcorpussentence.i"
+%include "tag.i"
+%include "token.i"
+%include "chunk.i"
+%include "tagset.i"
+%include "sentence.i"
 %include "std_string.i"
 %include "boost_shared_ptr.i"