remove sci_spones from linux AND windows compilation 67/11367/1
Antoine ELIAS [Tue, 23 Apr 2013 07:34:22 +0000 (09:34 +0200)]
Change-Id: I0ae8a5da2d260b798fecdb1fa0e96137addb5799

scilab/modules/elementary_functions/Makefile.am
scilab/modules/elementary_functions/Makefile.in
scilab/modules/elementary_functions/includes/gw_elementary_functions.h
scilab/modules/elementary_functions/sci_gateway/c/gw_elementary_functions.c
scilab/modules/elementary_functions/sci_gateway/c/sci_spones.c [deleted file]
scilab/modules/elementary_functions/src/c/elementary_functions.vcxproj
scilab/modules/elementary_functions/src/c/elementary_functions.vcxproj.filters

index 17ad73d..6a38f23 100644 (file)
@@ -289,7 +289,6 @@ GATEWAY_C_SOURCES = \
     sci_gateway/c/gw_elementary_functions.c \
     sci_gateway/c/sci_number_properties.c \
     sci_gateway/c/sci_testmatrix.c \
-    sci_gateway/c/sci_spones.c \
     sci_gateway/c/sci_nearfloat.c \
     sci_gateway/c/sci_real.c \
     sci_gateway/c/sci_round.c \
index 265524b..09f4a2a 100644 (file)
@@ -247,7 +247,6 @@ am__objects_7 = libscielementary_functions_la-sci_sqrt.lo \
        libscielementary_functions_la-gw_elementary_functions.lo \
        libscielementary_functions_la-sci_number_properties.lo \
        libscielementary_functions_la-sci_testmatrix.lo \
-       libscielementary_functions_la-sci_spones.lo \
        libscielementary_functions_la-sci_nearfloat.lo \
        libscielementary_functions_la-sci_real.lo \
        libscielementary_functions_la-sci_round.lo \
@@ -907,7 +906,6 @@ GATEWAY_C_SOURCES = \
     sci_gateway/c/gw_elementary_functions.c \
     sci_gateway/c/sci_number_properties.c \
     sci_gateway/c/sci_testmatrix.c \
-    sci_gateway/c/sci_spones.c \
     sci_gateway/c/sci_nearfloat.c \
     sci_gateway/c/sci_real.c \
     sci_gateway/c/sci_round.c \
@@ -1307,7 +1305,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscielementary_functions_la-sci_sign.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscielementary_functions_la-sci_sin.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscielementary_functions_la-sci_size.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscielementary_functions_la-sci_spones.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscielementary_functions_la-sci_sqrt.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscielementary_functions_la-sci_sum.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscielementary_functions_la-sci_tan.Plo@am__quote@
@@ -1687,13 +1684,6 @@ libscielementary_functions_la-sci_testmatrix.lo: sci_gateway/c/sci_testmatrix.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscielementary_functions_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libscielementary_functions_la-sci_testmatrix.lo `test -f 'sci_gateway/c/sci_testmatrix.c' || echo '$(srcdir)/'`sci_gateway/c/sci_testmatrix.c
 
-libscielementary_functions_la-sci_spones.lo: sci_gateway/c/sci_spones.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscielementary_functions_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libscielementary_functions_la-sci_spones.lo -MD -MP -MF $(DEPDIR)/libscielementary_functions_la-sci_spones.Tpo -c -o libscielementary_functions_la-sci_spones.lo `test -f 'sci_gateway/c/sci_spones.c' || echo '$(srcdir)/'`sci_gateway/c/sci_spones.c
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscielementary_functions_la-sci_spones.Tpo $(DEPDIR)/libscielementary_functions_la-sci_spones.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='sci_gateway/c/sci_spones.c' object='libscielementary_functions_la-sci_spones.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscielementary_functions_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libscielementary_functions_la-sci_spones.lo `test -f 'sci_gateway/c/sci_spones.c' || echo '$(srcdir)/'`sci_gateway/c/sci_spones.c
-
 libscielementary_functions_la-sci_nearfloat.lo: sci_gateway/c/sci_nearfloat.c
 @am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscielementary_functions_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libscielementary_functions_la-sci_nearfloat.lo -MD -MP -MF $(DEPDIR)/libscielementary_functions_la-sci_nearfloat.Tpo -c -o libscielementary_functions_la-sci_nearfloat.lo `test -f 'sci_gateway/c/sci_nearfloat.c' || echo '$(srcdir)/'`sci_gateway/c/sci_nearfloat.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscielementary_functions_la-sci_nearfloat.Tpo $(DEPDIR)/libscielementary_functions_la-sci_nearfloat.Plo
index bdf805b..d912058 100644 (file)
@@ -20,7 +20,7 @@
 ELEMENTARY_FUNCTIONS_IMPEXP int gw_elementary_functions(void);
 /*--------------------------------------------------------------------------*/
 int sci_chinesehat(char *fname, unsigned long fname_len);
-int sci_spones(char *fname, unsigned long fname_len);
+//int sci_spones(char *fname, unsigned long fname_len);
 int sci_isequalbitwise(char *fname, unsigned long fname_len);
 
 // YaSp
index 5f6abf4..9859926 100644 (file)
@@ -68,7 +68,7 @@ static gw_generic_table Tab[] =
        {NULL, ""}, //nearfloat
        {NULL, ""}, //dsearch
        {NULL, ""}, //isequal
-       {sci_spones,"spones"},
+       {NULL, ""}, //spones
        {NULL, ""}, //gsort
        {NULL, ""}, //isequalbitwise
     {NULL, ""}, //rat
diff --git a/scilab/modules/elementary_functions/sci_gateway/c/sci_spones.c b/scilab/modules/elementary_functions/sci_gateway/c/sci_spones.c
deleted file mode 100644 (file)
index 2172a05..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2006 - INRIA - Allan CORNET
- * 
- * This file must be used under the terms of the CeCILL.
- * This source file is licensed as described in the file COPYING, which
- * you should have received as part of this distribution.  The terms
- * are also available at    
- * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
- *
- */
-/*--------------------------------------------------------------------------*/ 
-#include "gw_elementary_functions.h"
-#include "stack-c.h"
-#include "basic_functions.h"
-#include "sciprint.h"
-#include "localization.h"
-#include "Scierror.h"
-
-//#define _NEW_TONIO_
-/*--------------------------------------------------------------------------*/
-extern int C2F(intspones) (char *fname,int *id);
-/*--------------------------------------------------------------------------*/
-int sci_spones(char *fname,unsigned long fname_len)
-{
-       static int id[6];
-#ifdef _NEW_TONIO_
-       int iRows                               = 0;
-       int iCols                               = 0;
-       int iRealData                   = 0;
-       int iImgData                    = 0;
-       int iIndex                              = 0;
-       int iTotalElem                  = 0;
-       
-       int *piElemByRow                = NULL;
-       int *piColByRow                 = NULL;
-
-       double *pReturnRealData = NULL;
-       double *pReturnImgdata  = NULL;
-
-       CheckRhs(1,1);
-       CheckLhs(1,1);
-
-       if(GetType(1) != sci_sparse && GetType(1) != sci_boolean_sparse)
-       {
-               if(GetType(1) == sci_matlab_sparse)
-               {
-                       OverLoad(1);
-                       return 0;
-               }
-               else
-               {
-                       sciprint(_("%s: argument must be a sparse matrix.\n"), fname);
-                       SciError(999);
-                       return 0;
-               }
-       }
-
-       if(iIsComplex(1))
-       {
-               GetRhsCSparseVar(1, &iRows, &iCols, &iTotalElem, NULL, NULL, &iRealData, &iImgData);
-
-               //Warning, tips to use same variable in out and in !!!
-               iAllocSparseMatrix(Rhs + 1, iRows, iCols, iTotalElem, &piElemByRow, &piColByRow, &pReturnRealData);
-               GetRhsCSparseVar(1, &iRows, &iCols, &iTotalElem, piElemByRow, piColByRow, &iRealData, &iImgData);
-               vDset(iTotalElem, 1, pReturnRealData, 1);
-       }
-       else
-       {
-               GetRhsSparseVar(1, &iRows, &iCols, &iTotalElem, NULL, NULL, &iRealData);
-
-               //Warning, tips to use same variable in out and in !!!
-               iAllocSparseMatrix(Rhs + 1, iRows, iCols, iTotalElem, &piElemByRow, &piColByRow, &pReturnRealData);
-
-               GetRhsSparseVar(1, &iRows, &iCols, &iTotalElem, piElemByRow, piColByRow, &iRealData);
-               vDset(iTotalElem, 1, pReturnRealData, 1);
-       }
-       LhsVar(1) = Rhs + 1;
-       PutLhsVar();
-
-
-#else
-       C2F(intspones)(fname,id);
-#endif
-       return 0;
-}
-/*--------------------------------------------------------------------------*/
index 8dc9ded..d9cba4a 100644 (file)
@@ -203,7 +203,6 @@ lib /DEF:"$(ProjectDir)cacsd_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platfor
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\..\sci_gateway\c\sci_chinesehat.c" />
-    <ClCompile Include="..\..\sci_gateway\c\sci_spones.c" />
     <ClCompile Include="..\cpp\cumprod.cpp" />
     <ClCompile Include="..\cpp\cumsum.cpp" />
     <ClCompile Include="..\cpp\diag.cpp" />
@@ -354,4 +353,4 @@ lib /DEF:"$(ProjectDir)cacsd_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platfor
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
index 11f8113..dade92b 100644 (file)
     <ClCompile Include="..\..\sci_gateway\c\sci_chinesehat.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\sci_gateway\c\sci_spones.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="sci_tools.c">
       <Filter>Source Files</Filter>
     </ClCompile>
       <Filter>Resource File</Filter>
     </ResourceCompile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>