Reorganization
Allan Cornet [Fri, 28 Jul 2006 09:16:35 +0000 (09:16 +0000)]
io modules
submodule io_f

move interf/int*.f  --> modules/io/sci_gateway/fortran/int*.f

core module
move interf/where.f --> modules/core/sci_gateway/fortran/where.f

copy routines/Os_specific/Os_specific.h --> core/src/c/Os_specific.h

30 files changed:
scilab/Scilab.sln
scilab/libs/LibScilab/DllmainLibscilab.c
scilab/modules/core/sci_gateway/fortran/where.f [moved from scilab/routines/interf/where.f with 99% similarity]
scilab/modules/core/src/c/Os_specific.h [new file with mode: 0644]
scilab/modules/core/src/fortran/core_f.vfproj
scilab/modules/io/sci_gateway/c/intfilestat.c
scilab/modules/io/sci_gateway/fortran/intdeff.f [moved from scilab/routines/interf/intdeff.f with 98% similarity]
scilab/modules/io/sci_gateway/fortran/intdiary.f [moved from scilab/routines/interf/intdiary.f with 97% similarity]
scilab/modules/io/sci_gateway/fortran/intdisp.f [moved from scilab/routines/interf/intdisp.f with 97% similarity]
scilab/modules/io/sci_gateway/fortran/intexec.f [moved from scilab/routines/interf/intexec.f with 99% similarity]
scilab/modules/io/sci_gateway/fortran/intexecstr.f [moved from scilab/routines/interf/intexecstr.f with 99% similarity]
scilab/modules/io/sci_gateway/fortran/intfile.f [moved from scilab/routines/interf/intfile.f with 99% similarity]
scilab/modules/io/sci_gateway/fortran/intgetenv.f [moved from scilab/routines/interf/intgetenv.f with 97% similarity]
scilab/modules/io/sci_gateway/fortran/intgetf.f [moved from scilab/routines/interf/intgetf.f with 98% similarity]
scilab/modules/io/sci_gateway/fortran/intgetio.f [moved from scilab/routines/interf/intgetio.f with 95% similarity]
scilab/modules/io/sci_gateway/fortran/intgetpid.f [moved from scilab/routines/interf/intgetpid.f with 95% similarity]
scilab/modules/io/sci_gateway/fortran/inthost.f [moved from scilab/routines/interf/inthost.f with 96% similarity]
scilab/modules/io/sci_gateway/fortran/intlib.f [moved from scilab/routines/interf/intlib.f with 98% similarity]
scilab/modules/io/sci_gateway/fortran/intmgetl.f [moved from scilab/routines/interf/intmgetl.f with 99% similarity]
scilab/modules/io/sci_gateway/fortran/intprint.f [moved from scilab/routines/interf/intprint.f with 97% similarity]
scilab/modules/io/sci_gateway/fortran/intrat.f [moved from scilab/routines/interf/intrat.f with 98% similarity]
scilab/modules/io/sci_gateway/fortran/intread.f [moved from scilab/routines/interf/intread.f with 99% similarity]
scilab/modules/io/sci_gateway/fortran/intread4b.f [moved from scilab/routines/interf/intread4b.f with 99% similarity]
scilab/modules/io/sci_gateway/fortran/intreadb.f [moved from scilab/routines/interf/intreadb.f with 99% similarity]
scilab/modules/io/sci_gateway/fortran/intwritb.f [moved from scilab/routines/interf/intwritb.f with 98% similarity]
scilab/modules/io/sci_gateway/fortran/intwrite.f [moved from scilab/routines/interf/intwrite.f with 99% similarity]
scilab/modules/io/sci_gateway/fortran/intwrite4b.f [moved from scilab/routines/interf/intwrite4b.f with 98% similarity]
scilab/modules/io/sci_gateway/fortran/oldloadsave.f [moved from scilab/routines/interf/oldloadsave.f with 98% similarity]
scilab/modules/io/src/fortran/io_f.vfproj [new file with mode: 0644]
scilab/routines/interf/interf_f/interf_f.vfproj

index 6df0faa..cf48770 100644 (file)
@@ -80,7 +80,7 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibScilab", "libs\LibScilab\LibScilab.vcproj", "{64BC155E-292F-484F-9404-76EE6AE67A43}"\r
        ProjectSection(ProjectDependencies) = postProject\r
                {69296D00-0DE1-4F4B-B0CE-FE4F3CB43923} = {69296D00-0DE1-4F4B-B0CE-FE4F3CB43923}\r
-               {80C0F142-184B-4E08-A8EE-5E71437CF904} = {80C0F142-184B-4E08-A8EE-5E71437CF904}\r
+               {C2EDD447-BB60-41A1-973B-8213FCA9ECD4} = {C2EDD447-BB60-41A1-973B-8213FCA9ECD4}\r
                {959384FC-016C-4B01-B848-1B18D26B6CC4} = {959384FC-016C-4B01-B848-1B18D26B6CC4}\r
                {972C50F5-FE25-4FCF-A43F-D5934DAEE634} = {972C50F5-FE25-4FCF-A43F-D5934DAEE634}\r
                {3A72C3ED-98F7-49C7-B59C-2C6C47FF9390} = {3A72C3ED-98F7-49C7-B59C-2C6C47FF9390}\r
@@ -136,6 +136,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibScilab", "libs\LibScilab
                {566E524B-D327-4416-A865-9C83503FAB7B} = {566E524B-D327-4416-A865-9C83503FAB7B}\r
                {4FC72D4A-80EE-4B1A-8724-0201C1A35621} = {4FC72D4A-80EE-4B1A-8724-0201C1A35621}\r
                {BC23A846-75D6-4375-A5AB-F5A8EFEFE290} = {BC23A846-75D6-4375-A5AB-F5A8EFEFE290}\r
+               {80C0F142-184B-4E08-A8EE-5E71437CF904} = {80C0F142-184B-4E08-A8EE-5E71437CF904}\r
                {B7A0273E-8E71-4663-8497-0895945ED54D} = {B7A0273E-8E71-4663-8497-0895945ED54D}\r
                {B3805031-D315-4275-9D1D-5C43F8E92616} = {B3805031-D315-4275-9D1D-5C43F8E92616}\r
                {13082624-97F9-47DB-A9A1-AD7D6BF3856A} = {13082624-97F9-47DB-A9A1-AD7D6BF3856A}\r
@@ -481,6 +482,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MALLOC", "libs\MALLOC\MALLO
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "io", "modules\io\src\c\io.vcproj", "{80C0F142-184B-4E08-A8EE-5E71437CF904}"\r
 EndProject\r
+Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "io_f", "modules\io\src\fortran\io_f.vfproj", "{C2EDD447-BB60-41A1-973B-8213FCA9ECD4}"\r
+EndProject\r
 Global\r
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
                Debug|Win32 = Debug|Win32\r
@@ -837,6 +840,10 @@ Global
                {80C0F142-184B-4E08-A8EE-5E71437CF904}.Debug|Win32.Build.0 = Debug|Win32\r
                {80C0F142-184B-4E08-A8EE-5E71437CF904}.Release|Win32.ActiveCfg = Release|Win32\r
                {80C0F142-184B-4E08-A8EE-5E71437CF904}.Release|Win32.Build.0 = Release|Win32\r
+               {C2EDD447-BB60-41A1-973B-8213FCA9ECD4}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {C2EDD447-BB60-41A1-973B-8213FCA9ECD4}.Debug|Win32.Build.0 = Debug|Win32\r
+               {C2EDD447-BB60-41A1-973B-8213FCA9ECD4}.Release|Win32.ActiveCfg = Release|Win32\r
+               {C2EDD447-BB60-41A1-973B-8213FCA9ECD4}.Release|Win32.Build.0 = Release|Win32\r
        EndGlobalSection\r
        GlobalSection(SolutionProperties) = preSolution\r
                HideSolutionNode = FALSE\r
index 904f012..a81c2e1 100644 (file)
@@ -37,6 +37,7 @@
 #pragma comment(lib,"../../libs/control_f.lib")\r
 #pragma comment(lib,"../../libs/dcd_f.lib")\r
 #pragma comment(lib,"../../libs/core_f.lib")\r
+#pragma comment(lib,"../../libs/io_f.lib")\r
 #pragma comment(lib,"../../libs/integ_f.lib")\r
 #pragma comment(lib,"../../libs/interf_f.lib")\r
 #pragma comment(lib,"../../libs/intersci_f.lib")\r
similarity index 99%
rename from scilab/routines/interf/where.f
rename to scilab/modules/core/sci_gateway/fortran/where.f
index 5cc6197..8eec16e 100644 (file)
@@ -4,7 +4,7 @@ c     cette routine est issue de la fin du sous programme error
 c     Copyright INRIA
 c     Revised and corrected by Francois VOGEL, July/August 2004
 c     (bugs 908, 922 and 911 are fixed by this version)
-      include '../stack.h'
+      include 'stack.h'
       integer iadr,sadr
       integer p,lpts(6),lcts,r,vol,rios
       logical first
diff --git a/scilab/modules/core/src/c/Os_specific.h b/scilab/modules/core/src/c/Os_specific.h
new file mode 100644 (file)
index 0000000..055961c
--- /dev/null
@@ -0,0 +1,96 @@
+/* Copyright INRIA */
+#ifndef SUNSCI_PROTO
+#define  SUNSCI_PROTO
+
+#include "machine.h" 
+
+typedef long int ftnlen ;
+
+/*  "addinter-n.c.X1" */
+
+void C2F(addinter)(int *iflag,int *descla, int *ptrdescla, int *nvla, char *iname,
+                  int *desc, int *ptrdesc, int *nv, char *c_cpp, 
+                  int *lib_cpp, int *err);
+
+extern void RemoveInterf  __PARAMS((int Nshared));  
+extern void C2F(userlk) __PARAMS((integer *k));  
+
+/*  "bashos-n.c.X1" */
+
+extern int C2F(bashos) __PARAMS((char *ligne, integer *n, integer *nout, integer *ierr, ftnlen ligne_len));  
+
+/*  "basin-n.c.X1" */
+
+extern int C2F(basin) __PARAMS((integer *ierr, integer *lunit, char *string, char *fmt, ftnlen string_len, ftnlen fmt_len));  
+
+/*  "basout-n.c.X1" */
+extern int C2F(basout) __PARAMS((integer *io, integer *lunit, char *string, ftnlen string_len));  
+extern int C2F(basou1) __PARAMS((integer *lunit, char *string, ftnlen string_len));  
+/*  "cgpath-n.c.X1" */
+extern void C2F(cgpath) __PARAMS((char *nomfic, integer *ln));  
+/*  "cluni0-n.c.X1" */
+extern int C2F(cluni0) __PARAMS((char *name, char *nams, integer *ln, ftnlen name_len, ftnlen nams_len));  
+/*  "clunit-n.c.X1" */
+extern int C2F(clunit) __PARAMS((integer *lunit, char *name, integer *mode, ftnlen name_len));  
+/*  "csignal-n.c.X1" */
+extern void controlC_handler  __PARAMS((int sig));  
+extern int C2F(csignal) __PARAMS((void));  
+/*  "ctrlc-n.c.X1" */
+extern int C2F(ctrlc) __PARAMS((void));  
+/*  "dbasin-n.c.X1" */
+extern int C2F(dbasin) __PARAMS((integer *ierr, integer *lunit, char *fmt, double *v, integer *iv, integer *n, ftnlen fmt_len));  
+extern int C2F(s2val) __PARAMS((char *str, double *v, integer *iv, integer *n, integer *maxv, integer *ierr, ftnlen str_len));  
+extern int C2F(nextv) __PARAMS((char *str, double *v, integer *nv, integer *ir, integer *ierr, ftnlen str_len));  
+extern int C2F(s2int) __PARAMS((char *str, integer *nlz, integer *v, integer *ir, integer *ierr, ftnlen str_len));  
+/*  "fgetarg-hpux-n.c.X1" */
+extern int C2F(fgetarg) __PARAMS((integer *n, char *str, ftnlen str_len));  
+/*  "fgetarg-n.c.X1" */
+extern int C2F(fgetarg) __PARAMS((integer *n, char *str, ftnlen str_len));  
+/*  "flags-n.c.X1" */
+extern void set_echo_mode  __PARAMS((int mode));  
+extern int get_echo_mode  __PARAMS((void));  
+extern void set_is_reading  __PARAMS((int mode));  
+extern int get_is_reading  __PARAMS((void));  
+/*  "getenvc-n.c.X1" */
+
+void C2F(getenvc) __PARAMS((int *ierr,char *var,char *buf,int *buflen,int *iflag));
+
+/*  "getpidc-n.c.X1" */
+extern int C2F(getpidc) __PARAMS((int *id1));  
+/*  "getpro-n.c.X1" */
+extern void C2F(getpro) __PARAMS((char *ret_val, ftnlen ret_val_len));  
+
+/*  "inffic-n.c.X1" */
+extern void C2F(inffic) __PARAMS((integer *iopt, char *name, integer *nc));  
+extern void C2F(infficl) __PARAMS((integer *iopt, integer *nc));  
+/*  "inibrk-n.c.X1" */
+extern int C2F(inibrk) __PARAMS((void));  
+extern int C2F(sunieee) __PARAMS((void));  
+extern integer C2F(my_handler_) __PARAMS((integer *sig, integer *code, integer *sigcontext, integer *addr));  
+extern integer C2F(my_ignore_) __PARAMS((integer *sig, integer *code, integer *sigcontext, integer *addr));  
+
+/*  "plevel-n.c.X1" */
+extern int C2F(plevel) __PARAMS((integer *n));  
+/*  "sigbas-n.c.X1" */
+extern int C2F(sigbas) __PARAMS((integer *n));  
+/*  "systemc-n.c.X1" */
+extern int C2F(systemc) __PARAMS((char *command, integer *stat));  
+/*  "timer-n.c.X1" */
+extern int C2F(stimer) __PARAMS((void));  
+/*  "tmpdir-n.c.X1" */
+extern void C2F(settmpdir) __PARAMS((void));  
+extern void C2F(tmpdirc) __PARAMS((void));  
+/*  "zzledt-n.c.X1" */
+extern void C2F(zzledt) __PARAMS((char *buffer, int *buf_size, int *len_line, int *eof, int *interrupt, int *modex,long int dummy1));  
+
+/* link.c */
+extern int LinkStatus  __PARAMS((void));
+extern void C2F(isciulink)(integer *i) ;
+
+
+/* isanan.c */ 
+
+integer C2F(isanan)  __PARAMS((double *x) ); 
+
+
+#endif /* SUNSCI_PROTO */
index a73609e..f7f8d17 100644 (file)
@@ -98,7 +98,8 @@ cd .."/>
                <File RelativePath="..\..\sci_gateway\fortran\sci_useascommand.f"/>\r
                <File RelativePath="..\..\sci_gateway\fortran\sci_whereis.f"/>\r
                <File RelativePath="..\..\sci_gateway\fortran\sci_who.f"/>\r
-               <File RelativePath="userf2.f"/></Filter>\r
+               <File RelativePath="userf2.f"/>\r
+               <File RelativePath="..\..\sci_gateway\fortran\where.f"/></Filter>\r
                <Filter Name="Header Files" Filter="fi;fd">\r
                <File RelativePath="..\..\includes\callinter.h"/>\r
                <File RelativePath="..\..\includes\stack.h"/></Filter>\r
index a10ebd6..b40fe61 100644 (file)
@@ -11,7 +11,7 @@
 
 #include "stack-c.h"
 
-#include "../os_specific/Os_specific.h"
+#include "../../core/src/c/Os_specific.h"
 
 int C2F(intfilestat)(fname)
 char * fname;
similarity index 98%
rename from scilab/routines/interf/intdeff.f
rename to scilab/modules/io/sci_gateway/fortran/intdeff.f
index 017003b..e61caa7 100644 (file)
@@ -1,6 +1,6 @@
       subroutine intdeff
 c     Copyright INRIA/ENPC
-      INCLUDE '../stack.h'
+      INCLUDE 'stack.h'
 c     
       integer mode(2),top0
       integer nocomp,profile
similarity index 97%
rename from scilab/routines/interf/intdiary.f
rename to scilab/modules/io/sci_gateway/fortran/intdiary.f
index 51ee242..dc36b79 100644 (file)
@@ -1,6 +1,6 @@
       subroutine intdiary
 c     Copyright INRIA/ENPC
-      INCLUDE '../stack.h'
+      INCLUDE 'stack.h'
 c     
       integer mode(2),fd
       logical opened,eptover
similarity index 97%
rename from scilab/routines/interf/intdisp.f
rename to scilab/modules/io/sci_gateway/fortran/intdisp.f
index 83ba374..0d391dd 100644 (file)
@@ -1,6 +1,6 @@
       subroutine intdisp
 c     Copyright INRIA/ENPC
-      INCLUDE '../stack.h'
+      INCLUDE 'stack.h'
       integer topk,id(nlgh)
       integer iadr,sadr
       logical eptover
similarity index 99%
rename from scilab/routines/interf/intexec.f
rename to scilab/modules/io/sci_gateway/fortran/intexec.f
index ced8ba7..158a5c6 100644 (file)
@@ -2,7 +2,7 @@
 c     interface of exec function
 
 c     Copyright INRIA/ENPC
-      INCLUDE '../stack.h'
+      INCLUDE 'stack.h'
 c     
       integer flag,semi,typ
       integer mode(2),retu(6)
similarity index 99%
rename from scilab/routines/interf/intexecstr.f
rename to scilab/modules/io/sci_gateway/fortran/intexecstr.f
index 6705e54..3bcde3a 100644 (file)
@@ -1,7 +1,7 @@
       subroutine intexecstr
 c     Copyright INRIA/ENPC
 c     Bug 1054 corrected by Francois VOGEL, October 2004
-      INCLUDE '../stack.h'
+      INCLUDE 'stack.h'
 c     
       integer retu(6),comma,eol,topk,mode(2)
       logical eptover,getsmat,checklhs,checkrhs,checkval
similarity index 99%
rename from scilab/routines/interf/intfile.f
rename to scilab/modules/io/sci_gateway/fortran/intfile.f
index e5c9df0..ed90d82 100644 (file)
@@ -1,7 +1,7 @@
       subroutine intfile
 c     interface for builtin file
 c     Copyright INRIA
-      INCLUDE '../stack.h'
+      INCLUDE 'stack.h'
 c     
       integer status,access,form,recl,old,new,scratc,unknow
       integer sequen,direct,forma1,unform
similarity index 97%
rename from scilab/routines/interf/intgetenv.f
rename to scilab/modules/io/sci_gateway/fortran/intgetenv.f
index 0741fa0..186d5e8 100644 (file)
@@ -3,7 +3,7 @@ c     =============================
 c     getenv('varname' [,'rep'])
       character*(*) fname
       logical checkrhs,checklhs,getsmat,checkval,cresmat2,bufstore
-      include '../stack.h'
+      include 'stack.h'
       rhs = max(0,rhs)
       lbuf = 1
       if(.not.checkrhs(fname,1,2)) return
similarity index 98%
rename from scilab/routines/interf/intgetf.f
rename to scilab/modules/io/sci_gateway/fortran/intgetf.f
index 8576942..ba981f2 100644 (file)
@@ -1,7 +1,7 @@
       subroutine intgetf
 c     
 c     Copyright INRIA/ENPC
-      INCLUDE '../stack.h'
+      INCLUDE 'stack.h'
 c     
       integer mode(2)
       integer nocomp,profile
similarity index 95%
rename from scilab/routines/interf/intgetio.f
rename to scilab/modules/io/sci_gateway/fortran/intgetio.f
index 4d1644c..75eec56 100644 (file)
@@ -1,6 +1,6 @@
       subroutine intgetio(fname)
 c     Copyright INRIA/ENPC
-      INCLUDE '../stack.h'
+      INCLUDE 'stack.h'
 c     
       integer mode(2)
       integer iadr,sadr
similarity index 95%
rename from scilab/routines/interf/intgetpid.f
rename to scilab/modules/io/sci_gateway/fortran/intgetpid.f
index ad3aa72..17eb78f 100644 (file)
@@ -1,6 +1,6 @@
       subroutine intgetpid
 c     Copyright INRIA/ENPC
-      INCLUDE '../stack.h'
+      INCLUDE 'stack.h'
       integer iadr,sadr
 c
       iadr(l)=l+l-1
similarity index 96%
rename from scilab/routines/interf/inthost.f
rename to scilab/modules/io/sci_gateway/fortran/inthost.f
index 91b05ef..931c32c 100644 (file)
@@ -1,6 +1,6 @@
       subroutine inthost
 c     Copyright INRIA/ENPC
-      INCLUDE '../stack.h'
+      INCLUDE 'stack.h'
 c
       integer iadr,sadr
 c
similarity index 98%
rename from scilab/routines/interf/intlib.f
rename to scilab/modules/io/sci_gateway/fortran/intlib.f
index 5593f9c..dd40e5f 100644 (file)
@@ -1,5 +1,5 @@
       subroutine intlib
-      INCLUDE '../stack.h'
+      INCLUDE 'stack.h'
       integer percen,mode(2),id(nlgh)
       logical opened,eptover
       integer iadr,sadr
similarity index 99%
rename from scilab/routines/interf/intmgetl.f
rename to scilab/modules/io/sci_gateway/fortran/intmgetl.f
index 8196e12..0d32c6c 100644 (file)
@@ -1,6 +1,6 @@
       subroutine intmgetl
 c     Copyright INRIA/ENPC
-      INCLUDE '../stack.h'
+      INCLUDE 'stack.h'
 c     
       integer mode(2)
       integer iadr,sadr
similarity index 97%
rename from scilab/routines/interf/intprint.f
rename to scilab/modules/io/sci_gateway/fortran/intprint.f
index 4ecbb17..321bb2e 100644 (file)
@@ -1,6 +1,6 @@
       subroutine intprint
 c     Copyright INRIA/ENPC
-      INCLUDE '../stack.h'
+      INCLUDE 'stack.h'
 c     
       integer flag,top2,tops
       integer mode(2)
similarity index 98%
rename from scilab/routines/interf/intrat.f
rename to scilab/modules/io/sci_gateway/fortran/intrat.f
index 8119dc4..3f2d26f 100644 (file)
@@ -1,6 +1,6 @@
       subroutine intrat
 c     Copyright INRIA/ENPC
-      INCLUDE '../stack.h'
+      INCLUDE 'stack.h'
 c     
       integer tops
       double precision eps,xxx
similarity index 99%
rename from scilab/routines/interf/intread.f
rename to scilab/modules/io/sci_gateway/fortran/intread.f
index 5166169..f6119c8 100644 (file)
@@ -1,6 +1,6 @@
       subroutine intread
 c     Copyright INRIA/ENPC
-      INCLUDE '../stack.h'
+      INCLUDE 'stack.h'
 c     
       integer top2
       integer ftyp,fmttyp,mode(2)
similarity index 99%
rename from scilab/routines/interf/intread4b.f
rename to scilab/modules/io/sci_gateway/fortran/intread4b.f
index 148aa97..4dcb677 100644 (file)
@@ -3,7 +3,7 @@ c     ------------
 c     read binaire real*4
 c     ------------
 c     Copyright INRIA
-      INCLUDE '../stack.h'
+      INCLUDE 'stack.h'
       integer mode(2),top2
 
       logical opened
similarity index 99%
rename from scilab/routines/interf/intreadb.f
rename to scilab/modules/io/sci_gateway/fortran/intreadb.f
index 22b44cd..f4c7c18 100644 (file)
@@ -1,6 +1,6 @@
       subroutine intreadb
 c     Copyright INRIA/ENPC
-      INCLUDE '../stack.h'
+      INCLUDE 'stack.h'
       integer top2
       integer mode(2)
       logical opened
similarity index 98%
rename from scilab/routines/interf/intwritb.f
rename to scilab/modules/io/sci_gateway/fortran/intwritb.f
index bbbac2b..a5b5717 100644 (file)
@@ -1,6 +1,6 @@
       subroutine intwritb
 c     Copyright INRIA/ENPC
-      INCLUDE '../stack.h'
+      INCLUDE 'stack.h'
       integer top2
       integer mode(2)
       logical opened
similarity index 99%
rename from scilab/routines/interf/intwrite.f
rename to scilab/modules/io/sci_gateway/fortran/intwrite.f
index d3c5935..831ec3c 100644 (file)
@@ -1,6 +1,6 @@
       subroutine intwrite
 c     Copyright INRIA/ENPC
-      INCLUDE '../stack.h'
+      INCLUDE 'stack.h'
       integer    lch
       parameter (lch=1024)
       character chaine*(lch)
similarity index 98%
rename from scilab/routines/interf/intwrite4b.f
rename to scilab/modules/io/sci_gateway/fortran/intwrite4b.f
index 574f297..6094a14 100644 (file)
@@ -3,7 +3,7 @@ c     --------------------
 c     write binaire real*4
 c     --------------------
 c     Copyright INRIA
-      INCLUDE '../stack.h'
+      INCLUDE 'stack.h'
       integer mode(2),top2
 
       logical opened
similarity index 98%
rename from scilab/routines/interf/oldloadsave.f
rename to scilab/modules/io/sci_gateway/fortran/oldloadsave.f
index 50115da..7933e38 100644 (file)
@@ -1,6 +1,6 @@
       subroutine oldload
 c     Copyright INRIA/ENPC
-      INCLUDE '../stack.h'
+      INCLUDE 'stack.h'
 c     
       integer id(nsiz),mode(2),h(nsiz)
       integer top2,job,semi
@@ -81,7 +81,7 @@ c
 
       subroutine oldsave
 c     Copyright INRIA/ENPC
-      INCLUDE '../stack.h'
+      INCLUDE 'stack.h'
 c     
       integer id(nsiz),mode(2)
       integer top2,job,semi
diff --git a/scilab/modules/io/src/fortran/io_f.vfproj b/scilab/modules/io/src/fortran/io_f.vfproj
new file mode 100644 (file)
index 0000000..445da67
--- /dev/null
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<VisualStudioProject ProjectType="typeStaticLibrary" ProjectCreator="Intel Fortran" Keyword="Static Library" Version="9.10" ProjectIdGuid="{C2EDD447-BB60-41A1-973B-8213FCA9ECD4}">\r
+       <Platforms>\r
+               <Platform Name="Win32"/></Platforms>\r
+       <Configurations>\r
+               <Configuration Name="Debug|Win32" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.lib;$(TargetPath)" ConfigurationType="typeStaticLibrary">\r
+                               <Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>\r
+                               <Tool Name="VFPreBuildEventTool"/>\r
+                               <Tool Name="VFPostBuildEventTool" CommandLine="cd $(IntDir)\r
+for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n scilex.dll %%f &gt;nul\r
+copy *.def io_f.def &gt;nul\r
+copy io_f.def ..\..\..\..\..\libs\io_f.def &gt;nul\r
+del *.def &gt;nul\r
+cd .." Description="Create io_f.def"/>\r
+                               <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" OptimizeForProcessor="procOptimizeBlended" Preprocess="preprocessYes" AdditionalIncludeDirectories="../../../core/includes" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDebug" DisableDefaultLibSearch="true" CompileOnly="true"/>\r
+                               <Tool Name="VFCustomBuildTool"/>\r
+                               <Tool Name="VFLibrarianTool" OutputFile="../../../../libs/io_f.lib" SuppressStartupBanner="true"/>\r
+                               <Tool Name="VFPreLinkEventTool"/>\r
+                               <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)/$(InputName).res"/></Configuration>\r
+               <Configuration Name="Release|Win32" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.lib;$(TargetPath)" ConfigurationType="typeStaticLibrary">\r
+                               <Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>\r
+                               <Tool Name="VFPreBuildEventTool"/>\r
+                               <Tool Name="VFPostBuildEventTool" CommandLine="cd $(IntDir)\r
+for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n scilex.dll %%f &gt;nul\r
+copy *.def io_f.def &gt;nul\r
+copy io_f.def ..\..\..\..\..\libs\io_f.def &gt;nul\r
+del *.def &gt;nul\r
+cd .." Description="Create io_f.def"/>\r
+                               <Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" OptimizeForProcessor="procOptimizePentiumProThruIII" Preprocess="preprocessYes" AdditionalIncludeDirectories="../../../core/includes" PreprocessorDefinitions="WIN32" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreaded" DisableDefaultLibSearch="true" CompileOnly="true"/>\r
+                               <Tool Name="VFCustomBuildTool"/>\r
+                               <Tool Name="VFLinkerTool" MustRebuild="true" OutputFile="$(OutDir)/$(ProjectName)" SuppressStartupBanner="true"/>\r
+                               <Tool Name="VFLibrarianTool" MustRebuild="true" OutputFile="../../../../libs/io_f.lib" SuppressStartupBanner="true"/>\r
+                               <Tool Name="VFPreLinkEventTool"/>\r
+                               <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)/$(InputName).res"/></Configuration></Configurations>\r
+       <Files>\r
+               <Filter Name="Source Files" Filter="f90;for;f;fpp;ftn;def;odl;idl">\r
+               <File RelativePath="..\..\sci_gateway\fortran\intdeff.f"/>\r
+               <File RelativePath="..\..\sci_gateway\fortran\intdiary.f"/>\r
+               <File RelativePath="..\..\sci_gateway\fortran\intdisp.f"/>\r
+               <File RelativePath="..\..\sci_gateway\fortran\intexec.f"/>\r
+               <File RelativePath="..\..\sci_gateway\fortran\intexecstr.f"/>\r
+               <File RelativePath="..\..\sci_gateway\fortran\intfile.f"/>\r
+               <File RelativePath="..\..\sci_gateway\fortran\intgetenv.f"/>\r
+               <File RelativePath="..\..\sci_gateway\fortran\intgetf.f"/>\r
+               <File RelativePath="..\..\sci_gateway\fortran\intgetio.f"/>\r
+               <File RelativePath="..\..\sci_gateway\fortran\intgetpid.f"/>\r
+               <File RelativePath="..\..\sci_gateway\fortran\inthost.f"/>\r
+               <File RelativePath="..\..\sci_gateway\fortran\intlib.f"/>\r
+               <File RelativePath="..\..\sci_gateway\fortran\intmgetl.f"/>\r
+               <File RelativePath="..\..\sci_gateway\fortran\intprint.f"/>\r
+               <File RelativePath="..\..\sci_gateway\fortran\intrat.f"/>\r
+               <File RelativePath="..\..\sci_gateway\fortran\intread.f"/>\r
+               <File RelativePath="..\..\sci_gateway\fortran\intread4b.f"/>\r
+               <File RelativePath="..\..\sci_gateway\fortran\intreadb.f"/>\r
+               <File RelativePath="..\..\sci_gateway\fortran\intwritb.f"/>\r
+               <File RelativePath="..\..\sci_gateway\fortran\intwrite.f"/>\r
+               <File RelativePath="..\..\sci_gateway\fortran\intwrite4b.f"/>\r
+               <File RelativePath="..\..\sci_gateway\fortran\oldloadsave.f"/></Filter>\r
+               <Filter Name="Header Files" Filter="fi;fd"/>\r
+               <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"/>\r
+               <File RelativePath="..\..\sci_gateway\io.fundef"/></Files>\r
+       <Globals/></VisualStudioProject>\r
index d02b403..d31fc1d 100644 (file)
@@ -50,32 +50,11 @@ cd .."/>
                <File RelativePath="..\insertfield.f"/>\r
                <File RelativePath="..\int2d.f"/>\r
                <File RelativePath="..\int3d.f"/>\r
-               <File RelativePath="..\intdeff.f"/>\r
-               <File RelativePath="..\intdiary.f"/>\r
-               <File RelativePath="..\intdisp.f"/>\r
-               <File RelativePath="..\intexec.f"/>\r
-               <File RelativePath="..\intexecstr.f"/>\r
-               <File RelativePath="..\intfile.f"/>\r
                <File RelativePath="..\intg.f"/>\r
-               <File RelativePath="..\intgetenv.f"/>\r
-               <File RelativePath="..\intgetf.f"/>\r
-               <File RelativePath="..\intgetio.f"/>\r
-               <File RelativePath="..\intgetpid.f"/>\r
-               <File RelativePath="..\inthost.f"/>\r
                <File RelativePath="..\intl_e.f"/>\r
                <File RelativePath="..\intl_i.f"/>\r
-               <File RelativePath="..\intlib.f"/>\r
                <File RelativePath="..\intlinmeq.f"/>\r
                <File RelativePath="..\intlsqrsolve.f"/>\r
-               <File RelativePath="..\intmgetl.f"/>\r
-               <File RelativePath="..\intprint.f"/>\r
-               <File RelativePath="..\intrat.f"/>\r
-               <File RelativePath="..\intread.f"/>\r
-               <File RelativePath="..\intread4b.f"/>\r
-               <File RelativePath="..\intreadb.f"/>\r
-               <File RelativePath="..\intwritb.f"/>\r
-               <File RelativePath="..\intwrite.f"/>\r
-               <File RelativePath="..\intwrite4b.f"/>\r
                <File RelativePath="..\isany.f"/>\r
                <File RelativePath="..\issymmetric.f"/>\r
                <File RelativePath="..\lapackf.f"/>\r
@@ -99,10 +78,8 @@ cd .."/>
                <File RelativePath="..\matopt.f"/>\r
                <File RelativePath="..\matqz.f"/>\r
                <File RelativePath="..\matric.f"/>\r
-               <File RelativePath="..\matsys.f"/>\r
                <File RelativePath="..\misops.f"/>\r
                <File RelativePath="..\newsave.f"/>\r
-               <File RelativePath="..\oldloadsave.f"/>\r
                <File RelativePath="..\polaut.f"/>\r
                <File RelativePath="..\polelm.f"/>\r
                <File RelativePath="..\polops.f"/>\r
@@ -112,7 +89,6 @@ cd .."/>
                <File RelativePath="..\strops.f"/>\r
                <File RelativePath="..\v2cunit.f"/>\r
                <File RelativePath="..\v2unit.f"/>\r
-               <File RelativePath="..\where.f"/>\r
                <File RelativePath="..\xawelm.f"/></Filter>\r
                <Filter Name="Header Files" Filter="fi;fd"/>\r
                <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"/></Files>\r