C++ & SWIG compilation working (tested on macOS)

Author: auriocus

Makefile.in

@@ -99,6 +99,8 @@ INSTALL_LIBRARY	= @INSTALL_LIBRARY@
 PACKAGE_NAME	= @PACKAGE_NAME@
 PACKAGE_VERSION	= @PACKAGE_VERSION@
 CC		= @CC@
+CXX		= @CXX@
+CCLD		= @CCLD@
 CFLAGS_DEFAULT	= @CFLAGS_DEFAULT@
 CFLAGS_WARNING	= @CFLAGS_WARNING@
 EXEEXT		= @EXEEXT@
@@ -179,12 +181,15 @@ LDFLAGS_DEFAULT			= @LDFLAGS_DEFAULT@
 COMPILE		= $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) \
 			  $(CFLAGS_DEFAULT) $(CFLAGS_WARNING) $(SHLIB_CFLAGS) $(CFLAGS)
 
+CXXCOMPILE	= $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) \
+			  $(CFLAGS_DEFAULT) $(CFLAGS_WARNING) $(SHLIB_CFLAGS) $(CXXFLAGS)
+
 GDB		= gdb
 VALGRIND	= valgrind
 VALGRINDARGS	= --tool=memcheck --num-callers=8 --leak-resolution=high \
 		  --leak-check=yes --show-reachable=yes -v
 
-.SUFFIXES: .c .$(OBJEXT)
+.SUFFIXES: .c .$(OBJEXT) .cpp .cxx
 
 #========================================================================
 # Start of user-definable TARGETS section
@@ -198,13 +203,13 @@ VALGRINDARGS	= --tool=memcheck --num-callers=8 --leak-resolution=high \
 # for the BINARIES that you specified above have already been done.
 #========================================================================
 
-all: @@SWIG_WRAP@@ binaries libraries
+all: @SWIG_WRAP@ binaries libraries
 
 
 wrap: $(SWIGOUTPUT)
 
 $(SWIGOUTPUT): $(SWIGINTERFACE)
-	$(SWIG) -tcl -c++ -namespace $(PACKAGE_NAME) -o $(SWIGOUTPUT) $(SWIGINTERFACE)
+	$(SWIG) -tcl -c++ -namespace -pkgversion $(PACKAGE_VERSION) -module $(PACKAGE_NAME) -o $(SWIGOUTPUT) $(SWIGINTERFACE)
 
 #========================================================================
 # The binaries target builds executable programs, Windows .dll's, unix
@@ -325,6 +330,10 @@ VPATH = $(srcdir):$(srcdir)/generic:$(srcdir)/unix:$(srcdir)/win:$(srcdir)/macos
 
 .c.@OBJEXT@:
 	$(COMPILE) -c `@CYGPATH@ $<` -o $@
+.cpp.@OBJEXT@:
+	$(CXXCOMPILE) -c `@CYGPATH@ $<` -o $@
+.cxx.@OBJEXT@:
+	$(CXXCOMPILE) -c `@CYGPATH@ $<` -o $@
 
 #========================================================================
 # Distribution creation

configure.ac

@@ -73,8 +73,8 @@ TEA_SETUP_COMPILER
 # and PKG_TCL_SOURCES.
 #-----------------------------------------------------------------------
 
-TEA_ADD_SOURCES([cppsample.cpp])
-TEA_ADD_SWIGINTERFACE([cppsample.hpp])
+TEA_ADD_SOURCES([sample.cpp])
+TEA_ADD_SWIGINTERFACE([sample.hpp])
 TEA_ADD_HEADERS([])
 TEA_ADD_INCLUDES([])
 TEA_ADD_LIBS([])

generic/sample.cpp

@@ -0,0 +1,21 @@
+#include "sample.hpp"
+Animal::Animal(std::string type, int age) :
+    type(type), age(age) 
+{
+    if (age < 0) {
+	throw std::runtime_error("Age cannot be negative!");
+    }
+}
+    
+int Animal::birthday() {
+    return ++age;
+}
+
+
+std::string Animal::describe() {
+    std::ostringstream description;
+    description << "I am a "<<type<<" and I am "<<age<<" years old";
+    return description.str();
+}
+
+

generic/sample.hpp

@@ -0,0 +1,49 @@
+#ifndef SAMPLE_HPP
+#define SAMPLE_HPP
+
+#ifdef SWIG
+// SWIG directives
+// Include some standard SWIG library
+%include exception.i
+%include typemaps.i
+%include std_string.i
+%{
+// This goes into the wrap file. Include the declarations
+#include "sample.hpp"
+%}
+
+// Convert C++ exceptions into Tcl excepions
+// (instead of crashing the program)
+%exception {
+  try {
+    $function
+  } catch (const std::runtime_error &err) {
+    SWIG_exception(SWIG_RuntimeError, err.what());
+  } catch (...) {
+    SWIG_exception(SWIG_RuntimeError, "Some C++-Error");
+  }
+}
+#else
+
+// C-preprocessor
+#include <string>
+#include <sstream>
+#include <stdexcept>
+
+#endif //!SWIG
+
+// Class definitions etc.
+
+class Animal {
+public:
+    std::string type;
+    int age;
+    
+    Animal(std::string type, int age);
+    
+    int birthday();
+
+    std::string describe();
+
+};
+#endif

tclconfig/tcl.m4

@@ -1166,7 +1166,7 @@ AC_DEFUN([TEA_CONFIG_CFLAGS], [
     else
 	CCLD=$CC
     fi
-
+    AC_SUBST(CCLD)
 
     case $system in
 	# TEA specific:
@@ -3025,6 +3025,8 @@ AC_DEFUN([TEA_ADD_SWIGINTERFACE], [
 	# check for SWIG
 	AC_CHECK_PROG(SWIG_CHECK,swig,yes)
 	AS_IF([test x"$SWIG_CHECK" != x"yes"], [AC_MSG_ERROR([Swig is requred to compile this.])])
+	SWIG="swig"
+	
 	# check for existence - allows for generic/win/unix VPATH
 	# To add more dirs here (like 'src'), you have to update VPATH
 	# in Makefile.in as well
@@ -3050,12 +3052,14 @@ AC_DEFUN([TEA_ADD_SWIGINTERFACE], [
 	fi
 	PKG_OBJECTS="$PKG_OBJECTS $SWIGOBJECT"
 	SWIG_WRAP="wrap"
+	TEA_ADD_CLEANFILES([$SWIGOUTPUT])
     AC_SUBST(PKG_SOURCES)
     AC_SUBST(PKG_OBJECTS)
     AC_SUBST(SWIGOBJECT)
     AC_SUBST(SWIGOUTPUT)
     AC_SUBST(SWIGINTERFACE)
     AC_SUBST(SWIG_WRAP)
+    AC_SUBST(SWIG)
 ])
 
 #------------------------------------------------------------------------