fix f2c solution and windows installer 54/11354/1
Antoine ELIAS [Mon, 22 Apr 2013 08:18:59 +0000 (10:18 +0200)]
Change-Id: Ia8d340181b0349deddb5ce85a51cff6005c68fdf

scilab/Scilab_f2c.sln
scilab/modules/core/src/fortran/core_f2c.vcxproj
scilab/modules/differential_equations/src/fortran/differential_equations_f2c.vcxproj
scilab/modules/differential_equations/src/fortran/differential_equations_f2c.vcxproj.filters
scilab/modules/string/string.iss

index 6a15cbd..cc85f23 100644 (file)
@@ -96,7 +96,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "modules\core\src\c\
                {FD0F48D8-9D0B-42A8-A743-B57198FAB41E} = {FD0F48D8-9D0B-42A8-A743-B57198FAB41E}
                {18F043DA-1DB5-464F-B67D-CF1C23BE7EA0} = {18F043DA-1DB5-464F-B67D-CF1C23BE7EA0}
                {E3A01BE7-815F-4A06-9F0A-C95E80873966} = {E3A01BE7-815F-4A06-9F0A-C95E80873966}
-               {FAF6A7EB-8A36-4278-B34E-34EA89E55304} = {FAF6A7EB-8A36-4278-B34E-34EA89E55304}
                {8AB8ECEC-8C22-475E-80D0-E14696F5A19B} = {8AB8ECEC-8C22-475E-80D0-E14696F5A19B}
                {3A72C3ED-98F7-49C7-B59C-2C6C47FF9390} = {3A72C3ED-98F7-49C7-B59C-2C6C47FF9390}
                {3735EFF9-925B-45B1-82CF-762658E69E70} = {3735EFF9-925B-45B1-82CF-762658E69E70}
@@ -238,11 +237,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "io_f", "modules\io\src\fort
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "string", "modules\string\src\c\string.vcxproj", "{8D45767A-9B03-4905-97F6-D2F3F79141EA}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "string_f", "modules\string\src\fortran\string_f2c.vcxproj", "{FAF6A7EB-8A36-4278-B34E-34EA89E55304}"
-       ProjectSection(ProjectDependencies) = postProject
-               {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
-       EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "symbolic_f", "modules\symbolic\src\fortran\symbolic_f2c.vcxproj", "{D2B63E7D-1E66-4EFC-892E-FA6DAF4E5895}"
        ProjectSection(ProjectDependencies) = postProject
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
@@ -960,14 +954,6 @@ Global
                {8D45767A-9B03-4905-97F6-D2F3F79141EA}.Release|Win32.Build.0 = Release|Win32
                {8D45767A-9B03-4905-97F6-D2F3F79141EA}.Release|x64.ActiveCfg = Release|x64
                {8D45767A-9B03-4905-97F6-D2F3F79141EA}.Release|x64.Build.0 = Release|x64
-               {FAF6A7EB-8A36-4278-B34E-34EA89E55304}.Debug|Win32.ActiveCfg = Debug|Win32
-               {FAF6A7EB-8A36-4278-B34E-34EA89E55304}.Debug|Win32.Build.0 = Debug|Win32
-               {FAF6A7EB-8A36-4278-B34E-34EA89E55304}.Debug|x64.ActiveCfg = Debug|x64
-               {FAF6A7EB-8A36-4278-B34E-34EA89E55304}.Debug|x64.Build.0 = Debug|x64
-               {FAF6A7EB-8A36-4278-B34E-34EA89E55304}.Release|Win32.ActiveCfg = Release|Win32
-               {FAF6A7EB-8A36-4278-B34E-34EA89E55304}.Release|Win32.Build.0 = Release|Win32
-               {FAF6A7EB-8A36-4278-B34E-34EA89E55304}.Release|x64.ActiveCfg = Release|x64
-               {FAF6A7EB-8A36-4278-B34E-34EA89E55304}.Release|x64.Build.0 = Release|x64
                {D2B63E7D-1E66-4EFC-892E-FA6DAF4E5895}.Debug|Win32.ActiveCfg = Debug|Win32
                {D2B63E7D-1E66-4EFC-892E-FA6DAF4E5895}.Debug|Win32.Build.0 = Debug|Win32
                {D2B63E7D-1E66-4EFC-892E-FA6DAF4E5895}.Debug|x64.ActiveCfg = Debug|x64
index 89833da..81f6feb 100644 (file)
@@ -124,7 +124,7 @@ cd ..
 </Command>
     </PreLinkEvent>
     <Link>
-      <AdditionalDependencies>../../../../bin/libf2c.lib;../../../../bin/blasplus.lib;../../../../bin/lapack.lib;boolean_f.lib;sciconsole.lib;data_structures_f.lib;data_structures.lib;double.lib;elementary_functions_f.lib;elementary_functions.lib;fftw.lib;fileio.lib;integer_f.lib;integer.lib;io_f.lib;core.lib;linpack_f.lib;output_stream_f.lib;output_stream.lib;polynomials_f.lib;sparse_f.lib;string_f.lib;string.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>../../../../bin/libf2c.lib;../../../../bin/blasplus.lib;../../../../bin/lapack.lib;boolean_f.lib;sciconsole.lib;data_structures_f.lib;data_structures.lib;double.lib;elementary_functions_f.lib;elementary_functions.lib;fftw.lib;fileio.lib;integer_f.lib;integer.lib;io_f.lib;core.lib;linpack_f.lib;output_stream_f.lib;output_stream.lib;polynomials_f.lib;sparse_f.lib;string.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
       <ModuleDefinitionFile>core_f.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -184,7 +184,7 @@ cd ..
 </Command>
     </PreLinkEvent>
     <Link>
-      <AdditionalDependencies>../../../../bin/libf2c.lib;../../../../bin/blasplus.lib;../../../../bin/lapack.lib;boolean_f.lib;sciconsole.lib;data_structures_f.lib;data_structures.lib;double.lib;elementary_functions_f.lib;elementary_functions.lib;fftw.lib;fileio.lib;integer_f.lib;integer.lib;io_f.lib;core.lib;linpack_f.lib;output_stream_f.lib;output_stream.lib;polynomials_f.lib;sparse_f.lib;string_f.lib;string.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>../../../../bin/libf2c.lib;../../../../bin/blasplus.lib;../../../../bin/lapack.lib;boolean_f.lib;sciconsole.lib;data_structures_f.lib;data_structures.lib;double.lib;elementary_functions_f.lib;elementary_functions.lib;fftw.lib;fileio.lib;integer_f.lib;integer.lib;io_f.lib;core.lib;linpack_f.lib;output_stream_f.lib;output_stream.lib;polynomials_f.lib;sparse_f.lib;string.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
       <ModuleDefinitionFile>core_f.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -242,7 +242,7 @@ cd ..
 </Command>
     </PreLinkEvent>
     <Link>
-      <AdditionalDependencies>../../../../bin/libf2c.lib;../../../../bin/blasplus.lib;../../../../bin/lapack.lib;boolean_f.lib;sciconsole.lib;data_structures_f.lib;data_structures.lib;double.lib;elementary_functions_f.lib;elementary_functions.lib;fftw.lib;fileio.lib;integer_f.lib;integer.lib;io_f.lib;core.lib;linpack_f.lib;output_stream_f.lib;output_stream.lib;polynomials_f.lib;sparse_f.lib;string_f.lib;string.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>../../../../bin/libf2c.lib;../../../../bin/blasplus.lib;../../../../bin/lapack.lib;boolean_f.lib;sciconsole.lib;data_structures_f.lib;data_structures.lib;double.lib;elementary_functions_f.lib;elementary_functions.lib;fftw.lib;fileio.lib;integer_f.lib;integer.lib;io_f.lib;core.lib;linpack_f.lib;output_stream_f.lib;output_stream.lib;polynomials_f.lib;sparse_f.lib;string.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
       <ModuleDefinitionFile>core_f.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -305,7 +305,7 @@ cd ..
 </Command>
     </PreLinkEvent>
     <Link>
-      <AdditionalDependencies>../../../../bin/libf2c.lib;../../../../bin/blasplus.lib;../../../../bin/lapack.lib;boolean_f.lib;sciconsole.lib;data_structures_f.lib;data_structures.lib;double.lib;elementary_functions_f.lib;elementary_functions.lib;fftw.lib;fileio.lib;integer_f.lib;integer.lib;io_f.lib;core.lib;linpack_f.lib;output_stream_f.lib;output_stream.lib;polynomials_f.lib;sparse_f.lib;string_f.lib;string.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>../../../../bin/libf2c.lib;../../../../bin/blasplus.lib;../../../../bin/lapack.lib;boolean_f.lib;sciconsole.lib;data_structures_f.lib;data_structures.lib;double.lib;elementary_functions_f.lib;elementary_functions.lib;fftw.lib;fileio.lib;integer_f.lib;integer.lib;io_f.lib;core.lib;linpack_f.lib;output_stream_f.lib;output_stream.lib;polynomials_f.lib;sparse_f.lib;string.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
       <ModuleDefinitionFile>core_f.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -532,4 +532,4 @@ cd ..
   <ImportGroup Label="ExtensionTargets">
     <Import Project="..\..\..\..\Visual-Studio-settings\f2c.targets" />
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
index dbc8c29..cf1a08c 100644 (file)
@@ -300,7 +300,6 @@ cd ..
     <ClCompile Include="..\..\sci_gateway\fortran\Ex-int3d.c" />
     <ClCompile Include="..\..\sci_gateway\fortran\Ex-intg.c" />
     <ClCompile Include="..\..\sci_gateway\fortran\Ex-ode.c" />
-    <ClCompile Include="..\..\sci_gateway\fortran\Ex-odedc.c" />
     <ClCompile Include="fnorm.c" />
     <ClCompile Include="greatr.c" />
     <ClCompile Include="hpdel.c" />
@@ -373,7 +372,6 @@ cd ..
     <f2c_rule Include="..\..\sci_gateway\fortran\Ex-int3d.f" />
     <f2c_rule Include="..\..\sci_gateway\fortran\Ex-intg.f" />
     <f2c_rule Include="..\..\sci_gateway\fortran\Ex-ode.f" />
-    <f2c_rule Include="..\..\sci_gateway\fortran\Ex-odedc.f" />
     <f2c_rule Include="fnorm.f" />
     <f2c_rule Include="greatr.f" />
     <f2c_rule Include="hpdel.f" />
index 0c47c64..b06d7ab 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Source Files">
     <ClCompile Include="..\..\sci_gateway\fortran\Ex-ode.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\fortran\Ex-odedc.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="fnorm.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <f2c_rule Include="..\..\sci_gateway\fortran\Ex-ode.f">
       <Filter>Fortran files</Filter>
     </f2c_rule>
-    <f2c_rule Include="..\..\sci_gateway\fortran\Ex-odedc.f">
-      <Filter>Fortran files</Filter>
-    </f2c_rule>
     <f2c_rule Include="fnorm.f">
       <Filter>Fortran files</Filter>
     </f2c_rule>
index a00d337..2d46d1a 100644 (file)
@@ -20,8 +20,6 @@
 ;
 Source: bin\{#STRING}.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 Source: bin\{#STRING}.lib; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
-Source: bin\{#STRING}_f.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
-Source: bin\{#STRING}_f.lib; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 Source: bin\{#STRING}_gw.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
 ;
 Source: modules\{#STRING}\license.txt; DestDir: {app}\modules\{#STRING}; Components: {#COMPN_SCILAB}