Merge remote-tracking branch 'origin/master' into YaSp 83/10083/1
Sylvestre Ledru [Mon, 24 Dec 2012 13:05:40 +0000 (14:05 +0100)]
Change-Id: I281151e28809562a53fd0106591c134c5d1c66e0

27 files changed:
1  2 
scilab/configure
scilab/configure.ac
scilab/modules/api_scilab/core_Import.def
scilab/modules/commons/src/c/core_Import.def
scilab/modules/commons/src/java/org/scilab/modules/commons/ScilabCommons.java
scilab/modules/commons/src/jni/ScilabCommons.i
scilab/modules/commons/src/jni/ScilabCommons_wrap.c
scilab/modules/core/includes/getversion.h
scilab/modules/core/src/c/getversion.c
scilab/modules/core/src/c/stack2.c
scilab/modules/dynamic_link/src/c/dllinfo.c
scilab/modules/gui/gui.iss
scilab/modules/hdf5/sci_gateway/cpp/sci_export_to_hdf5.cpp
scilab/modules/hdf5/sci_gateway/cpp/sci_import_from_hdf5.cpp
scilab/modules/hdf5/sci_gateway/cpp/sci_is_hdf5_file.cpp
scilab/modules/hdf5/sci_gateway/cpp/sci_listvar_in_hdf5.cpp
scilab/modules/hdf5/src/cpp/import_from_hdf5_v1.cpp
scilab/modules/hdf5/src/cpp/listvar_in_hdf5_v1.cpp
scilab/modules/renderer/renderer.iss
scilab/modules/scicos/src/c/scicos.c
scilab/modules/scicos_blocks/src/c/canimxy.c
scilab/modules/scicos_blocks/src/c/canimxy3d.c
scilab/modules/scicos_blocks/src/c/cfscope.c
scilab/modules/scicos_blocks/src/c/cmscope.c
scilab/modules/scicos_blocks/src/c/cscope.c
scilab/modules/scicos_blocks/src/c/cscopxy.c
scilab/modules/scicos_blocks/src/c/cscopxy3d.c

Simple merge
@@@ -15,8 -15,8 +15,8 @@@ dnl Process this file with autoconf to 
  
  
  AC_REVISION($Revision$)dnl
 -AC_INIT([Scilab],[5],[http://bugzilla.scilab.org/])
 +AC_INIT([Scilab],[6],[http://bugzilla.scilab.org/])
- AC_PREREQ(2.62)
+ AC_PREREQ(2.68)
  AC_CONFIG_MACRO_DIR([m4/])
  
  SCI_BUILDDIR="`pwd`"
@@@ -77,4 -77,40 +77,39 @@@ public class ScilabCommons 
          return ScilabCommonsJNI.getformatwidth();
      }
  
 -
+     /**
+       * returns the Scilab version major number
+       * @return version major
+       */
+     public static int getScilabVersionMajor() {
+         return ScilabCommonsJNI.getScilabVersionMajor();
+     }
+     /**
+       * returns the Scilab version minor number
+       * @return version minor
+       */
+     public static int getScilabVersionMinor() {
+         return ScilabCommonsJNI.getScilabVersionMinor();
+     }
+     /**
+       * returns the Scilab version maintenance number
+       * @return version maintenance
+       */
+     public static int getScilabVersionMaintenance() {
+         return ScilabCommonsJNI.getScilabVersionMaintenance();
+     }
+     /**
+       * returns the Scilab version timestamp number
+       * @return version timestamp
+       */
+     public static int getScilabVersionTimestamp() {
+         return ScilabCommonsJNI.getScilabVersionTimestamp();
+     }
  }
  */
  %module ScilabCommons
  %{
 -#include "../../../core/includes/SCIHOME.h"
 -#include "../../../core/includes/tmpdir.h"
 +#include "../../../system_env/includes/sci_home.h"
 +#include "../../../system_env/includes/sci_tmpdir.h"
  #include "../../../fileio/includes/createtempfilename.h"
  #include "../../../localization/includes/setgetlanguage.h"
+ #include "../../../core/includes/getversion.h"
  #include "../../../core/includes/setieee.h"
  #include "../../../core/includes/setformat.h"
  %}
@@@ -187,10 -195,11 +195,11 @@@ static void SWIGUNUSED SWIG_JavaThrowEx
  #define SWIG_contract_assert(nullreturn, expr, msg) if (!(expr)) {SWIG_JavaThrowException(jenv, SWIG_JavaIllegalArgumentException, msg); return nullreturn; } else
  
  
 -#include "../../../core/includes/SCIHOME.h"
 -#include "../../../core/includes/tmpdir.h"
 +#include "../../../system_env/includes/sci_home.h"
 +#include "../../../system_env/includes/sci_tmpdir.h"
  #include "../../../fileio/includes/createtempfilename.h"
  #include "../../../localization/includes/setgetlanguage.h"
+ #include "../../../core/includes/getversion.h"
  #include "../../../core/includes/setieee.h"
  #include "../../../core/includes/setformat.h"
  
@@@ -56,17 -55,32 +56,37 @@@ int *getScilabVersion(int *sizeArrayRet
      return returnedArray;
  }
  /*--------------------------------------------------------------------------*/
 +wchar_t* getScilabVersionAsString(void)
 +{
 +    return os_wcsdup(SCI_VERSION_WIDE_STRING);
 +}
 +/*--------------------------------------------------------------------------*/
 +wchar_t *getScilabVersionAsWideString(void)
 +{
 +    return os_wcsdup(SCI_VERSION_WIDE_STRING);
 +}
 +/*--------------------------------------------------------------------------*/
+ int getScilabVersionMajor()
+ {
+     return (int)SCI_VERSION_MAJOR;
+ }
+ /*--------------------------------------------------------------------------*/
+ int getScilabVersionMinor()
+ {
+     return (int)SCI_VERSION_MINOR;
+ }
+ /*--------------------------------------------------------------------------*/
+ int getScilabVersionMaintenance()
+ {
+     return (int)SCI_VERSION_MAINTENANCE;
+ }
+ /*--------------------------------------------------------------------------*/
+ int getScilabVersionTimestamp()
+ {
+     return (int)SCI_VERSION_TIMESTAMP;
+ }
+ /*--------------------------------------------------------------------------*/
 -char *getScilabVersionAsString(void)
 -{
 -    return strdup(SCI_VERSION_STRING);
 -}
 -/*--------------------------------------------------------------------------*/
 -int* getModuleVersion(char *modulename, int *sizeArrayReturned)
 +int* getModuleVersion(wchar_t* _pwstModule, int *sizeArrayReturned)
  {
      int *returnedArray = NULL;
  
@@@ -316,50 -363,51 +316,51 @@@ int C2F(ogettype) (int *lw
  
  int get_optionals(char *fname, rhs_opts opts[])
  {
 -    int k, i = 0;
 -    char name[nlgh + 1];
 -    int nopt = NumOpt();        /* optional arguments on the stack */
 +    //int k, i = 0;
 +    //char name[nlgh + 1];
 +    //int nopt = NumOpt();        /* optional arguments on the stack */
 +
 +    ///* reset first field since opts is declared static in calling function */
 +    ///* this could be avoided with ansi compilers by removing static in the
 +    // * opts declaration */
 +
 +    //while (opts[i].name != NULL)
 +    //{
 +    //    opts[i].position = -1;
 +    //    i++;
 +    //}
 +
 +    ///* Walking through last arguments */
 +
 +    //for (k = Rhs - nopt + 1; k <= Rhs; k++)
 +    //{
 +    //    if (IsOpt(k, name) == 0)
 +    //    {
 +    //        Scierror(999, _("%s: Optional arguments name=val must be at the end.\n"), fname);
 +    //        return 0;
 +    //    }
 +    //    else
 +    //    {
 +    //        int isopt = rhs_opt_find(name, opts);
 +
 +    //        if (isopt >= 0)
 +    //        {
 +    //            rhs_opts *ro = &opts[isopt];
 +
 +    //            ro->position = k;
 +    //            if (ro->type[0] != '?')
 +    //                GetRhsVar(ro->position, ro->type, &ro->m, &ro->n, &ro->l);
 +    //        }
 +    //        else
 +    //        {
 +    //            sciprint(_("%s: Unrecognized optional arguments %s.\n"), fname, name);
 +    //            rhs_opt_print_names(opts);
 +    //            SciError(999);
 +    //            return (0);
 +    //        }
 +    //    }
 +    //}
 -    /* reset first field since opts is declared static in calling function */
 -    /* this could be avoided with ansi compilers by removing static in the
 -     * opts declaration */
 -
 -    while (opts[i].pstName != NULL)
 -    {
 -        opts[i].iPos = -1;
 -        i++;
 -    }
 -
 -    /* Walking through last arguments */
 -
 -    for (k = Rhs - nopt + 1; k <= Rhs; k++)
 -    {
 -        if (IsOpt(k, name) == 0)
 -        {
 -            Scierror(999, _("%s: Optional arguments name=val must be at the end.\n"), fname);
 -            return 0;
 -        }
 -        else
 -        {
 -            int isopt = rhs_opt_find(name, opts);
 -
 -            if (isopt >= 0)
 -            {
 -                rhs_opts *ro = &opts[isopt];
 -                ro->iPos = k;
 -                if (ro->iType != '?')
 -                {
 -                    GetRhsVar(ro->iPos, ro->iType, &ro->iRows, &ro->iCols, &ro->piAddr);
 -                }
 -            }
 -            else
 -            {
 -                sciprint(_("%s: Unrecognized optional arguments %s.\n"), fname, name);
 -                rhs_opt_print_names(opts);
 -                SciError(999);
 -                return 0;
 -            }
 -        }
 -    }
      return 1;
  }
  
Simple merge
Simple merge
Simple merge