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

Merge pull request #72 from smarchetto/gsoc2012-scilab

Browse source 
Scilab: support of Scilab 5.3.3
This commit is contained in:
Sylvestre Ledru 2013-08-07 09:26:49 -07:00
commit 7791756673
2 changed files with 61 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Examples/Makefile.in
View file

@ -1576,6 +1576,7 @@ SCILAB_INCLUDE = $(DEFS) @SCILABINCLUDE@
SCILAB_LIB = @SCILABLIB@ SCILAB_LIB = @SCILABLIB@
SCILAB = @SCILAB@ SCILAB = @SCILAB@
SCILABOPT = SCILABOPT =
SCILAB_START_OPT = @SCILABSTARTOPT@
# ---------------------------------------------------------------- # ----------------------------------------------------------------
# Build a C dynamically loadable module # Build a C dynamically loadable module
@ -1596,7 +1597,7 @@ scilab: $(SRCS)
fi \ fi \
fi fi
@if [ -f builder.sce ]; then \ @if [ -f builder.sce ]; then \
env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH SCILABPATH=$(srcdir):$$SCILABPATH echo 'exit(1)' |$(SCILAB) -nwni -noatomsautoload -nb -f builder.sce; \ env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH SCILABPATH=$(srcdir):$$SCILABPATH echo 'exit(1)' |$(SCILAB) $(SCILAB_START_OPT) -f builder.sce; \
fi fi
# ---------------------------------------------------------------- # ----------------------------------------------------------------
@ -1618,7 +1619,7 @@ scilab_cpp: $(SRCS)
fi \ fi \
fi fi
@if [ -f builder.sce ]; then \ @if [ -f builder.sce ]; then \
env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH SCILABPATH=$(srcdir):$$SCILABPATH echo 'exit(1)' |$(SCILAB) -nwni -noatomsautoload -nb -f builder.sce; \ env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH SCILABPATH=$(srcdir):$$SCILABPATH echo 'exit(1)' |$(SCILAB) $(SCILAB_START_OPT) -f builder.sce; \
fi fi
# ----------------------------------------------------------------- # -----------------------------------------------------------------

17
configure.ac
View file

@ -996,7 +996,6 @@ if test x"${SCILABBIN}" = xno -o x"${with_alllang}" = xno ; then
AC_MSG_NOTICE([Disabling Scilab]) AC_MSG_NOTICE([Disabling Scilab])
SCILAB= SCILAB=
else else
# First figure out what the name of Scilab is # First figure out what the name of Scilab is
if test "x$SCILABBIN" = xyes; then if test "x$SCILABBIN" = xyes; then
@ -1032,7 +1031,20 @@ if test -n "$SCILAB"; then
AC_MSG_RESULT($SCILABCCFLAGS) AC_MSG_RESULT($SCILABCCFLAGS)
fi fi
else else
AC_MSG_RESULT(could not figure out how to run scilab) AC_MSG_RESULT(could not figure out how to run scilab)
fi
# Set Scilab startup options depending on version
SCILAB_VERSION=`$SCILAB -version|sed -e 's|Scilab version \"\(.*\)\"|\1|g'|head -1`
AC_MSG_RESULT(Found Scilab version $SCILAB_VERSION)
SCILAB_MAJOR_VERSION=`echo $SCILAB_VERSION | cut -d. -f1`
SCILAB_MINOR_VERSION=`echo $SCILAB_VERSION | cut -d. -f2`
SCILABSTARTOPT="-nwni -nb"
if test "$SCILAB_MAJOR_VERSION" -ge 5 ; then
if test "$SCILAB_MINOR_VERSION" -ge 4 ; then
SCILABSTARTOPT+=" -noatomsautoload"
fi
fi fi
fi fi
@ -1042,6 +1054,7 @@ AC_SUBST(SCILABEEXT)
AC_SUBST(SCILABDYNAMICLINKING) AC_SUBST(SCILABDYNAMICLINKING)
AC_SUBST(SCILABLIB) AC_SUBST(SCILABLIB)
AC_SUBST(SCILABCCFLAGS) AC_SUBST(SCILABCCFLAGS)
AC_SUBST(SCILABSTARTOPT)
#---------------------------------------------------------------- #----------------------------------------------------------------
# Look for java # Look for java