summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSerge Steer <serge.steer@scilab.org>2002-07-12 12:43:49 +0000
committerSerge Steer <serge.steer@scilab.org>2002-07-12 12:43:49 +0000
commit63d8a766b183554f1be1d112da656907c186b0d0 (patch)
tree5333348534922075f4e3fa5eb11e277a39dbbbaf
parent5bb80092a7fad7dc8d7b3b4224e917a4ed14577b (diff)
downloadscilab-63d8a766b183554f1be1d112da656907c186b0d0.zip
scilab-63d8a766b183554f1be1d112da656907c186b0d0.tar.gz
merge version educ nat
-rw-r--r--scilab/ACKNOWLEDGEMENTS5
-rw-r--r--scilab/CHANGES8
-rw-r--r--scilab/Makefile.OBJ.in1
-rw-r--r--scilab/Makefile.amk3
-rw-r--r--scilab/Makefile.in45
-rw-r--r--scilab/Makefile.incl.mak10
-rw-r--r--scilab/Makefile.mak7
-rw-r--r--scilab/Makesubdirs.bat8
-rwxr-xr-xscilab/README27
-rw-r--r--scilab/Version.incl2
-rwxr-xr-xscilab/bin/.cvsignore2
-rwxr-xr-xscilab/bin/wscilab.mnu10
-rw-r--r--scilab/configure.in37
-rw-r--r--scilab/libs/Makefile2
-rw-r--r--scilab/libs/Makefile.mak2
-rw-r--r--scilab/scilab.star115
16 files changed, 168 insertions, 116 deletions
diff --git a/scilab/ACKNOWLEDGEMENTS b/scilab/ACKNOWLEDGEMENTS
index 3791a53..22c282a 100644
--- a/scilab/ACKNOWLEDGEMENTS
+++ b/scilab/ACKNOWLEDGEMENTS
@@ -81,8 +81,6 @@ system2: low level Scilab routines (INRIA).
81 81
82X11: optionnal Xaw and Xmu routines (from mit X11 distribution). 82X11: optionnal Xaw and Xmu routines (from mit X11 distribution).
83 83
84xless: Xless
85
86xsci: top level window and utilities using code from: xterm, xxgdb, xfig 84xsci: top level window and utilities using code from: xterm, xxgdb, xfig
87 combined and modified by J.P. Chancelier. 85 combined and modified by J.P. Chancelier.
88 86
@@ -94,9 +92,6 @@ wsci: Scilab programs for the windows version using code from
94 92
95imp: a set of programs for Scilab prints (J.P.Chancelier). 93imp: a set of programs for Scilab prints (J.P.Chancelier).
96 94
97geci: interprocess communication tool made by CalICo group from
98 LaBRI (University of Bordeaux I, France).
99
100dcd: Library of Fortran Routines for Cumulative Distribution 95dcd: Library of Fortran Routines for Cumulative Distribution
101 Functions, Inverses, and Other Parameters (February, 1994) 96 Functions, Inverses, and Other Parameters (February, 1994)
102 Barry W. Brown, James Lovato, Kathy Russell Department of 97 Barry W. Brown, James Lovato, Kathy Russell Department of
diff --git a/scilab/CHANGES b/scilab/CHANGES
index 25c9e34..c1ad1b1 100644
--- a/scilab/CHANGES
+++ b/scilab/CHANGES
@@ -5,19 +5,25 @@ NEW FUNCTIONALITIES
5=================== 5===================
6Slicot based control routines have been introduced 6Slicot based control routines have been introduced
7Interface with TeXmacs 7Interface with TeXmacs
8text editor for Windows.
8 9
9OTHERS IMPROVEMENTS 10OTHERS IMPROVEMENTS
10=================== 11===================
11Linear algebra primitives now based on Lapack instead of Linpack/Eispack 12Linear algebra primitives now based on Lapack instead of Linpack/Eispack
12Basic functions revised (thanks to B Pincon) 13Basic functions revised (thanks to B Pincon)
13stacksize use is no more restricted 14stacksize use is no more restricted.
15Hypertext online help instead of the old help browser.
14 16
15INCOMPATIBLITY 17INCOMPATIBLITY
16============== 18==============
17User's Scilab function libraries must be rebuild 19User's Scilab function libraries must be rebuild
18gschur and gspec are now obsolete and replaced by schur and spec 20gschur and gspec are now obsolete and replaced by schur and spec
19 21
22Geci and communication library have been removed
20 23
24Metanet graph editor has been removed. You can use SCIGRAPH contribution instead.
25
26man pages have to be written in HTML or better in XML
21 27
22 Main Changes Scilab 2.5 -> 2.6 28 Main Changes Scilab 2.5 -> 2.6
23 ============================== 29 ==============================
diff --git a/scilab/Makefile.OBJ.in b/scilab/Makefile.OBJ.in
index 1edb4ee..4c921e6 100644
--- a/scilab/Makefile.OBJ.in
+++ b/scilab/Makefile.OBJ.in
@@ -16,7 +16,6 @@ LIBRSCI = $(SCIDIR)/libs/system.a $(SCIDIR)/libs/interf.a \
16 $(SCIDIR)/libs/sun.a $(SCIDIR)/libs/gd.a \ 16 $(SCIDIR)/libs/sun.a $(SCIDIR)/libs/gd.a \
17 $(SCIDIR)/libs/intersci.a $(SCIDIR)/libs/@GUILIB@.a \ 17 $(SCIDIR)/libs/intersci.a $(SCIDIR)/libs/@GUILIB@.a \
18 $(SCIDIR)/libs/graphics.a $(SCIDIR)/libs/menusX.a \ 18 $(SCIDIR)/libs/graphics.a $(SCIDIR)/libs/menusX.a \
19 $(SCIDIR)/libs/libcomm.a $(SCIDIR)/libs/comm.a \
20 $(SCIDIR)/libs/sound.a $(SCIDIR)/libs/dcd.a $(SCIDIR)/libs/rand.a \ 19 $(SCIDIR)/libs/sound.a $(SCIDIR)/libs/dcd.a $(SCIDIR)/libs/rand.a \
21 $(BLAS) \ 20 $(BLAS) \
22 $(SCIDIR)/libs/int.a \ 21 $(SCIDIR)/libs/int.a \
diff --git a/scilab/Makefile.amk b/scilab/Makefile.amk
index ffbf0e6..57162a2 100644
--- a/scilab/Makefile.amk
+++ b/scilab/Makefile.amk
@@ -7,7 +7,6 @@ all::scicode bin/scilex.exe
7scicode: 7scicode:
8 @Makesubdirs.bat routines ABSOFT 8 @Makesubdirs.bat routines ABSOFT
9 @Makesubdirs.bat macros ABSOFT 9 @Makesubdirs.bat macros ABSOFT
10 @Makesubdirs.bat wless ABSOFT
11 @Makesubdirs.bat imp ABSOFT 10 @Makesubdirs.bat imp ABSOFT
12 @Makesubdirs.bat intersci ABSOFT 11 @Makesubdirs.bat intersci ABSOFT
13 @if "%COMPILE_PVM%" == "yes" Makesubdirs.bat pvm ABSOFT 12 @if "%COMPILE_PVM%" == "yes" Makesubdirs.bat pvm ABSOFT
@@ -28,7 +27,7 @@ LIBRSCI = libs/system.lib libs/interf.lib libs/system2.lib libs/optim.lib \
28 libs/poly.lib libs/calelm.lib libs/lapack.lib libs/graphics.lib \ 27 libs/poly.lib libs/calelm.lib libs/lapack.lib libs/graphics.lib \
29 libs/sparse.lib libs/metanet.lib libs/sun.lib \ 28 libs/sparse.lib libs/metanet.lib libs/sun.lib \
30 libs/intersci.lib libs/wsci.lib libs/graphics.lib libs/menusX.lib \ 29 libs/intersci.lib libs/wsci.lib libs/graphics.lib libs/menusX.lib \
31 libs/libcomm.lib libs/comm.lib libs/sound.lib libs/dcd.lib \ 30 libs/sound.lib libs/dcd.lib \
32 libs/rand.lib libs/blas.lib libs/xdr.lib \ 31 libs/rand.lib libs/blas.lib libs/xdr.lib \
33 libs/gd.lib \ 32 libs/gd.lib \
34 $(TKSCI) $(PVM) 33 $(TKSCI) $(PVM)
diff --git a/scilab/Makefile.in b/scilab/Makefile.in
index 26da87e..fcbc178 100644
--- a/scilab/Makefile.in
+++ b/scilab/Makefile.in
@@ -28,8 +28,8 @@ include config/@MAKEFILE_TARGET@
28distclean:: 28distclean::
29 $(RM) bin/scilex 29 $(RM) bin/scilex
30 30
31SUBDIRS = scripts maple macros imp intersci @MANVIEWER@ @XMETANET@ \ 31SUBDIRS = scripts maple macros imp intersci \
32 tests demos @COMM@ examples man 32 tests demos examples
33 33
34scilex-lib:: 34scilex-lib::
35 @case '${MFLAGS}' in *[ik]*) set +e;; esac; \ 35 @case '${MFLAGS}' in *[ik]*) set +e;; esac; \
@@ -67,10 +67,39 @@ clean::
67 (cd $$i ; echo "making clean in $$i..."; \ 67 (cd $$i ; echo "making clean in $$i..."; \
68 $(MAKE) $(MFLAGS) clean); \ 68 $(MAKE) $(MFLAGS) clean); \
69 done 69 done
70# making the man
71# whatis must be done first
70 72
71#clean:: 73man: whatis html index
72# @cd pvm3; echo "making clean in pvm3..."; \ 74
73# $(MAKE) $(MFLAGS) clean; 75whatis:
76 @case '${MFLAGS}' in *[ik]*) set +e;; esac; \
77 for i in man;\
78 do \
79 (cd $$i ; echo "making whatis in $$i..."; \
80 $(MAKE) $(MFLAGS) whatis); \
81 done
82
83html:
84 @case '${MFLAGS}' in *[ik]*) set +e;; esac; \
85 for i in man;\
86 do \
87 (cd $$i ; echo "making html in $$i..."; \
88 $(MAKE) $(MFLAGS) html); \
89 done
90
91index:
92 @case '${MFLAGS}' in *[ik]*) set +e;; esac; \
93 (cd man ; echo "making index in man..."; \
94 $(MAKE) $(MFLAGS) index);
95
96manclean:
97 @case '${MFLAGS}' in *[ik]*) set +e;; esac; \
98 for i in man;\
99 do \
100 (cd $$i ; echo "making manclean in $$i..."; \
101 $(MAKE) $(MFLAGS) manclean); \
102 done
74 103
75tests: 104tests:
76 @echo "Type \"make tests\" in $(SCIDIR)/tests directory " 105 @echo "Type \"make tests\" in $(SCIDIR)/tests directory "
@@ -80,6 +109,7 @@ distclean::
80 $(RM) config.cache config.log config.status .binary foo.f foo.o \ 109 $(RM) config.cache config.log config.status .binary foo.f foo.o \
81 conftest conftest.c so_locations 110 conftest conftest.c so_locations
82 111
112# SCIBASE for scilab binaries generation
83SCIBASE = scilab-2.6 113SCIBASE = scilab-2.6
84 114
85PVMBINDISTFILES = \ 115PVMBINDISTFILES = \
@@ -117,7 +147,10 @@ BINDISTFILES = \
117 $(SCIBASE)/imp/NperiPos.ps \ 147 $(SCIBASE)/imp/NperiPos.ps \
118 $(SCIBASE)/imp/giffonts \ 148 $(SCIBASE)/imp/giffonts \
119 $(SCIBASE)/macros \ 149 $(SCIBASE)/macros \
120 $(SCIBASE)/man \ 150 $(SCIBASE)/man/eng/index.html \
151 $(SCIBASE)/man/eng/*/*.html \
152 $(SCIBASE)/man/fr/index.html \
153 $(SCIBASE)/man/fr/*/*.html \
121 $(SCIBASE)/maple \ 154 $(SCIBASE)/maple \
122 $(SCIBASE)/routines/*.h \ 155 $(SCIBASE)/routines/*.h \
123 $(SCIBASE)/routines/Make.lib \ 156 $(SCIBASE)/routines/Make.lib \
diff --git a/scilab/Makefile.incl.mak b/scilab/Makefile.incl.mak
index 90b8bb1..8bbc4c6 100644
--- a/scilab/Makefile.incl.mak
+++ b/scilab/Makefile.incl.mak
@@ -10,11 +10,11 @@ MAKE=nmake /f Makefile.mak
10#--------------------- 10#---------------------
11# To compile with TCL/TK interface, uncomment the following lines and give 11# To compile with TCL/TK interface, uncomment the following lines and give
12# the good pathnames for TKLIBS and TCL_INCLUDES. 12# the good pathnames for TKLIBS and TCL_INCLUDES.
13#TKSCI=libs/tksci.lib 13TKSCI=libs/tksci.lib
14#TKLIBS=d:\tcl8.0\win\tcl80.lib d:\tk8.0\win\tk80.lib 14TKLIBS=C:\Tcl\lib\tcl83.lib C:\Tcl\lib\tk83.lib
15#TKLIBSBIN="$(SCIDIR1)\bin\tcl80.lib" "$(SCIDIR1)\bin\tk80.lib" 15TKLIBSBIN=C:\Tcl\bin\tcl83.lib C:\Tcl\bin\tk83.lib
16#TCL_INCLUDES=-Id:\tcl8.0\generic -Id:\tk8.0\generic -Id:\tk8.0\xlib 16TCL_INCLUDES=-Ic:\Tcl\include -Ic:\Tcl\include\X11
17#DTK=-DWITH_TK 17DTK=-DWITH_TK
18#--------------------- 18#---------------------
19# Scilab pvm library 19# Scilab pvm library
20#--------------------- 20#---------------------
diff --git a/scilab/Makefile.mak b/scilab/Makefile.mak
index a4b67b6..61ddf33 100644
--- a/scilab/Makefile.mak
+++ b/scilab/Makefile.mak
@@ -2,7 +2,7 @@
2SCIDIR=. 2SCIDIR=.
3include Makefile.incl.mak 3include Makefile.incl.mak
4 4
5all :: routines-pvm bin/scilex.exe macros wless imp intersci man 5all :: routines-pvm bin/scilex.exe macros imp intersci
6 6
7!IF "$(DLPVM)" == "YES" 7!IF "$(DLPVM)" == "YES"
8routines-pvm :: routines pvm 8routines-pvm :: routines pvm
@@ -21,9 +21,6 @@ routines::
21macros:: 21macros::
22 Makesubdirs.bat macros 22 Makesubdirs.bat macros
23 23
24wless::
25 Makesubdirs.bat wless
26
27imp:: 24imp::
28 Makesubdirs.bat imp 25 Makesubdirs.bat imp
29 26
@@ -51,7 +48,7 @@ LIBRSCI = libs/system.lib libs/interf.lib libs/system2.lib libs/optim.lib \
51 libs/graphics.lib \ 48 libs/graphics.lib \
52 libs/sparse.lib libs/metanet.lib libs/sun.lib \ 49 libs/sparse.lib libs/metanet.lib libs/sun.lib \
53 libs/intersci.lib libs/wsci.lib libs/graphics.lib libs/menusX.lib \ 50 libs/intersci.lib libs/wsci.lib libs/graphics.lib libs/menusX.lib \
54 libs/libcomm.lib libs/comm.lib libs/sound.lib libs/dcd.lib \ 51 libs/sound.lib libs/dcd.lib \
55 libs/rand.lib libs/blas.lib libs/xdr.lib \ 52 libs/rand.lib libs/blas.lib libs/xdr.lib \
56 libs/gd.lib libs/int.lib \ 53 libs/gd.lib libs/int.lib \
57 libs/libf2c.lib $(TKSCI) $(PVM) 54 libs/libf2c.lib $(TKSCI) $(PVM)
diff --git a/scilab/Makesubdirs.bat b/scilab/Makesubdirs.bat
index 6c1c88c..9d7fc43 100644
--- a/scilab/Makesubdirs.bat
+++ b/scilab/Makesubdirs.bat
@@ -6,7 +6,6 @@ if "%1" == "routines-distclean" goto routines-distclean
6if "%1" == "macros" goto macros 6if "%1" == "macros" goto macros
7if "%1" == "macros-clean" goto macros-clean 7if "%1" == "macros-clean" goto macros-clean
8if "%1" == "macros-distclean" goto macros-distclean 8if "%1" == "macros-distclean" goto macros-distclean
9if "%1" == "wless" goto wless
10if "%1" == "imp" goto imp 9if "%1" == "imp" goto imp
11if "%1" == "intersci" goto intersci 10if "%1" == "intersci" goto intersci
12if "%1" == "dumpexts" goto dumpexts 11if "%1" == "dumpexts" goto dumpexts
@@ -73,13 +72,6 @@ cd macros
73cd .. 72cd ..
74goto end 73goto end
75 74
76:wless
77cd wless
78 echo making all in wless
79 nmake /C /f Makefile.mak
80cd ..
81goto end
82
83:imp 75:imp
84cd imp 76cd imp
85 echo making all in imp 77 echo making all in imp
diff --git a/scilab/README b/scilab/README
index 37a9b01..0f094f1 100755
--- a/scilab/README
+++ b/scilab/README
@@ -1,4 +1,4 @@
1 Scilab version 2.6 1 Scilab version 2.7
2 ****************** 2 ******************
3 3
4 ****************************************************************************** 4 ******************************************************************************
@@ -36,8 +36,8 @@
36 36
37 1 - Configure your system by issuing the following command in the Scilab 37 1 - Configure your system by issuing the following command in the Scilab
38 directory: 38 directory:
39 ./configure --with-tk 39 ./configure
40 Or simply "./configure" if you don't have tcl/tk 8.0 or later 40 Or use "./configure --without-tk" if you don't have tcl/tk 8.0 or later
41 installed. 41 installed.
42 42
43 This will create and/or modify a few Makefile and other files for your 43 This will create and/or modify a few Makefile and other files for your
@@ -73,28 +73,31 @@
73 Athena Widgets library when needed, so the use of this option is not 73 Athena Widgets library when needed, so the use of this option is not
74 recommanded (see below KNOWN PROBLEMS 3). 74 recommanded (see below KNOWN PROBLEMS 3).
75 75
76 --with-xaw3d: use 3D version of Athena Widgets. 76 --without-xaw3d: do not use 3D version of Athena Widgets. The default
77 is to compile with these libraries. If they are not found, standard
78 Athena Widgets are taken.
77 79
78 --without-pvm: compile without PVM library. The default is to compile 80 --without-pvm: compile without PVM library. The default is to compile
79 with PVM library. 81 with PVM library.
82
83 If your PVM libraries and include files are in customized places,
84 you can specify them by hand with the following arguments:
85 --with-pvm-library=DIR: PVM library files are in DIR
86 --with-pvm-include=DIR: PVM include files are in DIR
80 87
81 --with-tk: compile with TCL/TK library. The default is to compile 88 --without-tk: compile without TCL/TK library. The default is to compile
82 without TCL/TK library. You must have libraries of TCL/TK 8.x and 89 with TCL/TK library. You must have libraries of TCL/TK 8.x and
83 corresponding include files installed in standard directory 90 corresponding include files installed in standard directory
84 (configure is looking for them). 91 (configure is looking for them).
85 92
86 If your libraries and include files are in customized places, 93 If your TCL/TK libraries and include files are in customized places,
87 you can specify them by hand with the following arguments: 94 you can specify them by hand with the following arguments:
88 --with-tcl-library=DIR: Tcl library files are in DIR 95 --with-tcl-library=DIR: Tcl library files are in DIR
89 --with-tcl-include=DIR: Tcl include files are in DIR 96 --with-tcl-include=DIR: Tcl include files are in DIR
90 --with-tk-library=DIR: Tk library files are in DIR 97 --with-tk-library=DIR: Tk library files are in DIR
91 --with-tk-include=DIR: Tk include files are in DIR 98 --with-tk-include=DIR: Tk include files are in DIR
92
93 Similarily for PVM :
94 --with-pvm-library=DIR: PVM library files are in DIR
95 --with-pvm-include=DIR: PVM include files are in DIR
96 99
97 --prefix=DIR: scilab will install itself in DIR/scilab-2.6 100 --prefix=DIR: scilab will install itself in DIR/scilab-2.6
98 and create 3 symlinks in DIR/bin 101 and create 3 symlinks in DIR/bin
99 By default prefix=/usr 102 By default prefix=/usr
100 103
diff --git a/scilab/Version.incl b/scilab/Version.incl
index 7349f96..9c39c9e 100644
--- a/scilab/Version.incl
+++ b/scilab/Version.incl
@@ -1 +1 @@
SCIVERSION=scilab-2.6 SCIVERSION=scilab-2.7-CVS
diff --git a/scilab/bin/.cvsignore b/scilab/bin/.cvsignore
index 3847b30..82d5699 100755
--- a/scilab/bin/.cvsignore
+++ b/scilab/bin/.cvsignore
@@ -1,3 +1,3 @@
1geci xmetanet xless intersci-n intersci Slatexpr SEpsf 1intersci-n intersci Slatexpr SEpsf
2Slatexpr2 Slatexprs Slpr BEpsf Blpr Blatexprs Blatexpr2 Blatexpr 2Slatexpr2 Slatexprs Slpr BEpsf Blpr Blatexprs Blatexpr2 Blatexpr
3scilab scilex 3scilab scilex
diff --git a/scilab/bin/wscilab.mnu b/scilab/bin/wscilab.mnu
index 2749cca..e290c25e 100755
--- a/scilab/bin/wscilab.mnu
+++ b/scilab/bin/wscilab.mnu
@@ -96,16 +96,6 @@ E&dit
96 xbasc() 96 xbasc()
97[EndMenu] 97[EndMenu]
98 98
99[Menu]
100&Help
101 &Help Dialog
102 [HELP]
103 &Topic
104 help [INPUT]Help Topic?
105 &Apropos
106 apropos [INPUT]Key ?
107[EndMenu]
108
109; [Menu] 99; [Menu]
110; &Plot 100; &Plot
111; Plot2d 101; Plot2d
diff --git a/scilab/configure.in b/scilab/configure.in
index 2056025..2d08f4f 100644
--- a/scilab/configure.in
+++ b/scilab/configure.in
@@ -1,7 +1,7 @@
1dnl Process this file with autoconf to produce a configure script. 1dnl Process this file with autoconf to produce a configure script.
2## Copyright INRIA 2## Copyright INRIA
3 3
4AC_REVISION($Revision: 1.28 $)dnl 4AC_REVISION($Revision: 1.29 $)dnl
5AC_INIT(license.txt) 5AC_INIT(license.txt)
6SCIDIR=`pwd` 6SCIDIR=`pwd`
7AC_CONFIG_AUX_DIR(config) 7AC_CONFIG_AUX_DIR(config)
@@ -37,13 +37,13 @@ AC_ARG_WITH(local-xaw,
37 [ --with-local-xaw use Xaw widgets given with Scilab (not recommended) ]) 37 [ --with-local-xaw use Xaw widgets given with Scilab (not recommended) ])
38 38
39AC_ARG_WITH(xaw3d, 39AC_ARG_WITH(xaw3d,
40 [ --with-xaw3d use Xaw3d widgets ]) 40 [ --without-xaw3d do not use Xaw3d widgets ])
41 41
42AC_ARG_WITH(pvm, 42AC_ARG_WITH(pvm,
43 [ --without-pvm do not compile with PVM library ]) 43 [ --without-pvm do not compile with PVM library ])
44 44
45AC_ARG_WITH(tk, 45AC_ARG_WITH(tk,
46 [ --with-tk compile with TCL/TK ]) 46 [ --without-tk do not compile with TCL/TK ])
47 47
48AC_ARG_WITH(gtk, 48AC_ARG_WITH(gtk,
49 [ --with-gtk use Gtk widgets ]) 49 [ --with-gtk use Gtk widgets ])
@@ -88,7 +88,7 @@ fi
88######################## 88########################
89 89
90RM='rm -f' 90RM='rm -f'
91FILES_TO_CLEAN='*.CKP *.ln *.BAK *.bak core errs ,* *~ *.a .emacs_* tags TAGS make.log MakeOut .*~ *.trace so_locations *.orig *.cos' 91FILES_TO_CLEAN='*.CKP *.ln *.BAK *.bak core errs ,* *~ *.a .emacs_* tags TAGS make.log MakeOut .*~ *.trace so_locations *.orig *.cos' *.obj
92 92
93################## 93##################
94## making archives 94## making archives
@@ -162,21 +162,6 @@ GZVT=
162# xdr for Win32 162# xdr for Win32
163XDRLIB= 163XDRLIB=
164XDRLIBNAME= 164XDRLIBNAME=
165# communication module: default is "geci" for UNIX
166# does not exist on Win32
167COMM=geci
168# man viewer: default is "xless" for UNIX
169# does not exist on Win32
170# allow --without-xless flag to configure for users who
171# already have xless installed
172if test "$with_xless" != no; then
173MANVIEWER=xless
174else
175MANVIEWER=
176fi
177# graphics Metanet program: default is "xmetanet" for UNIX
178# does not exist on Win32
179XMETANET=xmetanet
180# objects files in routines/menusX: default is XOBJS for UNIX 165# objects files in routines/menusX: default is XOBJS for UNIX
181# for Win32 use WOBJS 166# for Win32 use WOBJS
182MENUSOBJS=XOBJS 167MENUSOBJS=XOBJS
@@ -848,9 +833,6 @@ case "$host" in
848 XDRLIB='xdr' 833 XDRLIB='xdr'
849 XDRLIBNAME='libs/xdr.a' 834 XDRLIBNAME='libs/xdr.a'
850 MENUSOBJS=WOBJS 835 MENUSOBJS=WOBJS
851 COMM=
852 MANVIEWER=wless
853 XMETANET=
854 BLPR_SCRIPTS= 836 BLPR_SCRIPTS=
855 SED_CYGDRIVE='$(CYGDRIVE)' 837 SED_CYGDRIVE='$(CYGDRIVE)'
856 # want to build f2c comand 838 # want to build f2c comand
@@ -1143,7 +1125,7 @@ if test "$PERIFILE" = periX11.o; then
1143 LDFLAGS="$LDFLAGS -L$x_libraries -R$x_libraries" 1125 LDFLAGS="$LDFLAGS -L$x_libraries -R$x_libraries"
1144 fi 1126 fi
1145 AC_CHECK_LIB(Xmu,main,[XAthena=yes],[XAthena=no],-lXt -lXext $X_PRE_LIBS -lX11 $X_EXTRA_LIBS) 1127 AC_CHECK_LIB(Xmu,main,[XAthena=yes],[XAthena=no],-lXt -lXext $X_PRE_LIBS -lX11 $X_EXTRA_LIBS)
1146 if test "$with_xaw3d" = yes; then 1128 if test "$with_xaw3d" != no; then
1147 AC_CHECK_LIB(Xaw3d,main,[XAthena3d=yes],[XAthena3d=no],-lXmu -lXt -lXext $X_PRE_LIBS -lX11 $X_EXTRA_LIBS) 1129 AC_CHECK_LIB(Xaw3d,main,[XAthena3d=yes],[XAthena3d=no],-lXmu -lXt -lXext $X_PRE_LIBS -lX11 $X_EXTRA_LIBS)
1148 if test "$XAthena3d" = no; then 1130 if test "$XAthena3d" = no; then
1149 AC_MSG_ERROR("Xaw3d missing. Use Xaw instead") 1131 AC_MSG_ERROR("Xaw3d missing. Use Xaw instead")
@@ -1400,7 +1382,7 @@ TCLTK_LIBS=
1400TKSCILIB= 1382TKSCILIB=
1401TKSCIDIR= 1383TKSCIDIR=
1402 1384
1403if test "$with_tk" = yes; then 1385if test "$with_tk" != no; then
1404 1386
1405# check user arguments 1387# check user arguments
1406USER_TCL_LIB_PATH="" 1388USER_TCL_LIB_PATH=""
@@ -1438,7 +1420,7 @@ if test $WITH_TKSCI = 1; then
1438 TKSCILIB="\$(SCIDIR)/libs/tksci.a" 1420 TKSCILIB="\$(SCIDIR)/libs/tksci.a"
1439 TKSCIDIR=tksci 1421 TKSCIDIR=tksci
1440else 1422else
1441 AC_MSG_ERROR("TCL/TK not found. Do not use --with-tk") 1423 AC_MSG_ERROR("TCL/TK not found. Use --without-tk")
1442fi 1424fi
1443 1425
1444fi 1426fi
@@ -1510,9 +1492,6 @@ AC_SUBST(GZVT)
1510AC_SUBST(XDRLIB) 1492AC_SUBST(XDRLIB)
1511AC_SUBST(XDRLIBNAME) 1493AC_SUBST(XDRLIBNAME)
1512AC_SUBST(WINXFLAGS) 1494AC_SUBST(WINXFLAGS)
1513AC_SUBST(COMM)
1514AC_SUBST(MANVIEWER)
1515AC_SUBST(XMETANET)
1516AC_SUBST(MENUSOBJS) 1495AC_SUBST(MENUSOBJS)
1517AC_SUBST(MALLOC) 1496AC_SUBST(MALLOC)
1518AC_SUBST(PVMARCH) 1497AC_SUBST(PVMARCH)
@@ -1563,5 +1542,5 @@ AC_SUBST(SED_CYGDRIVE)
1563AC_SUBST(F2C_SUBDIR) 1542AC_SUBST(F2C_SUBDIR)
1564AC_SUBST(EXAMPLES_TESTS) 1543AC_SUBST(EXAMPLES_TESTS)
1565 1544
1566AC_OUTPUT(Makefile.OBJ Makefile.incl Makefile scripts/Makefile routines/Makefile routines/default/Makefile routines/sun/Makefile routines/graphics/Makefile routines/menusX/Makefile routines/xsci/Makefile routines/sparse/Makefile Makemex routines/stack.h config/Makeso.incl routines/control/Makefile routines/calelm/Makefile routines/xsci/jpc_SGraph.c xmetanet/movedraw.c config/Makefile.aix config/Makefile.ultrix routines/lapack/Makefile scripts/scilab.g scripts/scilab-gtk.g examples/Makefile) 1545AC_OUTPUT(Makefile.OBJ Makefile.incl Makefile scripts/Makefile routines/Makefile routines/default/Makefile routines/sun/Makefile routines/graphics/Makefile routines/menusX/Makefile routines/xsci/Makefile routines/sparse/Makefile Makemex routines/stack.h config/Makeso.incl routines/control/Makefile routines/calelm/Makefile routines/xsci/jpc_SGraph.c config/Makefile.aix config/Makefile.ultrix routines/lapack/Makefile scripts/scilab.g scripts/scilab-gtk.g examples/Makefile)
1567 1546
diff --git a/scilab/libs/Makefile b/scilab/libs/Makefile
index e5b1a92..0ec0b75 100644
--- a/scilab/libs/Makefile
+++ b/scilab/libs/Makefile
@@ -7,7 +7,6 @@
7 7
8DEFS= blas.def \ 8DEFS= blas.def \
9calelm.def \ 9calelm.def \
10comm.def \
11control.def \ 10control.def \
12dcd.def \ 11dcd.def \
13fraclab.def \ 12fraclab.def \
@@ -17,7 +16,6 @@ interf.def \
17intersci.def \ 16intersci.def \
18lapack.def \ 17lapack.def \
19slicot.def \ 18slicot.def \
20libcomm.def \
21libf2c.def \ 19libf2c.def \
22menusX.def \ 20menusX.def \
23metanet.def \ 21metanet.def \
diff --git a/scilab/libs/Makefile.mak b/scilab/libs/Makefile.mak
index 02da0fd..31dca1e 100644
--- a/scilab/libs/Makefile.mak
+++ b/scilab/libs/Makefile.mak
@@ -4,7 +4,7 @@ include ../Makefile.incl.mak
4all :: ..\bin\LibScilab.def 4all :: ..\bin\LibScilab.def
5 5
6 6
7FILES = AAbase.def+blas.def+calelm.def+comm.def+control.def+dcd.def+default.def+fraclab.def+graphics.def+integ.def+interf.def+intersci.def+lapack.def+libcomm.def+libf2c.def+menusX.def+metanet.def+optim.def+poly.def+rand.def+scicos.def+signal.def+sound.def+sparse.def+sun.def+system.def+system2.def+wsci.def+xdr.def+gd.def+int.def+slicot.def 7FILES = AAbase.def+blas.def+calelm.def+control.def+dcd.def+default.def+fraclab.def+graphics.def+integ.def+interf.def+intersci.def+lapack.def+libf2c.def+menusX.def+metanet.def+optim.def+poly.def+rand.def+scicos.def+signal.def+sound.def+sparse.def+sun.def+system.def+system2.def+wsci.def+xdr.def+gd.def+int.def+slicot.def
8 8
9!IF "$(DTK)" == "-DWITH_TK" 9!IF "$(DTK)" == "-DWITH_TK"
10FILES1 = $(FILES)+tksci.def 10FILES1 = $(FILES)+tksci.def
diff --git a/scilab/scilab.star b/scilab/scilab.star
index b81457f..6d31104 100644
--- a/scilab/scilab.star
+++ b/scilab/scilab.star
@@ -6,7 +6,7 @@ mode(-1); // silent execution mode
6// clean database when restarted 6// clean database when restarted
7predef(0); //unprotect all variables 7predef(0); //unprotect all variables
8clear // erase all variables 8clear // erase all variables
9clear %helps scicos_pal // explicitly clear %helps scicos_pal variables 9clear scicos_pal // explicitly clear %helps scicos_pal variables
10clearglobal(); 10clearglobal();
11 11
12// Set stack size 12// Set stack size
@@ -35,27 +35,26 @@ if getenv('WIN32','NO')=='OK' then
35end 35end
36 36
37// Load scilab functions libraries 37// Load scilab functions libraries
38errcatch(48,'continue');
39write(%io(2),' loading initial environment') 38write(%io(2),' loading initial environment')
40 39
41load('SCI/macros/mtlb/lib') 40load('SCI/macros/util/lib')
41load('SCI/macros/elem/lib')
42load('SCI/macros/int/lib') 42load('SCI/macros/int/lib')
43load('SCI/macros/calpol/lib')
44load('SCI/macros/sound/lib')
45load('SCI/macros/percent/lib')
43load('SCI/macros/algebre/lib') 46load('SCI/macros/algebre/lib')
44load('SCI/macros/arma/lib') 47load('SCI/macros/arma/lib')
45load('SCI/macros/auto/lib') 48load('SCI/macros/auto/lib')
46load('SCI/macros/calpol/lib')
47load('SCI/macros/comm/lib')
48load('SCI/macros/elem/lib')
49load('SCI/macros/metanet/lib') 49load('SCI/macros/metanet/lib')
50load('SCI/macros/optim/lib') 50load('SCI/macros/optim/lib')
51load('SCI/macros/robust/lib') 51load('SCI/macros/robust/lib')
52load('SCI/macros/sci2for/lib') 52load('SCI/macros/sci2for/lib')
53load('SCI/macros/signal/lib') 53load('SCI/macros/signal/lib')
54load('SCI/macros/tdcs/lib') 54load('SCI/macros/tdcs/lib')
55load('SCI/macros/util/lib')
56load('SCI/macros/xdess/lib') 55load('SCI/macros/xdess/lib')
57load('SCI/macros/sound/lib') 56load('SCI/macros/mtlb/lib')
58load('SCI/macros/percent/lib') 57
59 58
60// Create a temporary directory 59// Create a temporary directory
61TMPDIR=getenv('TMPDIR') 60TMPDIR=getenv('TMPDIR')
@@ -65,54 +64,116 @@ home= getenv('HOME','ndef');
65if home=='ndef',home=unix_g('cd; pwd');end 64if home=='ndef',home=unix_g('cd; pwd');end
66 65
67// use MSDOS syntax? 66// use MSDOS syntax?
68COMP=getenv('COMPILER','NO'); 67MSDOS = getenv('WIN32','NO')=='OK' & ..
69MSDOS = getenv('WIN32','NO')=='OK' & ( COMP=='VC++' | COMP =='ABSOFT' | ... 68 or(getenv('COMPILER','NO')==['VC++' 'ABSOFT' 'gcc'])
70 COMP=='gcc') 69
71clear COMP 70
72// Protect variable previously defined 71// LANGUAGE TO USE FOR ONLINE MAN
73clear ans 72global LANGUAGE
74predef('all') 73LANGUAGE="eng" // default language
74args=sciargs(); larg=find(args=="-l")
75if larg<>[] & larg<=size(args,"*") then
76 L=args(larg+1)
77 if L=="eng" | L=="fr" then
78 LANGUAGE=L
79 else
80 write(%io(2)," ")
81 write(%io(2),"Unsupported language """+L+"""."+..
82 " Choosing default language """+LANGUAGE+""".")
83 end
84end
85clear args larg L
86
87// INDEX file index.html
88global INDEX
89INDEX=SCI+"/man/"+LANGUAGE+"/index.html"
75 90
76//Scilab Help Chapters, %helps is a two column matrix of strings 91//Scilab Help Chapters, %helps is a two column matrix of strings
77%helps=initial_help_chapters() 92global %helps
93%helps=initial_help_chapters(LANGUAGE)
94clear initial_help_chapters
95
96// Define Initial demo tables, demolist is a two column matrix of strings
97global demolist
98demolist=initial_demos_tables()
99clear initial_demos_tables
100
101// Menu for Help
102if (sciargs()<>"-nw")&(sciargs()<>"-nwni") then
103 if MSDOS then
104 delmenu("Help")
105 if funptr("TK_EvalStr")<>0 then
106 addmenu("Help",list(0,"helpcommand"))
107 helpcommand="help()"
108 addmenu("Editor",list(0,"editcommand"))
109 editcommand="editor()"
110 else
111 addmenu("Help",list(0,"helpcommand"))
112 helpcommand="help()"
113 end
114 else
115 if funptr("TK_EvalStr")<>0 then
116 delmenu("Help")
117 addmenu("Help",list(0,"helpcommand"))
118 helpcommand="help()"
119 end
120 end
121end
78 122
79// Scilab help default pagers 123
80%pager="more" 124// Protect variable previously defined
81%xpager="$SCI/bin/xless" 125clear ans %b_h_s
126predef('all')
82 127
83// Define scicos palettes of blocks, scicos_menus and shortcuts 128// Define scicos palettes of blocks, scicos_menus and shortcuts
84[scicos_pal,%scicos_menu,%scicos_short,%scicos_help]=initial_scicos_tables() 129[scicos_pal,%scicos_menu,%scicos_short,%scicos_help]=initial_scicos_tables()
85%scicos_display_mode=0 // =1 if pixmap to be used for display 130%scicos_display_mode=0 // =1 if pixmap to be used for display
131clear initial_scicos_tables
132
133//Start TCL interpretor if required
134if (sciargs()<>"-nw")&(sciargs()<>"-nwni") then
135 if MSDOS then
136 if funptr("TK_EvalStr")<>0 then
137 // Create Scipad TCL interpretor
138 TK_EvalStr("interp create scipad")
139 TK_EvalStr("load {"+SCI+"/bin/tk83.dll} Tk scipad")
140 TK_EvalStr("scipad eval {wm withdraw .}")
141 TK_EvalStr("scipad alias ScilabEval ScilabEval")
142
143 // Create Browsehelp TCL interpretor
144 TK_EvalStr("interp create browsehelp")
145 TK_EvalStr("load {"+SCI+"/bin/tk83.dll} Tk browsehelp")
146 TK_EvalStr("browsehelp eval {wm withdraw .}")
147 end
148 end
149end
150
86 151
87//Define Initial demo tables, demolist is a two column matrix of strings
88demolist=initial_demos_tables()
89clear initial_help_chapters initial_scicos_tables initial_demos_tables
90// calling user initialization 152// calling user initialization
91//============================= 153//=============================
92// Home dir 154// Home dir
93[startup,ierr]=file('open','home/.scilab','old','formatted'); 155[startup,ierr]=file('open','home/.scilab','old','formatted');
94if ierr==0 then 156if ierr==0 then
95 exec(startup,-1);file('close',startup); 157 exec(startup,-1);file('close',startup);
96 clear startup ierr
97else 158else
98 [startup,ierr]=file('open','home/scilab.ini','old','formatted'); 159 [startup,ierr]=file('open','home/scilab.ini','old','formatted');
99 if ierr==0 then 160 if ierr==0 then
100 exec(startup,-1);file('close',startup); 161 exec(startup,-1);file('close',startup);
101 clear startup ierr
102 end 162 end
103end 163end
164clear startup ierr
165
104// working dir 166// working dir
105if home<>PWD then 167if home<>PWD then
106 [startup,ierr]=file('open','.scilab','old','formatted'); 168 [startup,ierr]=file('open','.scilab','old','formatted');
107 if ierr==0 then 169 if ierr==0 then
108 exec(startup,-1);file('close',startup); 170 exec(startup,-1);file('close',startup);
109 clear startup ierr
110 else 171 else
111 [startup,ierr]=file('open','scilab.ini','old','formatted'); 172 [startup,ierr]=file('open','scilab.ini','old','formatted');
112 if ierr==0 then 173 if ierr==0 then
113 exec(startup,-1);file('close',startup); 174 exec(startup,-1);file('close',startup);
114 clear startup ierr
115 end 175 end
116 end 176 end
117end 177end
178clear startup ierr
118 179