Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: swig/swig
...
head fork: swig/swig
Checking mergeability… Don't worry, you can still create the pull request.
  • 2 commits
  • 1 file changed
  • 0 commit comments
  • 1 contributor
Commits on Jun 27, 2014
@smarchetto smarchetto Revert "scilab: in Examples makefile use relative path for additional…
… sources"

This reverts commit 24cc827.
58a53d3
Commits on Jun 30, 2014
@smarchetto smarchetto debug travis 69f5f91
Showing with 12 additions and 8 deletions.
  1. +12 −8 Examples/Makefile.in
View
20 Examples/Makefile.in
@@ -1713,15 +1713,15 @@ scilab: $(SRCDIR_SRCS)
if test ! -z "$(SRCS)"; then \
if test ! -z "$(INCLUDES)"; then \
if test ! -z "$(SRCDIR)"; then \
- $(SWIG) -scilab -o $(ISRCS) -addsources "$(SRCS)" -addcflags "-I$(abspath $(INCLUDES))" -addcflags "-I$(abspath $(SRCDIR))" $(SWIGOPT) $(INTERFACEPATH); \
+ $(SWIG) -scilab -o $(ISRCS) -addsources "$(SRCDIR_SRCS)" -addcflags "-I$(abspath $(INCLUDES))" -addcflags "-I$(abspath $(SRCDIR))" $(SWIGOPT) $(INTERFACEPATH); \
else \
- $(SWIG) -scilab -o $(ISRCS) -addsources "$(SRCS)" -addcflags "-I$(abspath $(INCLUDES))" $(SWIGOPT) $(INTERFACEPATH); \
+ $(SWIG) -scilab -o $(ISRCS) -addsources "$(SRCDIR_SRCS)" -addcflags "-I$(abspath $(INCLUDES))" $(SWIGOPT) $(INTERFACEPATH); \
fi \
else \
if test ! -z "$(SRCDIR)"; then \
- $(SWIG) -scilab -o $(ISRCS) -addsources "$(SRCS)" -addcflags "-I$(abspath $(SRCDIR))" $(SWIGOPT) $(INTERFACEPATH); \
+ $(SWIG) -scilab -o $(ISRCS) -addsources "$(SRCDIR_SRCS)" -addcflags "-I$(abspath $(SRCDIR))" $(SWIGOPT) $(INTERFACEPATH); \
else \
- $(SWIG) -scilab -o $(ISRCS) -addsources "$(SRCS)" $(SWIGOPT) $(INTERFACEPATH); \
+ $(SWIG) -scilab -o $(ISRCS) -addsources "$(SRCDIR_SRCS)" $(SWIGOPT) $(INTERFACEPATH); \
fi \
fi \
else \
@@ -1739,6 +1739,8 @@ scilab: $(SRCDIR_SRCS)
fi \
fi \
fi
+ echo $(abspath ../../../../../Examples/scilab/class)
+ ls ../../../../../Examples/scilab/class
env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH MAKEFLAGS="-j1" $(RUNTOOL) $(SCILAB) $(SCILAB_OPT) -e "disp(ls()); exit(exec('builder.sce', 'errcatch', 3))"; \
# ----------------------------------------------------------------
@@ -1749,15 +1751,15 @@ scilab_cpp: $(SRCDIR_SRCS)
if test ! -z "$(SRCS)"; then \
if test ! -z "$(INCLUDES)"; then \
if test ! -z "$(SRCDIR)"; then \
- $(SWIG) -scilab -c++ -o $(ICXXSRCS) -addsources "$(SRCS)" -addcflags "-I$(abspath $(INCLUDES))" -addcflags "-I$(abspath $(SRCDIR))" $(SWIGOPT) $(INTERFACEPATH); \
+ $(SWIG) -scilab -c++ -o $(ICXXSRCS) -addsources "$(SRCDIR_SRCS)" -addcflags "-I$(abspath $(INCLUDES))" -addcflags "-I$(abspath $(SRCDIR))" $(SWIGOPT) $(INTERFACEPATH); \
else \
- $(SWIG) -scilab -c++ -o $(ICXXSRCS) -addsources "$(SRCS)" -addcflags "-I$(abspath $(INCLUDES))" $(SWIGOPT) $(INTERFACEPATH); \
+ $(SWIG) -scilab -c++ -o $(ICXXSRCS) -addsources "$(SRCDIR_SRCS)" -addcflags "-I$(abspath $(INCLUDES))" $(SWIGOPT) $(INTERFACEPATH); \
fi \
else \
if test ! -z "$(SRCDIR)"; then \
- $(SWIG) -scilab -c++ -o $(ICXXSRCS) -addsources "$(SRCS)" -addcflags "-I$(abspath $(SRCDIR))" $(SWIGOPT) $(INTERFACEPATH); \
+ $(SWIG) -scilab -c++ -o $(ICXXSRCS) -addsources "$(SRCDIR_SRCS)" -addcflags "-I$(abspath $(SRCDIR))" $(SWIGOPT) $(INTERFACEPATH); \
else \
- $(SWIG) -scilab -c++ -o $(ICXXSRCS) -addsources "$(SRCS)" $(SWIGOPT) $(INTERFACEPATH); \
+ $(SWIG) -scilab -c++ -o $(ICXXSRCS) -addsources "$(SRCDIR_SRCS)" $(SWIGOPT) $(INTERFACEPATH); \
fi \
fi \
else \
@@ -1775,6 +1777,8 @@ scilab_cpp: $(SRCDIR_SRCS)
fi \
fi \
fi
+ echo $(abspath ../../../../../Examples/scilab/class)
+ ls ../../../../../Examples/scilab/class
env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH MAKEFLAGS="-j1" $(RUNTOOL) $(SCILAB) $(SCILAB_OPT) -e "disp(pwd()); disp(ls()); exit(exec('builder.sce', 'errcatch', 3))"; \
# -----------------------------------------------------------------

No commit comments for this range

Something went wrong with that request. Please try again.