Reorganization
Allan Cornet [Tue, 22 Aug 2006 09:13:56 +0000 (09:13 +0000)]
Move os_specific files in core module

39 files changed:
scilab/Scilab.sln
scilab/libs/LibScilab/DllmainLibscilab.c
scilab/modules/core/includes/Os_specific.h [moved from scilab/routines/os_specific/Os_specific.h with 99% similarity]
scilab/modules/core/src/c/CallScilab.c
scilab/modules/core/src/c/addinter.c
scilab/modules/core/src/c/callinterf.c
scilab/modules/core/src/c/cgetarg.c [moved from scilab/routines/os_specific/cgetarg.c with 100% similarity]
scilab/modules/core/src/c/cluni0.c [moved from scilab/routines/os_specific/cluni0.c with 99% similarity]
scilab/modules/core/src/c/core.vcproj
scilab/modules/core/src/c/csignal.c [moved from scilab/routines/os_specific/csignal.c with 91% similarity]
scilab/modules/core/src/c/flags.c [moved from scilab/routines/os_specific/flags.c with 100% similarity]
scilab/modules/core/src/c/getarg-hpux.c [moved from scilab/routines/os_specific/getarg-hpux.c with 100% similarity]
scilab/modules/core/src/c/getarg.c [moved from scilab/routines/os_specific/getarg.c with 82% similarity]
scilab/modules/core/src/c/inffic.c [moved from scilab/routines/os_specific/inffic.c with 93% similarity]
scilab/modules/core/src/c/isanan.c [moved from scilab/routines/os_specific/isanan.c with 94% similarity]
scilab/modules/core/src/c/malloc.c [moved from scilab/routines/os_specific/malloc.c with 100% similarity]
scilab/modules/core/src/c/texmacs.c [moved from scilab/routines/os_specific/texmacs.c with 93% similarity]
scilab/modules/core/src/c/timer.c [moved from scilab/routines/os_specific/timer.c with 99% similarity]
scilab/modules/core/src/c/tmpdir.c [moved from scilab/routines/os_specific/tmpdir.c with 96% similarity]
scilab/modules/core/src/fortran/bashos.f [moved from scilab/routines/os_specific/bashos.f with 94% similarity]
scilab/modules/core/src/fortran/basin.f [moved from scilab/routines/os_specific/basin.f with 97% similarity]
scilab/modules/core/src/fortran/clunit.f [moved from scilab/routines/os_specific/clunit.f with 99% similarity]
scilab/modules/core/src/fortran/core_f.vfproj
scilab/modules/core/src/fortran/ctrlc.f [moved from scilab/routines/os_specific/ctrlc.f with 100% similarity]
scilab/modules/core/src/fortran/dbasin.f [moved from scilab/routines/os_specific/dbasin.f with 99% similarity]
scilab/modules/core/src/fortran/fgetarg-hpux.f [moved from scilab/routines/os_specific/fgetarg-hpux.f with 100% similarity]
scilab/modules/core/src/fortran/fgetarg.f [moved from scilab/routines/os_specific/fgetarg.f with 100% similarity]
scilab/modules/core/src/fortran/getpro.f [moved from scilab/routines/os_specific/getpro.f with 100% similarity]
scilab/modules/core/src/fortran/inibrk.f [moved from scilab/routines/os_specific/inibrk.f with 100% similarity]
scilab/modules/core/src/fortran/sigbas.f [moved from scilab/routines/os_specific/sigbas.f with 98% similarity]
scilab/modules/fileio/src/fileio.c
scilab/routines/calelm/cmp.c
scilab/routines/menusX/men_getfile.c
scilab/routines/menusX/men_scilab.h
scilab/routines/os_specific/Makefile.in [deleted file]
scilab/routines/os_specific/os_specific.vcproj [deleted file]
scilab/routines/os_specific/os_specific_f/os_specific_f.vfproj [deleted file]
scilab/routines/os_specific/os_specific_f/os_specific_f2c.vcproj [deleted file]
scilab/routines/wsci/wtloop.c

index a680232..09a8e61 100644 (file)
@@ -107,7 +107,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibScilab", "libs\LibScilab
                {DFA0D75B-F7EF-4D02-B33F-486829405315} = {DFA0D75B-F7EF-4D02-B33F-486829405315}
                {7B77E45C-9E80-4DDA-A3C8-C6C8FEBAA190} = {7B77E45C-9E80-4DDA-A3C8-C6C8FEBAA190}
                {1D5E735D-176E-4C6D-B980-3C2EC7051F90} = {1D5E735D-176E-4C6D-B980-3C2EC7051F90}
-               {7AF6C45E-142F-436C-A23D-1FC79C9599BE} = {7AF6C45E-142F-436C-A23D-1FC79C9599BE}
                {34F8E361-D2D9-43B0-93D2-F6CF5FAF6CEB} = {34F8E361-D2D9-43B0-93D2-F6CF5FAF6CEB}
                {5B110267-7C18-437C-B87D-DBA2B50729E9} = {5B110267-7C18-437C-B87D-DBA2B50729E9}
                {1311C068-7314-4C3D-9C00-7F5EB4AA4DBB} = {1311C068-7314-4C3D-9C00-7F5EB4AA4DBB}
@@ -154,7 +153,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibScilab", "libs\LibScilab
                {FAF6A7EB-8A36-4278-B34E-34EA89E55304} = {FAF6A7EB-8A36-4278-B34E-34EA89E55304}
                {B0817AEC-2DA0-4C95-9599-4E01F2B547CD} = {B0817AEC-2DA0-4C95-9599-4E01F2B547CD}
                {3A72C3ED-98F7-49C7-B59C-2C6C47FF9390} = {3A72C3ED-98F7-49C7-B59C-2C6C47FF9390}
-               {972C50F5-FE25-4FCF-A43F-D5934DAEE634} = {972C50F5-FE25-4FCF-A43F-D5934DAEE634}
                {959384FC-016C-4B01-B848-1B18D26B6CC4} = {959384FC-016C-4B01-B848-1B18D26B6CC4}
        EndProjectSection
 EndProject
@@ -312,16 +310,6 @@ Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "sparse_f", "modules\sparse\
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "os_specific", "routines\os_specific\os_specific.vcproj", "{7AF6C45E-142F-436C-A23D-1FC79C9599BE}"
-       ProjectSection(ProjectDependencies) = postProject
-               {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
-       EndProjectSection
-EndProject
-Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "os_specific_f", "routines\os_specific\os_specific_f\os_specific_f.vfproj", "{972C50F5-FE25-4FCF-A43F-D5934DAEE634}"
-       ProjectSection(ProjectDependencies) = postProject
-               {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
-       EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wsci", "routines\wsci\wsci.vcproj", "{2652D55A-391C-4341-A299-6B7BDCE45F0C}"
        ProjectSection(ProjectDependencies) = postProject
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
@@ -719,14 +707,6 @@ Global
                {13082624-97F9-47DB-A9A1-AD7D6BF3856A}.Debug|Win32.Build.0 = Debug|Win32
                {13082624-97F9-47DB-A9A1-AD7D6BF3856A}.Release|Win32.ActiveCfg = Release|Win32
                {13082624-97F9-47DB-A9A1-AD7D6BF3856A}.Release|Win32.Build.0 = Release|Win32
-               {7AF6C45E-142F-436C-A23D-1FC79C9599BE}.Debug|Win32.ActiveCfg = Debug|Win32
-               {7AF6C45E-142F-436C-A23D-1FC79C9599BE}.Debug|Win32.Build.0 = Debug|Win32
-               {7AF6C45E-142F-436C-A23D-1FC79C9599BE}.Release|Win32.ActiveCfg = Release|Win32
-               {7AF6C45E-142F-436C-A23D-1FC79C9599BE}.Release|Win32.Build.0 = Release|Win32
-               {972C50F5-FE25-4FCF-A43F-D5934DAEE634}.Debug|Win32.ActiveCfg = Debug|Win32
-               {972C50F5-FE25-4FCF-A43F-D5934DAEE634}.Debug|Win32.Build.0 = Debug|Win32
-               {972C50F5-FE25-4FCF-A43F-D5934DAEE634}.Release|Win32.ActiveCfg = Release|Win32
-               {972C50F5-FE25-4FCF-A43F-D5934DAEE634}.Release|Win32.Build.0 = Release|Win32
                {2652D55A-391C-4341-A299-6B7BDCE45F0C}.Debug|Win32.ActiveCfg = Debug|Win32
                {2652D55A-391C-4341-A299-6B7BDCE45F0C}.Debug|Win32.Build.0 = Debug|Win32
                {2652D55A-391C-4341-A299-6B7BDCE45F0C}.Release|Win32.ActiveCfg = Release|Win32
index ce5670e..dc9ceff 100644 (file)
@@ -45,7 +45,6 @@
 #pragma comment(lib,"../../libs/int_f.lib")
 #pragma comment(lib,"../../libs/metanet_f.lib")
 #pragma comment(lib,"../../libs/optim_f.lib")
-#pragma comment(lib,"../../libs/os_specific_f.lib")
 #pragma comment(lib,"../../libs/randlib_f.lib")
 #pragma comment(lib,"../../libs/scicos_f.lib")
 #pragma comment(lib,"../../libs/signal_f.lib")
similarity index 99%
rename from scilab/routines/os_specific/Os_specific.h
rename to scilab/modules/core/includes/Os_specific.h
index 0c9c0bd..055961c 100644 (file)
@@ -2,7 +2,7 @@
 #ifndef SUNSCI_PROTO
 #define  SUNSCI_PROTO
 
-#include "../machine.h" 
+#include "machine.h" 
 
 typedef long int ftnlen ;
 
index d1c2720..964529d 100644 (file)
@@ -30,6 +30,9 @@ extern void sciGetIdFigure (int *vect, int *id, int *flag);
 extern int IsFromC(void);
 extern int ExitScilab(void);
 extern BOOL GetWITH_GUI(void);
+extern void SetWITH_GUI(BOOL ON);
+extern int C2F(getwins)();
+
 /*-----------------------------------------------------------------------------------*/
 #ifdef _MSC_VER
 extern char *GetScilabDirectory(BOOL UnixStyle);
index 0561599..95524b0 100644 (file)
@@ -12,9 +12,7 @@
 
 #include "link.h"
 #include "addinter.h" 
-
-/*REORGANISATION TEMPORAIRE */
-#include "../../../routines/os_specific/Os_specific.h"
+#include "Os_specific.h"
 
 #include "stack-def.h"
 #include "MALLOC.h" /* MALLOC */
index 361e167..d43bbdf 100644 (file)
@@ -11,7 +11,7 @@
 
 
 #include "addinter.h" /* for DynInterfStart */
-#include "../../../../routines/os_specific/Os_specific.h" /* for DynInterfStart */
+#include "Os_specific.h" /* for DynInterfStart */
 
 static  jmp_buf jmp_env; 
 
similarity index 99%
rename from scilab/routines/os_specific/cluni0.c
rename to scilab/modules/core/src/c/cluni0.c
index b6c801e..915dee2 100644 (file)
@@ -2,7 +2,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "../graphics/Math.h"
+#include "core_math.h"
 #include "Os_specific.h"
 
 #define MAX_ENV 256 
index 4e2ee24..0309001 100644 (file)
                                >
                        </File>
                        <File
+                               RelativePath=".\cluni0.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\csignal.c"
+                               >
+                       </File>
+                       <File
                                RelativePath=".\cvstr.c"
                                >
                        </File>
                                >
                        </File>
                        <File
+                               RelativePath=".\flags.c"
+                               >
+                       </File>
+                       <File
                                RelativePath=".\fromc.c"
                                >
                        </File>
                                >
                        </File>
                        <File
+                               RelativePath=".\getarg.c"
+                               >
+                       </File>
+                       <File
                                RelativePath=".\GetExceptionCode.c"
                                >
                        </File>
                                >
                        </File>
                        <File
+                               RelativePath=".\inffic.c"
+                               >
+                       </File>
+                       <File
                                RelativePath=".\inisci-c.c"
                                >
                        </File>
                                >
                        </File>
                        <File
+                               RelativePath=".\isanan.c"
+                               >
+                       </File>
+                       <File
                                RelativePath=".\link.c"
                                >
                        </File>
                                >
                        </File>
                        <File
+                               RelativePath=".\texmacs.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\timer.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\tmpdir.c"
+                               >
+                       </File>
+                       <File
                                RelativePath=".\userf2.c"
                                >
                        </File>
                                >
                        </File>
                        <File
+                               RelativePath=".\Os_specific.h"
+                               >
+                       </File>
+                       <File
                                RelativePath="..\..\includes\realmain.h"
                                >
                        </File>
similarity index 91%
rename from scilab/routines/os_specific/csignal.c
rename to scilab/modules/core/src/c/csignal.c
index 8e6444e..c903545 100644 (file)
@@ -1,6 +1,6 @@
 /* Copyright INRIA/ENPC */
 
-#include "../machine.h"
+#include "machine.h"
 #include <signal.h>
 
 extern int   C2F(sigbas)(); /*  __PARAMS((integer *));*/
similarity index 82%
rename from scilab/routines/os_specific/getarg.c
rename to scilab/modules/core/src/c/getarg.c
index d57c232..8ec1f95 100644 (file)
@@ -3,12 +3,9 @@
  * special case for win32 
  *--------------------------------------------*/
 
-#include "../graphics/Math.h"
-#ifdef _MSC_VER
-#include "../os_specific/win_mem_alloc.h" /* MALLOC */
-#else
-#include "../os_specific/sci_mem_alloc.h" /* MALLOC */
-#endif
+#include "machine.h"
+#include "core_math.h"
+#include "MALLOC.h" /* MALLOC */
 
 extern int sci_iargc(void);
 extern int sci_getarg(int *,char *,long int ln);
similarity index 93%
rename from scilab/routines/os_specific/inffic.c
rename to scilab/modules/core/src/c/inffic.c
index 7e6c8f5..a491f54 100644 (file)
@@ -1,11 +1,8 @@
 /* Copyright INRIA/ENPC */
 #include <string.h>
+#include "machine.h"
+#include "core_math.h"
 
-#if defined(THINK_C)
-#include "::graphics:Math.h"
-#else
-#include "../graphics/Math.h"
-#endif
 
 #define MAXDATA 5 
 
similarity index 94%
rename from scilab/routines/os_specific/isanan.c
rename to scilab/modules/core/src/c/isanan.c
index 032e8e3..02d3d4e 100644 (file)
@@ -2,7 +2,7 @@
 #include <stdio.h>
 #include <math.h>
 
-#include "../machine.h"
+#include "machine.h"
 #include "Os_specific.h"
 
 
similarity index 93%
rename from scilab/routines/os_specific/texmacs.c
rename to scilab/modules/core/src/c/texmacs.c
index a26807c..0ba10e0 100644 (file)
@@ -1,6 +1,6 @@
 #include <stdio.h> 
-#include "../machine.h" /* for C2F */
-#include "../stack-def.h" /* for paus */
+#include "machine.h" /* for C2F */
+#include "stack-def.h" /* for paus */
 
 #if 0 /* to debug TeXmacs interface */
 #define DATA_BEGIN  ((char) 'B')
similarity index 99%
rename from scilab/routines/os_specific/timer.c
rename to scilab/modules/core/src/c/timer.c
index 6d9a16c..8710079 100644 (file)
@@ -13,7 +13,7 @@
 #endif 
 
 #include <time.h>
-#include "../machine.h"
+#include "machine.h"
 
 #if defined(THINK_C)
        #include <Threads.h> 
similarity index 96%
rename from scilab/routines/os_specific/tmpdir.c
rename to scilab/modules/core/src/c/tmpdir.c
index 7670508..a2cca3d 100644 (file)
@@ -1,13 +1,10 @@
 /* Copyright INRIA/ENPC */
 
-#include "../machine.h"
+#include "machine.h"
 #include <stdio.h>
 
-#ifdef _MSC_VER
-#include "../os_specific/win_mem_alloc.h" /* MALLOC */
-#else
-#include "../os_specific/sci_mem_alloc.h" /* MALLOC */
-#endif
+
+#include "MALLOC.h" /* MALLOC */
 
 #if _MSC_VER
 #include <windows.h>
similarity index 94%
rename from scilab/routines/os_specific/bashos.f
rename to scilab/modules/core/src/fortran/bashos.f
index 7015816..fe761d3 100644 (file)
@@ -3,7 +3,7 @@ c
 c ================================== ( Inria    ) =============
 c
 c     Copyright INRIA
-      include '../stack.h'
+      include 'stack.h'
       integer    ierr,n,nout
       character  ligne*(*)
 c
similarity index 97%
rename from scilab/routines/os_specific/basin.f
rename to scilab/modules/core/src/fortran/basin.f
index 9019cc4..d97e267 100644 (file)
@@ -4,7 +4,7 @@ c     gestion de la standard input
 c ================================== ( Inria ) =============
 c
 c     Copyright INRIA
-      include '../stack.h'
+      include 'stack.h'
 c     --- for myback 
       integer lrecl,bkflag
       parameter (lrecl=512) 
@@ -67,7 +67,7 @@ c     this routine mimin the same behaviour without
 c     using backspace 
 C     this routine is only used in getfun where lrecl 
 C     is also set 
-      include '../stack.h'
+      include 'stack.h'
       integer lrecl,bkflag
       parameter (lrecl=512) 
       character bckbuf*(lrecl)
similarity index 99%
rename from scilab/routines/os_specific/clunit.f
rename to scilab/modules/core/src/fortran/clunit.f
index 1cdd8db..1c30c45 100644 (file)
@@ -33,7 +33,7 @@ c
 c ====================================================================
 c
 c     Copyright INRIA
-      include '../stack.h'
+      include 'stack.h'
       integer       lunit,mode(*)
       character*(*) name
 c
index 2c0384e..e91c43f 100644 (file)
@@ -6,32 +6,32 @@
                <Configuration Name="Debug|Win32" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.lib;$(TargetPath)" ConfigurationType="typeStaticLibrary">
                                <Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
                                <Tool Name="VFPreBuildEventTool"/>
-                               <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" OptimizeForProcessor="procOptimizeBlended" Preprocess="preprocessYes" AdditionalIncludeDirectories="../../includes" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDebug" DisableDefaultLibSearch="true" CompileOnly="true"/>
                                <Tool Name="VFPostBuildEventTool" CommandLine="cd $(IntDir)
 for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n scilex.dll %%f &gt;nul
 copy *.def core_f.def &gt;nul
 copy core_f.def ..\..\..\..\..\libs\core_f.def &gt;nul
 del *.def &gt;nul
 cd .."/>
+                               <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" OptimizeForProcessor="procOptimizeBlended" Preprocess="preprocessYes" AdditionalIncludeDirectories="../../includes" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDebug" DisableDefaultLibSearch="true" CompileOnly="true"/>
                                <Tool Name="VFCustomBuildTool"/>
-                               <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)/$(InputName).res"/>
+                               <Tool Name="VFLibrarianTool" OutputFile="../../../../libs/core_f.lib" SuppressStartupBanner="true"/>
                                <Tool Name="VFPreLinkEventTool"/>
-                               <Tool Name="VFLibrarianTool" OutputFile="../../../../libs/core_f.lib" SuppressStartupBanner="true"/></Configuration>
+                               <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)/$(InputName).res"/></Configuration>
                <Configuration Name="Release|Win32" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.lib;$(TargetPath)" ConfigurationType="typeStaticLibrary">
                                <Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
                                <Tool Name="VFPreBuildEventTool"/>
-                               <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" OptimizeForProcessor="procOptimizePentiumProThruIII" Preprocess="preprocessYes" AdditionalIncludeDirectories="../../includes" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreaded" DisableDefaultLibSearch="true" CompileOnly="true"/>
                                <Tool Name="VFPostBuildEventTool" CommandLine="cd $(IntDir)
 for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n scilex.dll %%f &gt;nul
 copy *.def core_f.def &gt;nul
 copy core_f.def ..\..\..\..\..\libs\core_f.def &gt;nul
 del *.def &gt;nul
 cd .."/>
+                               <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" OptimizeForProcessor="procOptimizePentiumProThruIII" Preprocess="preprocessYes" AdditionalIncludeDirectories="../../includes" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreaded" DisableDefaultLibSearch="true" CompileOnly="true"/>
                                <Tool Name="VFCustomBuildTool"/>
                                <Tool Name="VFLinkerTool" MustRebuild="true" OutputFile="$(OutDir)/$(ProjectName)" SuppressStartupBanner="true"/>
-                               <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)/$(InputName).res"/>
+                               <Tool Name="VFLibrarianTool" MustRebuild="true" OutputFile="../../../../libs/core_f.lib" SuppressStartupBanner="true"/>
                                <Tool Name="VFPreLinkEventTool"/>
-                               <Tool Name="VFLibrarianTool" MustRebuild="true" OutputFile="../../../../libs/core_f.lib" SuppressStartupBanner="true"/></Configuration></Configurations>
+                               <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)/$(InputName).res"/></Configuration></Configurations>
        <Files>
                <Filter Name="Source Files" Filter="f90;for;f;fpp;ftn;def;odl;idl">
                <File RelativePath="algebre.f"/>
@@ -39,6 +39,8 @@ cd .."/>
                <File RelativePath="allowptr.f"/>
                <File RelativePath="atome.f"/>
                <File RelativePath="badd.f"/>
+               <File RelativePath="bashos.f"/>
+               <File RelativePath="basin.f"/>
                <File RelativePath="basnms.f"/>
                <File RelativePath="bcol.f"/>
                <File RelativePath="bexec.f"/>
@@ -67,6 +69,7 @@ cd .."/>
                <File RelativePath="bydot2.f"/>
                <File RelativePath="chkvar.f"/>
                <File RelativePath="clause.f"/>
+               <File RelativePath="clunit.f"/>
                <File RelativePath="cmdstr.f"/>
                <File RelativePath="cmplxt.f"/>
                <File RelativePath="comand.f"/>
@@ -74,9 +77,11 @@ cd .."/>
                <File RelativePath="compil.f"/>
                <File RelativePath="copyvar.f"/>
                <File RelativePath="createref.f"/>
+               <File RelativePath="ctrlc.f"/>
                <File RelativePath="cvdm.f"/>
                <File RelativePath="cvname.f"/>
                <File RelativePath="cvwm.f"/>
+               <File RelativePath="dbasin.f"/>
                <File RelativePath="defmat.f"/>
                <File RelativePath="dldsp.f"/>
                <File RelativePath="dmdsp.f"/>
@@ -107,6 +112,7 @@ cd .."/>
                <File RelativePath="expsum.f"/>
                <File RelativePath="extlarg.f"/>
                <File RelativePath="fact.f"/>
+               <File RelativePath="fgetarg.f"/>
                <File RelativePath="find.f"/>
                <File RelativePath="findequal.f"/>
                <File RelativePath="fmttyp.f"/>
@@ -120,8 +126,10 @@ cd .."/>
                <File RelativePath="getfunction.f"/>
                <File RelativePath="getlin.f"/>
                <File RelativePath="getnum.f"/>
+               <File RelativePath="getpro.f"/>
                <File RelativePath="getstr.f"/>
                <File RelativePath="getsym.f"/>
+               <File RelativePath="inibrk.f"/>
                <File RelativePath="inisci.f"/>
                <File RelativePath="intstr.f"/>
                <File RelativePath="isbrk.f"/>
@@ -204,6 +212,7 @@ cd .."/>
                <File RelativePath="setippty.f"/>
                <File RelativePath="setlnb.f"/>
                <File RelativePath="showstack.f"/>
+               <File RelativePath="sigbas.f"/>
                <File RelativePath="skpins.f"/>
                <File RelativePath="stack.f"/>
                <File RelativePath="stackg.f"/>
similarity index 99%
rename from scilab/routines/os_specific/dbasin.f
rename to scilab/modules/core/src/fortran/dbasin.f
index 2fde00b..a01069b 100644 (file)
@@ -6,7 +6,7 @@ c
 c ================================== ( Inria    ) =============
 c
 c     Copyright INRIA
-      include '../stack.h'
+      include 'stack.h'
       character*(*) fmt
       double precision v(*)
       integer ierr,lunit
similarity index 98%
rename from scilab/routines/os_specific/sigbas.f
rename to scilab/modules/core/src/fortran/sigbas.f
index d59cd5b..3d66b6c 100644 (file)
@@ -7,7 +7,7 @@ c traitement de l'erreur fortran ou du break
 c
 c     Copyright INRIA
       integer  n
-      include '../stack.h'
+      include 'stack.h'
       logical iflag,interruptible
       common /basbrk/ iflag,interruptible
       integer  ilk,k,l,lunit,nc,mode(2)
index 4cde1af..383ca03 100644 (file)
 
 #include <ctype.h>  /* isdigit */
 #include "core_math.h"
-
-
-
 #include "MALLOC.h" /* MALLOC */
-
 #include "stack-c.h"
-
-/* REORGANISATION TEMPORAIRE */
-#include "../../../routines/os_specific/Os_specific.h"
+#include "../../core/includes/Os_specific.h"
 /*-----------------------------------------------------------------------------------*/
 typedef union {
   char * c;
index 6c0abde..0773418 100644 (file)
@@ -1,7 +1,8 @@
 /* copyright Enpc: Jean-Philippe Chancelier  */
 
 #include "../stack-c.h" 
-#include "../os_specific/Os_specific.h" /* isanan */ 
+/* REOGANISATION TEMPORAIRE */
+#include "../../modules/core/includes/Os_specific.h" /* isanan */ 
 
 #ifdef _MSC_VER 
 /* vc++ pbs with nan and comparisons */ 
index 9ca23f1..d27e0ad 100644 (file)
@@ -5,7 +5,8 @@
 #include "men_scilab.h"
 #endif
 
-#include "../os_specific/Os_specific.h"
+/* REORGANISATION TEMPORAIRE */
+#include "../../modules/core/includes/Os_specific.h" /* isanan */ 
 
 #ifdef _MSC_VER
 #include "../os_specific/win_mem_alloc.h" /* MALLOC */
index d847e2b..8000f14 100644 (file)
@@ -7,7 +7,7 @@
 #include "../machine.h"
 #include "../graphics/Math.h"
 #include "../graphics/Graphics.h"
-#include "../os_specific/men_Sutils.h"
+/*#include "../os_specific/men_Sutils.h"*/
 
 #if defined(THINK_C)
 #define Widget int
diff --git a/scilab/routines/os_specific/Makefile.in b/scilab/routines/os_specific/Makefile.in
deleted file mode 100644 (file)
index 0a02751..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-SHELL = /bin/sh
-SCIDIR=../..
-
-LIBRARY = $(SCIDIR)/libs/os_specific.a
-
-OBJSF = bashos.o basin.o basout.o \
-       clunit.o ctrlc.o dbasin.o  \
-       @FGETARG@.o getpro.o inibrk.o sigbas.o 
-
-OBJSC  = getenvc.o link.o systemc.o   csignal.o getpidc.o timer.o \
-       flags.o men_Sutils.o addinter.o  tmpdir.o cluni0.o setenvc.o \
-       inffic.o isanan.o  texmacs.o sci_mem_alloc.o getmemory.o @GETARG@.o @MALLOC@ 
-
-include ../../Makefile.incl
-
-CFLAGS = $(CC_OPTIONS) $(XFLAGS) $(TK_INC_PATH) $(TCL_INC_PATH) @HPPA_OLD@
-
-FFLAGS = $(FC_OPTIONS)
-
-include ../Make.lib
-
-bashos.o: ../stack.h
-basin.o: ../stack.h
-basout.o: ../stack.h
-clunit.o: ../stack.h
-dbasin.o: ../stack.h
-sigbas.o: ../stack.h
-
-addinter.o: addinter.c ../graphics/Math.h ../machine.h \
-       ../graphics/Graphics.h men_Sutils.h link.h addinter.h Os_specific.h \
-       ../stack-def.h
-cluni0.o: cluni0.c ../graphics/Math.h ../machine.h ../graphics/Graphics.h \
-       Os_specific.h
-csignal.o: csignal.c ../machine.h
-getarg-hpux.o: getarg-hpux.c ../graphics/Math.h ../machine.h \
-       ../graphics/Graphics.h
-getarg.o: getarg.c ../graphics/Math.h ../machine.h ../graphics/Graphics.h
-getenvc.o: getenvc.c ../graphics/Math.h ../machine.h \
-       ../graphics/Graphics.h Os_specific.h
-getpidc.o: getpidc.c ../machine.h
-inffic.o: inffic.c ../graphics/Math.h ../machine.h ../graphics/Graphics.h
-isanan.o: isanan.c ../machine.h Os_specific.h 
-link.o: link.c ../graphics/Math.h ../machine.h ../graphics/Graphics.h \
-       men_Sutils.h link.h link_SYSV.c ../stack-def.h
-link_SYSV.o: link_SYSV.c ../stack-def.h
-link_W95.o: link_W95.c ../stack-def.h
-link_linux.o: link_linux.c ../dld/dld.h
-men_Sutils.o: men_Sutils.c ../machine.h men_Sutils.h
-systemc.o: systemc.c ../machine.h
-texmacs.o: texmacs.c ../machine.h ../stack-def.h
-timer.o: timer.c ../machine.h
-tmpdir.o: tmpdir.c ../machine.h
-sci_mem_alloc.o: sci_mem_alloc.c ../sci_mem_alloc.h
-getmemory.o: getmemory.c  getmemory.h
diff --git a/scilab/routines/os_specific/os_specific.vcproj b/scilab/routines/os_specific/os_specific.vcproj
deleted file mode 100644 (file)
index e96a909..0000000
+++ /dev/null
@@ -1,224 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-       ProjectType="Visual C++"
-       Version="8,00"
-       Name="os_specific"
-       ProjectGUID="{7AF6C45E-142F-436C-A23D-1FC79C9599BE}"
-       >
-       <Platforms>
-               <Platform
-                       Name="Win32"
-               />
-       </Platforms>
-       <ToolFiles>
-       </ToolFiles>
-       <Configurations>
-               <Configuration
-                       Name="Debug|Win32"
-                       OutputDirectory="$(ConfigurationName)"
-                       IntermediateDirectory="$(ConfigurationName)"
-                       ConfigurationType="4"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       CharacterSet="2"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="0"
-                               AdditionalIncludeDirectories=""
-                               PreprocessorDefinitions="_LIB;STRICT;WITH_TK;_DEBUG;_CRT_SECURE_NO_DEPRECATE"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="1"
-                               UsePrecompiledHeader="0"
-                               PrecompiledHeaderFile=""
-                               AssemblerListingLocation="$(ConfigurationName)/"
-                               ObjectFile="$(ConfigurationName)/"
-                               ProgramDataBaseFileName="$(ConfigurationName)/"
-                               WarningLevel="3"
-                               SuppressStartupBanner="true"
-                               DebugInformationFormat="3"
-                               CompileAs="0"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="_DEBUG"
-                               Culture="1036"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLibrarianTool"
-                               OutputFile="../../libs/os_specific.lib"
-                               SuppressStartupBanner="true"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                               CommandLine="cd &quot;$(IntDir)&quot; &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\bin\dumpexts -o %%~nf.def -n libscilab.dll %%f &gt;nul&#x0D;&#x0A;copy *.def os_specific.def &gt;nul&#x0D;&#x0A;copy os_specific.def ..\..\..\libs\os_specific.def &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Release|Win32"
-                       OutputDirectory="$(ConfigurationName)"
-                       IntermediateDirectory="$(ConfigurationName)"
-                       ConfigurationType="4"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       CharacterSet="2"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="2"
-                               InlineFunctionExpansion="1"
-                               FavorSizeOrSpeed="1"
-                               AdditionalIncludeDirectories=""
-                               PreprocessorDefinitions="NDEBUG;_LIB;STRICT;WITH_TK;_CRT_SECURE_NO_DEPRECATE"
-                               StringPooling="true"
-                               RuntimeLibrary="0"
-                               EnableFunctionLevelLinking="true"
-                               EnableEnhancedInstructionSet="1"
-                               UsePrecompiledHeader="0"
-                               PrecompiledHeaderFile=""
-                               AssemblerListingLocation="$(ConfigurationName)/"
-                               ObjectFile="$(ConfigurationName)/"
-                               ProgramDataBaseFileName="$(ConfigurationName)/"
-                               WarningLevel="3"
-                               SuppressStartupBanner="true"
-                               CompileAs="0"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="NDEBUG"
-                               Culture="1036"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLibrarianTool"
-                               OutputFile="../../libs/os_specific.lib"
-                               SuppressStartupBanner="true"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                               CommandLine="cd &quot;$(IntDir)&quot; &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\bin\dumpexts -o %%~nf.def -n libscilab.dll %%f &gt;nul&#x0D;&#x0A;copy *.def os_specific.def &gt;nul&#x0D;&#x0A;copy os_specific.def ..\..\..\libs\os_specific.def &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;"
-                       />
-               </Configuration>
-       </Configurations>
-       <References>
-       </References>
-       <Files>
-               <Filter
-                       Name="Source Files"
-                       Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-                       >
-                       <File
-                               RelativePath=".\cluni0.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\csignal.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\flags.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\getarg.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\inffic.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\isanan.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\texmacs.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\timer.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\tmpdir.c"
-                               >
-                       </File>
-               </Filter>
-               <Filter
-                       Name="Header Files"
-                       Filter="h;hpp;hxx;hm;inl"
-                       >
-                       <File
-                               RelativePath="Os_Specific.h"
-                               >
-                       </File>
-               </Filter>
-       </Files>
-       <Globals>
-       </Globals>
-</VisualStudioProject>
diff --git a/scilab/routines/os_specific/os_specific_f/os_specific_f.vfproj b/scilab/routines/os_specific/os_specific_f/os_specific_f.vfproj
deleted file mode 100644 (file)
index 716e9ca..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VisualStudioProject ProjectType="typeStaticLibrary" ProjectCreator="Intel Fortran" Keyword="Static Library" Version="9.10" ProjectIdGuid="{972C50F5-FE25-4FCF-A43F-D5934DAEE634}">
-       <Platforms>
-               <Platform Name="Win32"/></Platforms>
-       <Configurations>
-               <Configuration Name="Debug|Win32" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.lib;$(TargetPath)" ConfigurationType="typeStaticLibrary">
-                               <Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
-                               <Tool Name="VFPreBuildEventTool"/>
-                               <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" OptimizeForProcessor="procOptimizeBlended" Preprocess="preprocessYes" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDebug" DisableDefaultLibSearch="true" CompileOnly="true"/>
-                               <Tool Name="VFPostBuildEventTool" CommandLine="cd $(IntDir)
-for %%f in (*.obj) do  ..\..\..\..\bin\dumpexts -o %%~nf.def -n scilex.dll %%f &gt;nul
-copy *.def os_specific_f.def &gt;nul
-copy os_specific_f.def ..\..\..\..\libs\os_specific_f.def &gt;nul
-del *.def &gt;nul
-cd .."/>
-                               <Tool Name="VFCustomBuildTool"/>
-                               <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)/$(InputName).res"/>
-                               <Tool Name="VFPreLinkEventTool"/>
-                               <Tool Name="VFLibrarianTool" OutputFile="../../../libs/os_specific_f.lib" SuppressStartupBanner="true"/></Configuration>
-               <Configuration Name="Release|Win32" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.lib;$(TargetPath)" ConfigurationType="typeStaticLibrary">
-                               <Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
-                               <Tool Name="VFPreBuildEventTool"/>
-                               <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" OptimizeForProcessor="procOptimizePentiumProThruIII" Preprocess="preprocessYes" PreprocessorDefinitions="WIN32" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreaded" DisableDefaultLibSearch="true" CompileOnly="true"/>
-                               <Tool Name="VFPostBuildEventTool" CommandLine="cd $(IntDir)
-for %%f in (*.obj) do  ..\..\..\..\bin\dumpexts -o %%~nf.def -n scilex.dll %%f &gt;nul
-copy *.def os_specific_f.def &gt;nul
-copy os_specific_f.def ..\..\..\..\libs\os_specific_f.def &gt;nul
-del *.def &gt;nul
-cd .."/>
-                               <Tool Name="VFCustomBuildTool"/>
-                               <Tool Name="VFLinkerTool" MustRebuild="true" OutputFile="$(OutDir)/$(ProjectName)" SuppressStartupBanner="true"/>
-                               <Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)/$(InputName).res"/>
-                               <Tool Name="VFPreLinkEventTool"/>
-                               <Tool Name="VFLibrarianTool" MustRebuild="true" OutputFile="../../../libs/os_specific_f.lib" SuppressStartupBanner="true"/></Configuration></Configurations>
-       <Files>
-               <Filter Name="Source Files" Filter="f90;for;f;fpp;ftn;def;odl;idl">
-               <File RelativePath="..\bashos.f"/>
-               <File RelativePath="..\basin.f"/>
-               <File RelativePath="..\clunit.f"/>
-               <File RelativePath="..\ctrlc.f"/>
-               <File RelativePath="..\dbasin.f"/>
-               <File RelativePath="..\fgetarg.f"/>
-               <File RelativePath="..\getpro.f"/>
-               <File RelativePath="..\inibrk.f"/>
-               <File RelativePath="..\sigbas.f"/></Filter>
-               <Filter Name="Header Files" Filter="fi;fd"/>
-               <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"/></Files>
-       <Globals/></VisualStudioProject>
diff --git a/scilab/routines/os_specific/os_specific_f/os_specific_f2c.vcproj b/scilab/routines/os_specific/os_specific_f/os_specific_f2c.vcproj
deleted file mode 100644 (file)
index be4875f..0000000
+++ /dev/null
@@ -1,221 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-       ProjectType="Visual C++"
-       Version="8,00"
-       Name="os_specific_f2c"
-       ProjectGUID="{972C50F5-FE25-4FCF-A43F-D5934DAEE634}"
-       RootNamespace="os_specific_f2c"
-       Keyword="Win32Proj"
-       >
-       <Platforms>
-               <Platform
-                       Name="Win32"
-               />
-       </Platforms>
-       <ToolFiles>
-       </ToolFiles>
-       <Configurations>
-               <Configuration
-                       Name="Debug|Win32"
-                       OutputDirectory="$(ConfigurationName)"
-                       IntermediateDirectory="$(ConfigurationName)"
-                       ConfigurationType="4"
-                       CharacterSet="2"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                               Description="Conversion f2c"
-                               CommandLine="cd ..&#x0D;&#x0A;for %%f in (*.f) do ..\..\bin\f2c.exe %%f&#x0D;&#x0A;cd $(ProjectDir)"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="0"
-                               AdditionalIncludeDirectories="../../../routines/f2c"
-                               PreprocessorDefinitions="STRICT;__STDC__;_CRT_SECURE_NO_DEPRECATE"
-                               MinimalRebuild="true"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="1"
-                               UsePrecompiledHeader="0"
-                               ObjectFile="$(ConfigurationName)/"
-                               ProgramDataBaseFileName="$(ConfigurationName)/vc80.pdb"
-                               WarningLevel="3"
-                               Detect64BitPortabilityProblems="true"
-                               DebugInformationFormat="3"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLibrarianTool"
-                               OutputFile="../../../libs/os_specific_f.lib"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                               CommandLine="cd $(IntDir) &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\..\bin\dumpexts -o %%~nf.def -n libscilab.dll %%f &gt;nul&#x0D;&#x0A;copy *.def os_specific_f2ctmp.def &gt;nul&#x0D;&#x0A;copy os_specific_f2ctmp.def ..\..\..\..\libs\os_specific_f.def &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Release|Win32"
-                       OutputDirectory="$(ConfigurationName)"
-                       IntermediateDirectory="$(ConfigurationName)"
-                       ConfigurationType="4"
-                       CharacterSet="2"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                               Description="Conversion f2c"
-                               CommandLine="cd ..&#x0D;&#x0A;for %%f in (*.f) do ..\..\bin\f2c.exe %%f&#x0D;&#x0A;cd $(ProjectDir)"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               FavorSizeOrSpeed="1"
-                               AdditionalIncludeDirectories="../../../routines/f2c"
-                               PreprocessorDefinitions="STRICT;__STDC__;_CRT_SECURE_NO_DEPRECATE"
-                               RuntimeLibrary="0"
-                               EnableEnhancedInstructionSet="1"
-                               UsePrecompiledHeader="0"
-                               ObjectFile="$(ConfigurationName)/"
-                               ProgramDataBaseFileName="$(ConfigurationName)/vc80.pdb"
-                               WarningLevel="3"
-                               Detect64BitPortabilityProblems="true"
-                               DebugInformationFormat="3"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLibrarianTool"
-                               OutputFile="../../../libs/os_specific_f.lib"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                               CommandLine="cd $(IntDir) &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\..\bin\dumpexts -o %%~nf.def -n libscilab.dll %%f &gt;nul&#x0D;&#x0A;copy *.def os_specific_f2ctmp.def &gt;nul&#x0D;&#x0A;copy os_specific_f2ctmp.def ..\..\..\..\libs\os_specific_f.def &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;"
-                       />
-               </Configuration>
-       </Configurations>
-       <References>
-       </References>
-       <Files>
-               <Filter
-                       Name="Source Files"
-                       Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-                       >
-                       <File
-                               RelativePath="..\bashos.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\basin.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\basout.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\clunit.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\ctrlc.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\dbasin.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\fgetarg-hpux.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\fgetarg.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\getpro.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\inibrk.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\sigbas.c"
-                               >
-                       </File>
-               </Filter>
-               <Filter
-                       Name="Header Files"
-                       Filter="h;hpp;hxx;hm;inl;inc;xsd"
-                       >
-               </Filter>
-               <Filter
-                       Name="Resource Files"
-                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-                       >
-               </Filter>
-       </Files>
-       <Globals>
-       </Globals>
-</VisualStudioProject>
index 9ce9128..dfced9d 100644 (file)
 //#include "plot.h"
 #include "wresource.h"
 #include "wcommon.h"
-#include "../os_specific/Os_specific.h" 
+
 #include "../stack-c.h" 
+/* REORGANISATIION TEMPORAIRE */
+#include "../../modules/core/includes/Os_specific.h" /* isanan */ 
 
 #include "Messages.h"
 #include "Warnings.h"