jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Tcl examples now run during 'make check' and makefile tidyup.

Browse source
This commit is contained in:
William S Fulton 2013-04-13 23:33:19 +01:00
commit 3489d0db32
16 changed files with 96 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Examples/Makefile.in
View file

@ -110,6 +110,7 @@ TCL_DLNK = @TCLDYNAMICLINKING@
TCL_SO = @TCL_SO@ TCL_SO = @TCL_SO@
TCLLDSHARED = @TCLLDSHARED@ TCLLDSHARED = @TCLLDSHARED@
TCLCXXSHARED = @TCLCXXSHARED@ TCLCXXSHARED = @TCLCXXSHARED@
TCL_SCRIPT = $(RUNME).tcl
# ----------------------------------------------------------- # -----------------------------------------------------------
# Build a new version of the tclsh shell # Build a new version of the tclsh shell
@ -159,6 +160,13 @@ tcl_cpp: $(SRCS)
$(CXX) -c $(CCSHARED) $(CFLAGS) $(SRCS) $(CXXSRCS) $(ICXXSRCS) $(INCLUDES) $(TCL_INCLUDE) $(CXX) -c $(CCSHARED) $(CFLAGS) $(SRCS) $(CXXSRCS) $(ICXXSRCS) $(INCLUDES) $(TCL_INCLUDE)
$(TCLCXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(TCL_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(TCL_SO) $(TCLCXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(TCL_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(TCL_SO)
# -----------------------------------------------------------------
# Run Tcl example
# -----------------------------------------------------------------
tcl_run:
$(RUNTOOL) $(TCLSH) $(TCL_SCRIPT) $(RUNPIPE)
# ----------------------------------------------------------------- # -----------------------------------------------------------------
# Version display # Version display
# ----------------------------------------------------------------- # -----------------------------------------------------------------

11
Examples/tcl/class/Makefile
View file

@ -5,15 +5,16 @@ TARGET = example
INTERFACE = example.i INTERFACE = example.i
LIBS = -lm LIBS = -lm
all:: check: build
$(MAKE) -f $(TOP)/Makefile tcl_run
build:
$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' tcl_cpp TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' tcl_cpp
static:: static:
$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
TARGET='mytclsh' INTERFACE='$(INTERFACE)' tclsh_cpp_static TARGET='mytclsh' INTERFACE='$(INTERFACE)' tclsh_cpp_static
clean:: clean:
$(MAKE) -f $(TOP)/Makefile tcl_clean $(MAKE) -f $(TOP)/Makefile tcl_clean
check: all

11
Examples/tcl/constants/Makefile
View file

@ -5,15 +5,16 @@ TARGET = my_tclsh
DLTARGET = example DLTARGET = example
INTERFACE = example.i INTERFACE = example.i
all:: check: build
$(MAKE) -f $(TOP)/Makefile tcl_run
build:
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
TARGET='$(DLTARGET)' INTERFACE='$(INTERFACE)' tcl TARGET='$(DLTARGET)' INTERFACE='$(INTERFACE)' tcl
static:: static:
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' tclsh TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' tclsh
clean:: clean:
$(MAKE) -f $(TOP)/Makefile tcl_clean $(MAKE) -f $(TOP)/Makefile tcl_clean
check: all

11
Examples/tcl/contract/Makefile
View file

@ -6,15 +6,16 @@ DLTARGET = example
INTERFACE = example.i INTERFACE = example.i
SWIGOPT = SWIGOPT =
all:: check: build
$(MAKE) -f $(TOP)/Makefile tcl_run
build:
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' SWIGOPT='$(SWIGOPT)' \ $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' SWIGOPT='$(SWIGOPT)' \
TARGET='$(DLTARGET)' INTERFACE='$(INTERFACE)' tcl TARGET='$(DLTARGET)' INTERFACE='$(INTERFACE)' tcl
static:: static:
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' SWIGOPT='$(SWIGOPT)' \ $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' SWIGOPT='$(SWIGOPT)' \
TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' tclsh TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' tclsh
clean:: clean:
$(MAKE) -f $(TOP)/Makefile tcl_clean $(MAKE) -f $(TOP)/Makefile tcl_clean
check: all

11
Examples/tcl/enum/Makefile
View file

@ -5,15 +5,16 @@ TARGET = example
INTERFACE = example.i INTERFACE = example.i
LIBS = -lm LIBS = -lm
all:: check: build
$(MAKE) -f $(TOP)/Makefile tcl_run
build:
$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' tcl_cpp TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' tcl_cpp
static:: static:
$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
TARGET='mytclsh' INTERFACE='$(INTERFACE)' tclsh_cpp_static TARGET='mytclsh' INTERFACE='$(INTERFACE)' tclsh_cpp_static
clean:: clean:
$(MAKE) -f $(TOP)/Makefile tcl_clean $(MAKE) -f $(TOP)/Makefile tcl_clean
check: all

11
Examples/tcl/funcptr/Makefile
View file

@ -5,15 +5,16 @@ TARGET = my_tclsh
DLTARGET = example DLTARGET = example
INTERFACE = example.i INTERFACE = example.i
all:: check: build
$(MAKE) -f $(TOP)/Makefile tcl_run
build:
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
TARGET='$(DLTARGET)' INTERFACE='$(INTERFACE)' tcl TARGET='$(DLTARGET)' INTERFACE='$(INTERFACE)' tcl
static:: static:
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' tclsh TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' tclsh
clean:: clean:
$(MAKE) -f $(TOP)/Makefile tcl_clean $(MAKE) -f $(TOP)/Makefile tcl_clean
check: all

9
Examples/tcl/import/Makefile
View file

@ -3,7 +3,10 @@ SWIG = $(TOP)/../preinst-swig
SWIGOPT = SWIGOPT =
LIBS = LIBS =
all:: check: build
$(MAKE) -f $(TOP)/Makefile tcl_run
build:
$(MAKE) -f $(TOP)/Makefile SWIG='$(SWIG)' SWIGOPT='$(SWIGOPT)' \ $(MAKE) -f $(TOP)/Makefile SWIG='$(SWIG)' SWIGOPT='$(SWIGOPT)' \
LIBS='$(LIBS)' TARGET='base' INTERFACE='base.i' tcl_cpp LIBS='$(LIBS)' TARGET='base' INTERFACE='base.i' tcl_cpp
$(MAKE) -f $(TOP)/Makefile SWIG='$(SWIG)' SWIGOPT='$(SWIGOPT)' \ $(MAKE) -f $(TOP)/Makefile SWIG='$(SWIG)' SWIGOPT='$(SWIGOPT)' \
@ -14,7 +17,5 @@ all::
LIBS='$(LIBS)' TARGET='spam' INTERFACE='spam.i' tcl_cpp LIBS='$(LIBS)' TARGET='spam' INTERFACE='spam.i' tcl_cpp
clean:: clean:
$(MAKE) -f $(TOP)/Makefile tcl_clean $(MAKE) -f $(TOP)/Makefile tcl_clean
check: all

10
Examples/tcl/java/Makefile
View file

@ -5,18 +5,18 @@ TARGET = example
INTERFACE = example.i INTERFACE = example.i
LIBS = -lm LIBS = -lm
all:: Example.class check: build
$(MAKE) -f $(TOP)/Makefile tcl_run
build: Example.class
$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' CXX="gcj" \ TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' CXX="gcj" \
TCL_CXXSHARED="gcj -fpic -shared Example.class " LIBS="-lstdc++" DEFS='' tcl_cpp TCL_CXXSHARED="gcj -fpic -shared Example.class " LIBS="-lstdc++" DEFS='' tcl_cpp
clean:
clean::
$(MAKE) -f $(TOP)/Makefile tcl_clean $(MAKE) -f $(TOP)/Makefile tcl_clean
rm -f *.class Example.h rm -f *.class Example.h
check: all
run: run:
tclsh runme.tcl tclsh runme.tcl

11
Examples/tcl/multimap/Makefile
View file

@ -5,15 +5,16 @@ TARGET = my_tclsh
DLTARGET = example DLTARGET = example
INTERFACE = example.i INTERFACE = example.i
all:: check: build
$(MAKE) -f $(TOP)/Makefile tcl_run
build:
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
TARGET='$(DLTARGET)' INTERFACE='$(INTERFACE)' tcl TARGET='$(DLTARGET)' INTERFACE='$(INTERFACE)' tcl
static:: static:
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' tclsh TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' tclsh
clean:: clean:
$(MAKE) -f $(TOP)/Makefile tcl_clean $(MAKE) -f $(TOP)/Makefile tcl_clean
check: all

11
Examples/tcl/operator/Makefile
View file

@ -5,15 +5,16 @@ TARGET = example
INTERFACE = example.i INTERFACE = example.i
LIBS = -lm LIBS = -lm
all:: check: build
$(MAKE) -f $(TOP)/Makefile tcl_run
build:
$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' tcl_cpp TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' tcl_cpp
static:: static:
$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
TARGET='mytclsh' INTERFACE='$(INTERFACE)' tclsh_cpp_static TARGET='mytclsh' INTERFACE='$(INTERFACE)' tclsh_cpp_static
clean:: clean:
$(MAKE) -f $(TOP)/Makefile tcl_clean $(MAKE) -f $(TOP)/Makefile tcl_clean
check: all

11
Examples/tcl/pointer/Makefile
View file

@ -5,15 +5,16 @@ TARGET = my_tclsh
DLTARGET = example DLTARGET = example
INTERFACE = example.i INTERFACE = example.i
all:: check: build
$(MAKE) -f $(TOP)/Makefile tcl_run
build:
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
TARGET='$(DLTARGET)' INTERFACE='$(INTERFACE)' tcl TARGET='$(DLTARGET)' INTERFACE='$(INTERFACE)' tcl
static:: static:
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' tclsh TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' tclsh
clean:: clean:
$(MAKE) -f $(TOP)/Makefile tcl_clean $(MAKE) -f $(TOP)/Makefile tcl_clean
check: all

11
Examples/tcl/reference/Makefile
View file

@ -5,15 +5,16 @@ TARGET = example
INTERFACE = example.i INTERFACE = example.i
LIBS = -lm LIBS = -lm
all:: check: build
$(MAKE) -f $(TOP)/Makefile tcl_run
build:
$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' tcl_cpp TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' tcl_cpp
static:: static:
$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
TARGET='mytclsh' INTERFACE='$(INTERFACE)' tclsh_cpp_static TARGET='mytclsh' INTERFACE='$(INTERFACE)' tclsh_cpp_static
clean:: clean:
$(MAKE) -f $(TOP)/Makefile tcl_clean $(MAKE) -f $(TOP)/Makefile tcl_clean
check: all

11
Examples/tcl/simple/Makefile
View file

@ -5,15 +5,16 @@ TARGET = my_tclsh
DLTARGET = example DLTARGET = example
INTERFACE = example.i INTERFACE = example.i
all:: check: build
$(MAKE) -f $(TOP)/Makefile tcl_run
build:
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
TARGET='$(DLTARGET)' INTERFACE='$(INTERFACE)' tcl TARGET='$(DLTARGET)' INTERFACE='$(INTERFACE)' tcl
static:: static:
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' tclsh TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' tclsh
clean:: clean:
$(MAKE) -f $(TOP)/Makefile tcl_clean $(MAKE) -f $(TOP)/Makefile tcl_clean
check: all

11
Examples/tcl/std_vector/Makefile
View file

@ -6,15 +6,16 @@ DLTARGET = example
INTERFACE = example.i INTERFACE = example.i
LIBS = -lm LIBS = -lm
all:: check: build
$(MAKE) -f $(TOP)/Makefile tcl_run
build:
$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
TARGET='$(DLTARGET)' INTERFACE='$(INTERFACE)' tcl_cpp TARGET='$(DLTARGET)' INTERFACE='$(INTERFACE)' tcl_cpp
static:: static:
$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' tclsh_cpp_static TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' tclsh_cpp_static
clean:: clean:
$(MAKE) -f $(TOP)/Makefile tcl_clean $(MAKE) -f $(TOP)/Makefile tcl_clean
check: all

11
Examples/tcl/value/Makefile
View file

@ -5,15 +5,16 @@ TARGET = my_tclsh
DLTARGET = example DLTARGET = example
INTERFACE = example.i INTERFACE = example.i
all:: check: build
$(MAKE) -f $(TOP)/Makefile tcl_run
build:
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
TARGET='$(DLTARGET)' INTERFACE='$(INTERFACE)' tcl TARGET='$(DLTARGET)' INTERFACE='$(INTERFACE)' tcl
static:: static:
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' tclsh TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' tclsh
clean:: clean:
$(MAKE) -f $(TOP)/Makefile tcl_clean $(MAKE) -f $(TOP)/Makefile tcl_clean
check: all

11
Examples/tcl/variables/Makefile
View file

@ -5,15 +5,16 @@ TARGET = my_tclsh
DLTARGET = example DLTARGET = example
INTERFACE = example.i INTERFACE = example.i
all:: check: build
$(MAKE) -f $(TOP)/Makefile tcl_run
build:
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
TARGET='$(DLTARGET)' INTERFACE='$(INTERFACE)' tcl TARGET='$(DLTARGET)' INTERFACE='$(INTERFACE)' tcl
static:: static:
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' tclsh TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' tclsh
clean:: clean:
$(MAKE) -f $(TOP)/Makefile tcl_clean $(MAKE) -f $(TOP)/Makefile tcl_clean
check: all