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

Use CXXSRCS for testing for Scilab like other languages

Browse source
This commit is contained in:
William S Fulton 2014-09-02 20:12:19 +01:00
commit 2831d891cd
7 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Examples/Makefile.in
View file

@ -1716,7 +1716,7 @@ endif
# Build a C dynamically loadable module # Build a C dynamically loadable module
# ---------------------------------------------------------------- # ----------------------------------------------------------------
scilab: $(SRCDIR_SRCS) scilab:
if test ! -z "$(SRCS)"; then \ if test ! -z "$(SRCS)"; then \
test "$(SRCS)" = "$(SRCDIR_SRCS)" || cp $(SRCDIR_SRCS) . ; \ test "$(SRCS)" = "$(SRCDIR_SRCS)" || cp $(SRCDIR_SRCS) . ; \
if test ! -z "$(INCLUDES)"; then \ if test ! -z "$(INCLUDES)"; then \
@ -1740,13 +1740,13 @@ scilab: $(SRCDIR_SRCS)
# Build a C++ dynamically loadable module # Build a C++ dynamically loadable module
# ---------------------------------------------------------------- # ----------------------------------------------------------------
scilab_cpp: $(SRCDIR_SRCS) scilab_cpp:
if test ! -z "$(SRCS)"; then \ if test ! -z "$(CXXSRCS)"; then \
test "$(SRCS)" = "$(SRCDIR_SRCS)" || cp $(SRCDIR_SRCS) . ; \ test "$(CXXSRCS)" = "$(SRCDIR_CXXSRCS)" || cp $(SRCDIR_CXXSRCS) . ; \
if test ! -z "$(INCLUDES)"; then \ if test ! -z "$(INCLUDES)"; then \
$(SWIG) -c++ -scilab $(SWIGOPT) -o $(ICXXSRCS) -addsources "$(SRCS)" -addcflags "$(SRCDIR_INCLUDE)" -addcflags "-I$(abspath $(INCLUDES))" $(INTERFACEPATH); \ $(SWIG) -c++ -scilab $(SWIGOPT) -o $(ICXXSRCS) -addsources "$(CXXSRCS)" -addcflags "$(SRCDIR_INCLUDE)" -addcflags "-I$(abspath $(INCLUDES))" $(INTERFACEPATH); \
else \ else \
$(SWIG) -c++ -scilab $(SWIGOPT) -o $(ICXXSRCS) -addsources "$(SRCS)" -addcflags "$(SRCDIR_INCLUDE)" $(INTERFACEPATH); \ $(SWIG) -c++ -scilab $(SWIGOPT) -o $(ICXXSRCS) -addsources "$(CXXSRCS)" -addcflags "$(SRCDIR_INCLUDE)" $(INTERFACEPATH); \
fi \ fi \
else \ else \
if test ! -z "$(INCLUDES)"; then \ if test ! -z "$(INCLUDES)"; then \
@ -1757,7 +1757,7 @@ scilab_cpp: $(SRCDIR_SRCS)
fi fi
env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH MAKEFLAGS="-j1" $(RUNTOOL) $(SCILAB) $(SCILAB_OPT) -e "ierr = exec('builder.sce', 'errcatch', -1); if ierr <> 0 then disp(lasterror()); end; exit(ierr);"; \ env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH MAKEFLAGS="-j1" $(RUNTOOL) $(SCILAB) $(SCILAB_OPT) -e "ierr = exec('builder.sce', 'errcatch', -1); if ierr <> 0 then disp(lasterror()); end; exit(ierr);"; \
STATUS=$$? \ STATUS=$$? \
test "x$(SRCS)" = "x$(SRCDIR_SRCS)" || rm $(SRCS); \ test "x$(CXXSRCS)" = "x$(SRCDIR_CXXSRCS)" || rm $(CXXSRCS); \
exit $(STATUS) exit $(STATUS)
# ----------------------------------------------------------------- # -----------------------------------------------------------------

4
Examples/scilab/class/Makefile
View file

@ -1,6 +1,6 @@
TOP = ../.. TOP = ../..
SWIG = $(TOP)/../preinst-swig SWIG = $(TOP)/../preinst-swig
SRCS = example.cxx CXXSRCS = example.cxx
TARGET = example TARGET = example
INTERFACE = example.i INTERFACE = example.i
@ -8,7 +8,7 @@ check: build
$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' scilab_run $(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' scilab_run
build: build:
$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' SRCS='$(SRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' scilab_cpp TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' scilab_cpp
clean: clean:

4
Examples/scilab/enum/Makefile
View file

@ -1,6 +1,6 @@
TOP = ../.. TOP = ../..
SWIG = $(TOP)/../preinst-swig SWIG = $(TOP)/../preinst-swig
SRCS = example.cxx CXXSRCS = example.cxx
TARGET = example TARGET = example
INTERFACE = example.i INTERFACE = example.i
@ -8,7 +8,7 @@ check: build
$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' scilab_run $(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' scilab_run
build: build:
$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' SRCS='$(SRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' scilab_cpp TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' scilab_cpp
clean: clean:

4
Examples/scilab/scilab_const/Makefile
View file

@ -1,6 +1,6 @@
TOP = ../.. TOP = ../..
SWIG = $(TOP)/../preinst-swig SWIG = $(TOP)/../preinst-swig
SRCS = example.cxx CXXSRCS = example.cxx
TARGET = example TARGET = example
INTERFACE = example.i INTERFACE = example.i
@ -8,7 +8,7 @@ check: build
$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' scilab_run $(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' scilab_run
build: build:
$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' SRCS='$(SRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' scilab_cpp TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' scilab_cpp
clean: clean:

4
Examples/scilab/std_list/Makefile
View file

@ -1,6 +1,6 @@
TOP = ../.. TOP = ../..
SWIG = $(TOP)/../preinst-swig SWIG = $(TOP)/../preinst-swig
SRCS = example.cpp CXXSRCS = example.cpp
TARGET = example TARGET = example
INTERFACE = example.i INTERFACE = example.i
@ -8,7 +8,7 @@ check: build
$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' scilab_run $(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' scilab_run
build: build:
$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' SRCS='$(SRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' scilab_cpp TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' scilab_cpp
clean: clean:

4
Examples/scilab/std_vector/Makefile
View file

@ -1,6 +1,6 @@
TOP = ../.. TOP = ../..
SWIG = $(TOP)/../preinst-swig SWIG = $(TOP)/../preinst-swig
SRCS = CXXSRCS =
TARGET = example TARGET = example
INTERFACE = example.i INTERFACE = example.i
@ -8,7 +8,7 @@ check: build
$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' scilab_run $(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' scilab_run
build: build:
$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' SRCS='$(SRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' scilab_cpp TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' scilab_cpp
clean: clean:

4
Examples/scilab/template/Makefile
View file

@ -1,6 +1,6 @@
TOP = ../.. TOP = ../..
SWIG = $(TOP)/../preinst-swig SWIG = $(TOP)/../preinst-swig
SRCS = CXXSRCS =
TARGET = example TARGET = example
INTERFACE = example.i INTERFACE = example.i
@ -8,7 +8,7 @@ check: build
$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' scilab_run $(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' scilab_run
build: build:
$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' SRCS='$(SRCS)' SWIG='$(SWIG)' \ $(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' scilab_cpp TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' scilab_cpp
clean: clean: