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

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

Browse source
This commit is contained in:
William S Fulton 2013-04-15 19:37:07 +01:00
commit 6a48eb5e47
17 changed files with 111 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Examples/Makefile.in
View file

@ -1189,10 +1189,12 @@ LUA_LIB = @LUALINK@
# Extra specific dynamic linking options # Extra specific dynamic linking options
LUA_DLNK = @LUADYNAMICLINKING@ LUA_DLNK = @LUADYNAMICLINKING@
LUA_SO = @LUA_SO@ LUA_SO = @LUA_SO@
LUA = @LUABIN@ LUA = @LUABIN@
LUA_SCRIPT = $(RUNME).lua
# Extra code for lua static link # Extra code for lua static link
LUA_INTERP = ../lua.c LUA_INTERP = ../lua.c
# ---------------------------------------------------------------- # ----------------------------------------------------------------
# Build a C dynamically loadable module # Build a C dynamically loadable module
@ -1226,6 +1228,16 @@ lua_static_cpp: $(SRCS)
$(CXX) $(CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(LUA_INTERP) $(INCLUDES) \ $(CXX) $(CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(LUA_INTERP) $(INCLUDES) \
$(LUA_INCLUDE) $(LIBS) $(LUA_LIB) -o $(TARGET) $(LUA_INCLUDE) $(LIBS) $(LUA_LIB) -o $(TARGET)
# -----------------------------------------------------------------
# Run Lua example
# -----------------------------------------------------------------
lua_run:
$(RUNTOOL) $(LUA) $(LUA_SCRIPT) $(RUNPIPE)
lua_embed_run:
$(RUNTOOL) ./$(TARGET) $(RUNPIPE)
# ----------------------------------------------------------------- # -----------------------------------------------------------------
# Version display # Version display
# ----------------------------------------------------------------- # -----------------------------------------------------------------

11
Examples/lua/arrays/Makefile
View file

@ -4,15 +4,16 @@ SRCS = example.c
TARGET = example TARGET = example
INTERFACE = example.i INTERFACE = example.i
all:: check: build
$(MAKE) -f $(TOP)/Makefile lua_run
build:
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' lua TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' lua
static:: static:
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
TARGET='mylua' INTERFACE='$(INTERFACE)' lua_static TARGET='mylua' INTERFACE='$(INTERFACE)' lua_static
clean:: clean:
$(MAKE) -f $(TOP)/Makefile lua_clean $(MAKE) -f $(TOP)/Makefile lua_clean
check: all

11
Examples/lua/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 lua_run
build:
$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' lua_cpp TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' lua_cpp
static:: static:
$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
TARGET='mylua' INTERFACE='$(INTERFACE)' lua_cpp_static TARGET='mylua' INTERFACE='$(INTERFACE)' lua_cpp_static
clean:: clean:
$(MAKE) -f $(TOP)/Makefile lua_clean $(MAKE) -f $(TOP)/Makefile lua_clean
check: all

11
Examples/lua/constants/Makefile
View file

@ -5,15 +5,16 @@ TARGET = example
INTERFACE = example.i INTERFACE = example.i
LIBS = LIBS =
all:: check: build
$(MAKE) -f $(TOP)/Makefile lua_run
build:
$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' lua TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' lua
static:: static:
$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
TARGET='mylua' INTERFACE='$(INTERFACE)' lua_static TARGET='mylua' INTERFACE='$(INTERFACE)' lua_static
clean:: clean:
$(MAKE) -f $(TOP)/Makefile lua_clean $(MAKE) -f $(TOP)/Makefile lua_clean
check: all

12
Examples/lua/dual/Makefile
View file

@ -7,15 +7,15 @@ LUA_INTERP = dual.cpp
# This is a little different to normal as we need to static link two modules and a custom interpreter # This is a little different to normal as we need to static link two modules and a custom interpreter
# We need the external runtime, then swig examples2, and build the module as normal # We need the external runtime, then swig examples2, and build the module as normal
all:: check: build
$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' lua_embed_run
build:
$(SWIG) -lua -external-runtime $(SWIG) -lua -external-runtime
$(SWIG) -c++ -lua $(SWIGOPT) example2.i $(SWIG) -c++ -lua $(SWIGOPT) example2.i
$(MAKE) -f $(TOP)/Makefile $(SWIGLIB) CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile $(SWIGLIB) CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='example.i' LUA_INTERP='$(LUA_INTERP)' lua_static_cpp SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='example.i' LUA_INTERP='$(LUA_INTERP)' lua_static_cpp
clean:: clean:
$(MAKE) -f $(TOP)/Makefile lua_clean $(MAKE) -f $(TOP)/Makefile lua_clean
rm -f swigluarun.h rm -f swigluarun.h $(TARGET)
check: all

13
Examples/lua/embed/Makefile
View file

@ -1,18 +1,19 @@
TOP = ../.. TOP = ../..
SWIG = $(TOP)/../preinst-swig SWIG = $(TOP)/../preinst-swig
TARGET = embed TARGET = embed
SRCS = example.c SRCS = example.c
INTERFACE = example.i INTERFACE = example.i
LUA_INTERP = embed.c LUA_INTERP = embed.c
# this is a little different to normal as we have our own special interpreter # this is a little different to normal as we have our own special interpreter
# which we want to static link # which we want to static link
all:: check: build
$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' lua_embed_run
build:
$(MAKE) -f $(TOP)/Makefile $(SWIGLIB) SRCS='$(SRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile $(SWIGLIB) SRCS='$(SRCS)' SWIG='$(SWIG)' \
SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='example.i' LUA_INTERP='$(LUA_INTERP)' lua_static SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='example.i' LUA_INTERP='$(LUA_INTERP)' lua_static
clean:: clean:
$(MAKE) -f $(TOP)/Makefile lua_clean $(MAKE) -f $(TOP)/Makefile lua_clean
rm -f $(TARGET)
check: all

13
Examples/lua/embed2/Makefile
View file

@ -1,18 +1,19 @@
TOP = ../.. TOP = ../..
SWIG = $(TOP)/../preinst-swig SWIG = $(TOP)/../preinst-swig
TARGET = embed2 TARGET = embed2
SRCS = example.c SRCS = example.c
INTERFACE = example.i INTERFACE = example.i
LUA_INTERP = embed2.c LUA_INTERP = embed2.c
# this is a little different to normal as we have our own special interpreter # this is a little different to normal as we have our own special interpreter
# which we want to static link # which we want to static link
all:: check: build
$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' lua_embed_run
build:
$(MAKE) -f $(TOP)/Makefile $(SWIGLIB) SRCS='$(SRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile $(SWIGLIB) SRCS='$(SRCS)' SWIG='$(SWIG)' \
SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='example.i' LUA_INTERP='$(LUA_INTERP)' lua_static SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='example.i' LUA_INTERP='$(LUA_INTERP)' lua_static
clean:: clean:
$(MAKE) -f $(TOP)/Makefile lua_clean $(MAKE) -f $(TOP)/Makefile lua_clean
rm -f $(TARGET)
check: all

13
Examples/lua/embed3/Makefile
View file

@ -1,20 +1,21 @@
TOP = ../.. TOP = ../..
SWIG = $(TOP)/../preinst-swig SWIG = $(TOP)/../preinst-swig
TARGET = embed3 TARGET = embed3
SRCS = example.cpp SRCS = example.cpp
INTERFACE = example.i INTERFACE = example.i
LUA_INTERP = embed3.cpp LUA_INTERP = embed3.cpp
# this is a little different to normal as we have our own special interpreter # this is a little different to normal as we have our own special interpreter
# which we want to static link # which we want to static link
# we also need the external runtime, so we can get access to certain internals of SWIG # we also need the external runtime, so we can get access to certain internals of SWIG
all:: check: build
$(MAKE) -f $(TOP)/Makefile TARGET='$(TARGET)' lua_embed_run
build:
$(SWIG) -c++ -lua $(SWIGOPT) -external-runtime swigluarun.h $(SWIG) -c++ -lua $(SWIGOPT) -external-runtime swigluarun.h
$(MAKE) -f $(TOP)/Makefile $(SWIGLIB) SRCS='$(SRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile $(SWIGLIB) SRCS='$(SRCS)' SWIG='$(SWIG)' \
SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='example.i' LUA_INTERP='$(LUA_INTERP)' lua_static_cpp SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='example.i' LUA_INTERP='$(LUA_INTERP)' lua_static_cpp
clean:: clean:
$(MAKE) -f $(TOP)/Makefile lua_clean $(MAKE) -f $(TOP)/Makefile lua_clean
rm -f swigluarun.h $(TARGET)
check: all

11
Examples/lua/exception/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 lua_run
build:
$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' lua_cpp TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' lua_cpp
static:: static:
$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
TARGET='mylua' INTERFACE='$(INTERFACE)' lua_cpp_static TARGET='mylua' INTERFACE='$(INTERFACE)' lua_cpp_static
clean:: clean:
$(MAKE) -f $(TOP)/Makefile lua_clean $(MAKE) -f $(TOP)/Makefile lua_clean
check: all

11
Examples/lua/funcptr3/Makefile
View file

@ -5,15 +5,16 @@ TARGET = example
INTERFACE = example.i INTERFACE = example.i
LIBS = LIBS =
all:: check: build
$(MAKE) -f $(TOP)/Makefile lua_run
build:
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' lua TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' lua
static:: static:
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
TARGET='mylua' INTERFACE='$(INTERFACE)' lua_static TARGET='mylua' INTERFACE='$(INTERFACE)' lua_static
clean:: clean:
$(MAKE) -f $(TOP)/Makefile lua_clean $(MAKE) -f $(TOP)/Makefile lua_clean
check: all

11
Examples/lua/functest/Makefile
View file

@ -5,15 +5,16 @@ TARGET = example
INTERFACE = example.i INTERFACE = example.i
LIBS = LIBS =
all:: check: build
$(MAKE) -f $(TOP)/Makefile lua_run
build:
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' lua TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' lua
static:: static:
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
TARGET='mylua' INTERFACE='$(INTERFACE)' lua_static TARGET='mylua' INTERFACE='$(INTERFACE)' lua_static
clean:: clean:
$(MAKE) -f $(TOP)/Makefile lua_clean $(MAKE) -f $(TOP)/Makefile lua_clean
check: all

11
Examples/lua/functor/Makefile
View file

@ -6,15 +6,16 @@ INTERFACE = example.i
LIBS = -lm LIBS = -lm
SWIGOPT = SWIGOPT =
all:: check: build
$(MAKE) -f $(TOP)/Makefile lua_run
build:
$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' lua_cpp SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' lua_cpp
static:: static:
$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
TARGET='mylua' INTERFACE='$(INTERFACE)' lua_cpp_static TARGET='mylua' INTERFACE='$(INTERFACE)' lua_cpp_static
clean:: clean:
$(MAKE) -f $(TOP)/Makefile lua_clean $(MAKE) -f $(TOP)/Makefile lua_clean
check: all

9
Examples/lua/import/Makefile
View file

@ -3,7 +3,10 @@ SWIG = $(TOP)/../preinst-swig
SWIGOPT = SWIGOPT =
LIBS = LIBS =
all:: check: build
$(MAKE) -f $(TOP)/Makefile lua_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' lua_cpp LIBS='$(LIBS)' TARGET='base' INTERFACE='base.i' lua_cpp
$(MAKE) -f $(TOP)/Makefile SWIG='$(SWIG)' SWIGOPT='$(SWIGOPT)' \ $(MAKE) -f $(TOP)/Makefile SWIG='$(SWIG)' SWIGOPT='$(SWIGOPT)' \
@ -13,7 +16,5 @@ all::
$(MAKE) -f $(TOP)/Makefile SWIG='$(SWIG)' SWIGOPT='$(SWIGOPT)' \ $(MAKE) -f $(TOP)/Makefile SWIG='$(SWIG)' SWIGOPT='$(SWIGOPT)' \
LIBS='$(LIBS)' TARGET='spam' INTERFACE='spam.i' lua_cpp LIBS='$(LIBS)' TARGET='spam' INTERFACE='spam.i' lua_cpp
clean:: clean:
$(MAKE) -f $(TOP)/Makefile lua_clean $(MAKE) -f $(TOP)/Makefile lua_clean
check: all

11
Examples/lua/owner/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 lua_run
build:
$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' lua_cpp TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' lua_cpp
static:: static:
$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
TARGET='mylua' INTERFACE='$(INTERFACE)' lua_cpp_static TARGET='mylua' INTERFACE='$(INTERFACE)' lua_cpp_static
clean:: clean:
$(MAKE) -f $(TOP)/Makefile lua_clean $(MAKE) -f $(TOP)/Makefile lua_clean
check: all

11
Examples/lua/pointer/Makefile
View file

@ -5,15 +5,16 @@ TARGET = example
INTERFACE = example.i INTERFACE = example.i
LIBS = LIBS =
all:: check: build
$(MAKE) -f $(TOP)/Makefile lua_run
build:
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' lua TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' lua
static:: static:
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
TARGET='mylua' INTERFACE='$(INTERFACE)' lua_static TARGET='mylua' INTERFACE='$(INTERFACE)' lua_static
clean:: clean:
$(MAKE) -f $(TOP)/Makefile lua_clean $(MAKE) -f $(TOP)/Makefile lua_clean
check: all

11
Examples/lua/simple/Makefile
View file

@ -4,15 +4,16 @@ SRCS = example.c
TARGET = example TARGET = example
INTERFACE = example.i INTERFACE = example.i
all:: check: build
$(MAKE) -f $(TOP)/Makefile lua_run
build:
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' lua TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' lua
static:: static:
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
TARGET='mylua' INTERFACE='$(INTERFACE)' lua_static TARGET='mylua' INTERFACE='$(INTERFACE)' lua_static
clean:: clean:
$(MAKE) -f $(TOP)/Makefile lua_clean $(MAKE) -f $(TOP)/Makefile lua_clean
check: all

11
Examples/lua/variables/Makefile
View file

@ -4,15 +4,16 @@ SRCS = example.c
TARGET = example TARGET = example
INTERFACE = example.i INTERFACE = example.i
all:: check: build
$(MAKE) -f $(TOP)/Makefile lua_run
build:
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' lua TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' lua
static:: static:
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
TARGET='mylua' INTERFACE='$(INTERFACE)' lua_static TARGET='mylua' INTERFACE='$(INTERFACE)' lua_static
clean:: clean:
$(MAKE) -f $(TOP)/Makefile lua_clean $(MAKE) -f $(TOP)/Makefile lua_clean
check: all