add ui_data module (windows)
Allan CORNET [Wed, 10 Feb 2010 11:07:11 +0000 (12:07 +0100)]
39 files changed:
scilab/Scilab.sln
scilab/Scilab_f2c.sln
scilab/etc/classpath.xml.in
scilab/etc/classpath.xml.vc
scilab/etc/modules.xml.in
scilab/etc/modules.xml.vc
scilab/modules/core/includes/callinterf.h
scilab/modules/core/src/c/callinterf.c
scilab/modules/core/src/c/dynamic_gateways.c
scilab/modules/core/src/c/dynamic_gateways.h
scilab/modules/ui_data/.gitignore [new file with mode: 0644]
scilab/modules/ui_data/Makefile.am [new file with mode: 0644]
scilab/modules/ui_data/build.xml [new file with mode: 0644]
scilab/modules/ui_data/changelog.txt [new file with mode: 0644]
scilab/modules/ui_data/etc/ui_data.quit [new file with mode: 0644]
scilab/modules/ui_data/etc/ui_data.start [new file with mode: 0644]
scilab/modules/ui_data/includes/dynlib_ui_data.h [new file with mode: 0644]
scilab/modules/ui_data/includes/gw_ui_data.h [new file with mode: 0644]
scilab/modules/ui_data/license.txt [new file with mode: 0644]
scilab/modules/ui_data/macros/buildmacros.bat [new file with mode: 0644]
scilab/modules/ui_data/macros/buildmacros.sce [new file with mode: 0644]
scilab/modules/ui_data/macros/cleanmacros.bat [new file with mode: 0644]
scilab/modules/ui_data/readme.txt [new file with mode: 0644]
scilab/modules/ui_data/sci_gateway/c/gw_ui_data.c [new file with mode: 0644]
scilab/modules/ui_data/sci_gateway/cpp/sci_editvar.cpp [new file with mode: 0644]
scilab/modules/ui_data/sci_gateway/ui_data_gateway.xml [new file with mode: 0644]
scilab/modules/ui_data/src/c/DllmainUi_data.c [new file with mode: 0644]
scilab/modules/ui_data/src/c/LibScilab_Import.def [new file with mode: 0644]
scilab/modules/ui_data/src/c/ui_data.vcproj [new file with mode: 0644]
scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/ui_data.java [new file with mode: 0644]
scilab/modules/ui_data/src/java/ui_data-JAVA.vcproj [new file with mode: 0644]
scilab/modules/ui_data/src/jni/ui_data.giws.xml [new file with mode: 0644]
scilab/modules/ui_data/src/jni/ui_data.i [new file with mode: 0644]
scilab/modules/ui_data/src/noui_data/noui_data.c [new file with mode: 0644]
scilab/modules/ui_data/src/noui_data/noui_data.h [new file with mode: 0644]
scilab/modules/ui_data/ui_data.iss [new file with mode: 0644]
scilab/modules/ui_data/version.xml [new file with mode: 0644]
scilab/scilab-lib.properties.in
scilab/scilab-lib.properties.vc

index 1929d8d..d448cd4 100644 (file)
@@ -1065,6 +1065,22 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xcos-Ant", "modules\xcos\sr
                {9B6500B0-66F6-44F0-910D-47A1435B4E02} = {9B6500B0-66F6-44F0-910D-47A1435B4E02}
        EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ui_data", "modules\ui_data\src\c\ui_data.vcproj", "{142D643B-A9EC-49DB-9D48-A925A20F63B1}"
+       ProjectSection(ProjectDependencies) = postProject
+               {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
+               {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470} = {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470}
+               {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0} = {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}
+               {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
+               {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
+       EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ui_data-Ant", "modules\ui_data\src\java\ui_data-JAVA.vcproj", "{405E6B33-DBA9-4850-A19F-19298DA5A64D}"
+       ProjectSection(ProjectDependencies) = postProject
+               {B2911268-79E2-4FE5-AD59-2C3CB7CB794E} = {B2911268-79E2-4FE5-AD59-2C3CB7CB794E}
+               {E9783492-017E-4811-9CC7-6B71856F847C} = {E9783492-017E-4811-9CC7-6B71856F847C}
+               {F01C26E3-E409-4E74-BA84-C7C4A71A7FDC} = {F01C26E3-E409-4E74-BA84-C7C4A71A7FDC}
+       EndProjectSection
+EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug|Win32 = Debug|Win32
@@ -2161,6 +2177,22 @@ Global
                {F6DA4FFA-E405-4DCF-883B-A3C1713F8C5D}.Release|Win32.Build.0 = Release|Win32
                {F6DA4FFA-E405-4DCF-883B-A3C1713F8C5D}.Release|x64.ActiveCfg = Release|x64
                {F6DA4FFA-E405-4DCF-883B-A3C1713F8C5D}.Release|x64.Build.0 = Release|x64
+               {142D643B-A9EC-49DB-9D48-A925A20F63B1}.Debug|Win32.ActiveCfg = Debug|Win32
+               {142D643B-A9EC-49DB-9D48-A925A20F63B1}.Debug|Win32.Build.0 = Debug|Win32
+               {142D643B-A9EC-49DB-9D48-A925A20F63B1}.Debug|x64.ActiveCfg = Debug|x64
+               {142D643B-A9EC-49DB-9D48-A925A20F63B1}.Debug|x64.Build.0 = Debug|x64
+               {142D643B-A9EC-49DB-9D48-A925A20F63B1}.Release|Win32.ActiveCfg = Release|Win32
+               {142D643B-A9EC-49DB-9D48-A925A20F63B1}.Release|Win32.Build.0 = Release|Win32
+               {142D643B-A9EC-49DB-9D48-A925A20F63B1}.Release|x64.ActiveCfg = Release|x64
+               {142D643B-A9EC-49DB-9D48-A925A20F63B1}.Release|x64.Build.0 = Release|x64
+               {405E6B33-DBA9-4850-A19F-19298DA5A64D}.Debug|Win32.ActiveCfg = Debug|Win32
+               {405E6B33-DBA9-4850-A19F-19298DA5A64D}.Debug|Win32.Build.0 = Debug|Win32
+               {405E6B33-DBA9-4850-A19F-19298DA5A64D}.Debug|x64.ActiveCfg = Debug|x64
+               {405E6B33-DBA9-4850-A19F-19298DA5A64D}.Debug|x64.Build.0 = Debug|x64
+               {405E6B33-DBA9-4850-A19F-19298DA5A64D}.Release|Win32.ActiveCfg = Release|Win32
+               {405E6B33-DBA9-4850-A19F-19298DA5A64D}.Release|Win32.Build.0 = Release|Win32
+               {405E6B33-DBA9-4850-A19F-19298DA5A64D}.Release|x64.ActiveCfg = Release|x64
+               {405E6B33-DBA9-4850-A19F-19298DA5A64D}.Release|x64.Build.0 = Release|x64
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE
index 1187208..2a4fc65 100644 (file)
@@ -1066,6 +1066,22 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xcos-Ant", "modules\xcos\sr
                {9B6500B0-66F6-44F0-910D-47A1435B4E02} = {9B6500B0-66F6-44F0-910D-47A1435B4E02}
        EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ui_data", "modules\ui_data\src\c\ui_data.vcproj", "{142D643B-A9EC-49DB-9D48-A925A20F63B1}"
+       ProjectSection(ProjectDependencies) = postProject
+               {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
+               {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470} = {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470}
+               {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0} = {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}
+               {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
+               {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
+       EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ui_data-Ant", "modules\ui_data\src\java\ui_data-JAVA.vcproj", "{405E6B33-DBA9-4850-A19F-19298DA5A64D}"
+       ProjectSection(ProjectDependencies) = postProject
+               {E9783492-017E-4811-9CC7-6B71856F847C} = {E9783492-017E-4811-9CC7-6B71856F847C}
+               {8A654CC5-22C1-4972-A8CF-1B89F78B5383} = {8A654CC5-22C1-4972-A8CF-1B89F78B5383}
+               {F01C26E3-E409-4E74-BA84-C7C4A71A7FDC} = {F01C26E3-E409-4E74-BA84-C7C4A71A7FDC}
+       EndProjectSection
+EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug|Win32 = Debug|Win32
@@ -2162,6 +2178,22 @@ Global
                {F6DA4FFA-E405-4DCF-883B-A3C1713F8C5D}.Release|Win32.Build.0 = Release|Win32
                {F6DA4FFA-E405-4DCF-883B-A3C1713F8C5D}.Release|x64.ActiveCfg = Release|x64
                {F6DA4FFA-E405-4DCF-883B-A3C1713F8C5D}.Release|x64.Build.0 = Release|x64
+               {142D643B-A9EC-49DB-9D48-A925A20F63B1}.Debug|Win32.ActiveCfg = Debug|Win32
+               {142D643B-A9EC-49DB-9D48-A925A20F63B1}.Debug|Win32.Build.0 = Debug|Win32
+               {142D643B-A9EC-49DB-9D48-A925A20F63B1}.Debug|x64.ActiveCfg = Debug|x64
+               {142D643B-A9EC-49DB-9D48-A925A20F63B1}.Debug|x64.Build.0 = Debug|x64
+               {142D643B-A9EC-49DB-9D48-A925A20F63B1}.Release|Win32.ActiveCfg = Release|Win32
+               {142D643B-A9EC-49DB-9D48-A925A20F63B1}.Release|Win32.Build.0 = Release|Win32
+               {142D643B-A9EC-49DB-9D48-A925A20F63B1}.Release|x64.ActiveCfg = Release|x64
+               {142D643B-A9EC-49DB-9D48-A925A20F63B1}.Release|x64.Build.0 = Release|x64
+               {405E6B33-DBA9-4850-A19F-19298DA5A64D}.Debug|Win32.ActiveCfg = Debug|Win32
+               {405E6B33-DBA9-4850-A19F-19298DA5A64D}.Debug|Win32.Build.0 = Debug|Win32
+               {405E6B33-DBA9-4850-A19F-19298DA5A64D}.Debug|x64.ActiveCfg = Debug|x64
+               {405E6B33-DBA9-4850-A19F-19298DA5A64D}.Debug|x64.Build.0 = Debug|x64
+               {405E6B33-DBA9-4850-A19F-19298DA5A64D}.Release|Win32.ActiveCfg = Release|Win32
+               {405E6B33-DBA9-4850-A19F-19298DA5A64D}.Release|Win32.Build.0 = Release|Win32
+               {405E6B33-DBA9-4850-A19F-19298DA5A64D}.Release|x64.ActiveCfg = Release|x64
+               {405E6B33-DBA9-4850-A19F-19298DA5A64D}.Release|x64.Build.0 = Release|x64
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE
index 671ff10..66e6f0d 100644 (file)
@@ -148,4 +148,6 @@ The option is "disableUnderMode" and can be:
        <load on="Xpad"/>
 </path>
 
+<path value="$SCILAB/modules/ui_data/jar/org.scilab.modules.ui_data.jar"/>
+
 </classpaths>
index 2c79b9b..7a5734c 100644 (file)
@@ -155,4 +155,6 @@ The option is "disableUnderMode" and can be:
        <load on="Xpad"/>
 </path>
 
+<path value="$SCILAB/modules/ui_data/jar/org.scilab.modules.ui_data.jar"/>
+
 </classpaths>
index 851edab..94e8642 100644 (file)
@@ -81,6 +81,7 @@
 <module name="hdf5" activate="yes"/>
 <module name="xcos" activate="@GUI_ENABLE@"/>
 <module name="xpad" activate="@GUI_ENABLE@"/>
+<module name="ui_data" activate="@GUI_ENABLE@"/>
 <module name="api_scilab" activate="yes"/>
 <module name="helptools" activate="@HELP_ENABLE@"/>
 </modules>
index 1117792..6eb32d6 100644 (file)
@@ -83,6 +83,7 @@
 <module name="hdf5" activate="yes"/>
 <module name="xcos" activate="yes"/>
 <module name="xpad" activate="yes"/>
+<module name="ui_data" activate="yes"/>
 <module name="api_scilab" activate="yes"/>
 <module name="helptools" activate="yes"/>
 <!-- comments -->
index d9ac9d2..6804af3 100644 (file)
@@ -86,6 +86,7 @@
 /* 62 */                                               #include "dynamic_gateways.h" /* hdf5 */
 /* 63 */                                               #include "dynamic_gateways.h" /* xpad */
 /* 64 */                                               #include "dynamic_gateways.h" /* xcos */
+/* 65 */                                               #include "dynamic_gateways.h" /* ui_data */
 
 /*-------------------------------------
  * long jump to stop interface computation
index 7fce89d..0d83eac 100644 (file)
@@ -33,7 +33,7 @@ static void sci_sigint_addinter(int n);
  ** Watch out the positions are crutial !!!
  ** @TODO : Make this less crappy...
  **/
-#define INTERFACES_MAX 64
+#define INTERFACES_MAX 65
 static OpTab Interfaces[INTERFACES_MAX] = {
     /* 01  */ {gw_user}, /* free position may be used */
        /* 02  */ {gw_linear_algebra},
@@ -98,7 +98,8 @@ static OpTab Interfaces[INTERFACES_MAX] = {
        /* 61  */ {gw_call_scilab},
        /* 62  */ {gw_dynamic_hdf5},
        /* 63  */ {gw_dynamic_xpad},
-       /* 64  */ {gw_dynamic_xcos}
+       /* 64  */ {gw_dynamic_xcos},
+       /* 65  */ {gw_dynamic_ui_data}
 };
 /*--------------------------------------------------------------------------*/
 static int sig_ok = 0;
index cdd8327..ddd5e26 100644 (file)
@@ -339,5 +339,27 @@ int gw_dynamic_graphic_export(void)
                &ptr_gw_graphic_export);
 }
 /*--------------------------------------------------------------------------*/
+/* ui_data module */
+#define UI_DATA_MODULE_NAME "ui_data"
+static DynLibHandle hUi_dataLib = NULL;
+static PROC_GATEWAY ptr_gw_ui_data = NULL;
+static char* dynlibname_ui_data = NULL;
+static char* gatewayname_ui_data = NULL;
+/*--------------------------------------------------------------------------*/
+int gw_dynamic_ui_data(void)
+{
+#ifdef _MSC_VER
+       if (dynlibname_ui_data == NULL)
+       {
+               dynlibname_ui_data = buildModuleDynLibraryName(UI_DATA_MODULE_NAME, DYNLIB_NAME_FORMAT_2);
+       }
+#endif
 
+       return gw_dynamic_generic(UI_DATA_MODULE_NAME,
+               &dynlibname_ui_data,
+               &gatewayname_ui_data,
+               &hUi_dataLib,
+               &ptr_gw_ui_data);
+}
+/*--------------------------------------------------------------------------*/
 
index 0dd80e5..2f3aa9c 100644 (file)
 #define __DYNAMIC_GATEWAYS_H__
 
 /**
+* ui_data gateway
+* ui_data is loaded dynamically at runtime
+* load gw_ui_data in SCI/modules/ui_data/sci_gateway/gw_ui_data.c
+*/
+int gw_dynamic_ui_data(void);
+
+/**
 * xcos gateway
 * xcos is loaded dynamically at runtime
 * load gw_xcos in SCI/modules/xcos/sci_gateway/gw_xcos.c
diff --git a/scilab/modules/ui_data/.gitignore b/scilab/modules/ui_data/.gitignore
new file mode 100644 (file)
index 0000000..4139232
--- /dev/null
@@ -0,0 +1,4 @@
+#
+#generated .def files (windows)
+#
+ui_data.def
diff --git a/scilab/modules/ui_data/Makefile.am b/scilab/modules/ui_data/Makefile.am
new file mode 100644 (file)
index 0000000..4c042ae
--- /dev/null
@@ -0,0 +1,106 @@
+#
+# Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+# Copyright (C) DIGITEO - 2010 - 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
+#
+
+#### Target ######
+modulename=ui_data
+
+
+#### ui_data : Conf files ####
+libsciui_data_la_rootdir = $(mydatadir)
+libsciui_data_la_root_DATA = changelog.txt license.txt readme.txt version.xml
+
+
+#### ui_data : init scripts ####
+libsciui_data_la_etcdir = $(mydatadir)/etc
+libsciui_data_la_etc_DATA = etc/ui_data.quit \
+                               etc/ui_data.start
+
+include $(top_srcdir)/Makefile.incl.am
+
+
+UI_DATA_JNI_SOURCES = 
+
+UI_DATA_C_SOURCES = 
+
+UI_DATA_CPP_SOURCES = 
+
+GIWS_WRAPPERS = 
+
+if GIWS
+BUILT_SOURCES=giws
+endif
+
+
+GATEWAY_C_SOURCES = sci_gateway/c/gw_ui_data.c
+
+GATEWAY_CPP_SOURCES = sci_gateway/cpp/sci_editvar.cpp
+
+libsciui_data_la_CFLAGS= $(JAVA_JNI_INCLUDE) \
+                       -I$(top_srcdir)/libs/MALLOC/includes/ \
+                       -I$(top_srcdir)/modules/jvm/includes/ \
+                       -I$(top_srcdir)/modules/output_stream/includes \
+                       -I$(top_srcdir)/modules/localization/includes \
+                       -I$(top_srcdir)/modules/api_scilab/includes \
+                       -I$(top_srcdir)/modules/core/includes
+
+
+libsciui_data_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) \
+                       -I$(srcdir)/includes/ \
+                       -I$(srcdir)/src/cpp/ \
+                       -I$(srcdir)/src/c/ \
+                       -I$(srcdir)/src/jni/ \
+                       -I$(top_srcdir)/modules/jvm/includes/ \
+                       -I$(top_srcdir)/modules/output_stream/includes \
+                       -I$(top_srcdir)/modules/localization/includes \
+                       -I$(top_srcdir)/modules/api_scilab/includes
+
+# Without the ui_data module 
+libsciui_data_disable_la_CFLAGS = -Iincludes/ \
+                       -I$(top_srcdir)/modules/output_stream/includes
+
+UI_DATA_DISABLE_C_SOURCES = src/noui_data/noui_data.c
+libsciui_data_disable_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION) $(LD_FLAGS)
+libsciui_data_disable_la_SOURCES = $(UI_DATA_DISABLE_C_SOURCES)
+
+pkglib_LTLIBRARIES = libsciui_data-disable.la
+
+if GUI
+pkglib_LTLIBRARIES += libsciui_data.la 
+endif
+
+libsciui_data_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION) $(LD_FLAGS)  $(X_LIBS) $(X_EXTRA_LIBS)
+
+libsciui_data_la_SOURCES = $(UI_DATA_C_SOURCES) $(UI_DATA_JNI_SOURCES) $(GATEWAY_C_SOURCES) $(GATEWAY_CPP_SOURCES) $(UI_DATA_CPP_SOURCES)
+
+# For the code check (splint)
+CHECK_SRC= $(UI_DATA_C_SOURCES) $(GATEWAY_C_SOURCES)
+INCLUDE_FLAGS = $(libsciui_data_la_CFLAGS)
+
+
+#### SWIG Declaration ####
+SWIG_WRAPPERS = 
+
+if SWIG
+BUILT_SOURCES=swig
+endif
+
+libsciui_data_la_LIBADD = $(top_builddir)/modules/core/libscicore.la \
+$(top_builddir)/libs/MALLOC/libscimalloc.la \
+$(top_builddir)/modules/output_stream/libscioutput_stream.la
+
+
+#### ui_data : gateway declaration ####
+libsciui_data_la_sci_gatewaydir = $(mydatadir)/sci_gateway
+libsciui_data_la_sci_gateway_DATA = sci_gateway/ui_data_gateway.xml
+
+if GUI
+USEANT=1
+endif
diff --git a/scilab/modules/ui_data/build.xml b/scilab/modules/ui_data/build.xml
new file mode 100644 (file)
index 0000000..0d01abb
--- /dev/null
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2010 - DIGITEO - 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
+ *
+ -->
+
+<project name="ui_data" default="jar">
+
+  <import file="../../build.incl.xml"/>
+  <property name="library.name" value="${library.ui_data.name}" />
+
+  <description>
+                       Build the Scilab ui_data module
+  </description>
+
+</project>
diff --git a/scilab/modules/ui_data/changelog.txt b/scilab/modules/ui_data/changelog.txt
new file mode 100644 (file)
index 0000000..36ed256
--- /dev/null
@@ -0,0 +1,4 @@
+ui_data (0.1-1) stable; urgency=medium
+
+  * First version of the module
+
diff --git a/scilab/modules/ui_data/etc/ui_data.quit b/scilab/modules/ui_data/etc/ui_data.quit
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/scilab/modules/ui_data/etc/ui_data.start b/scilab/modules/ui_data/etc/ui_data.start
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/scilab/modules/ui_data/includes/dynlib_ui_data.h b/scilab/modules/ui_data/includes/dynlib_ui_data.h
new file mode 100644 (file)
index 0000000..2af9d92
--- /dev/null
@@ -0,0 +1,28 @@
+/*
+* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+* Copyright (C) DIGITEO - 2010 - 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
+*
+*/
+
+/*--------------------------------------------------------------------------*/ 
+#ifndef __DYNLIB_UI_DATA_H__
+#define __DYNLIB_UI_DATA_H__
+
+#ifdef _MSC_VER
+       #ifdef UI_DATA_EXPORTS
+               #define UI_DATA_IMPEXP __declspec(dllexport)
+       #else
+               #define UI_DATA_IMPEXP __declspec(dllimport)
+       #endif
+#else
+       #define UI_DATA_IMPEXP
+#endif
+
+#endif /* __DYNLIB_UI_DATA_H__ */
+/*--------------------------------------------------------------------------*/ 
diff --git a/scilab/modules/ui_data/includes/gw_ui_data.h b/scilab/modules/ui_data/includes/gw_ui_data.h
new file mode 100644 (file)
index 0000000..75a3d12
--- /dev/null
@@ -0,0 +1,22 @@
+/*
+* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+* Copyright (C) 2010 - DIGITEO - 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
+*
+*/
+
+#ifndef __GW_UI_DATA__
+#define __GW_UI_DATA__
+/*--------------------------------------------------------------------------*/
+#include "dynlib_ui_data.h"
+/*--------------------------------------------------------------------------*/
+UI_DATA_IMPEXP int gw_ui_data(void);
+UI_DATA_IMPEXP int sci_editvar(char* fname, unsigned long l);
+/*--------------------------------------------------------------------------*/
+#endif /* __GW_UI_DATA__ */
+/*--------------------------------------------------------------------------*/
diff --git a/scilab/modules/ui_data/license.txt b/scilab/modules/ui_data/license.txt
new file mode 100644 (file)
index 0000000..46ae42e
--- /dev/null
@@ -0,0 +1,9 @@
+Copyright:
+Copyright (c) 2010 - DIGITEO
+
+License:
+This module must be used under the terms of the CeCILL.
+This module 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
diff --git a/scilab/modules/ui_data/macros/buildmacros.bat b/scilab/modules/ui_data/macros/buildmacros.bat
new file mode 100644 (file)
index 0000000..f9bd674
--- /dev/null
@@ -0,0 +1,11 @@
+
+rem Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+rem Copyright (C) 2009 - DIGITEO
+rem
+rem This file must be used under the terms of the CeCILL.
+rem This source file is licensed as described in the file COPYING, which
+rem you should have received as part of this distribution.  The terms
+rem are also available at
+rem http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+
+@..\..\..\bin\scilex -nwni -ns -e exec('buildmacros.sce');quit;
diff --git a/scilab/modules/ui_data/macros/buildmacros.sce b/scilab/modules/ui_data/macros/buildmacros.sce
new file mode 100644 (file)
index 0000000..2101791
--- /dev/null
@@ -0,0 +1,16 @@
+
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2010 - DIGITEO - Allan CORNET <allan.cornet@inria.fr>
+//
+// 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
+
+if (isdef('genlib') == %f) then
+  exec(SCI+'/modules/functions/scripts/buildmacros/loadgenlib.sce');
+end
+
+//genlib("ui_datalib","SCI/modules/ui_data/macros",%f,%t);
+
diff --git a/scilab/modules/ui_data/macros/cleanmacros.bat b/scilab/modules/ui_data/macros/cleanmacros.bat
new file mode 100644 (file)
index 0000000..d8e26bf
--- /dev/null
@@ -0,0 +1,13 @@
+
+rem Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+rem Copyright (C) 2009 - DIGITEO
+rem
+rem This file must be used under the terms of the CeCILL.
+rem This source file is licensed as described in the file COPYING, which
+rem you should have received as part of this distribution.  The terms
+rem are also available at
+rem http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+
+@del *.bin 2>NUL
+@del lib 2>NUL
+@del names 2>NUL
diff --git a/scilab/modules/ui_data/readme.txt b/scilab/modules/ui_data/readme.txt
new file mode 100644 (file)
index 0000000..785eeec
--- /dev/null
@@ -0,0 +1 @@
+README File
diff --git a/scilab/modules/ui_data/sci_gateway/c/gw_ui_data.c b/scilab/modules/ui_data/sci_gateway/c/gw_ui_data.c
new file mode 100644 (file)
index 0000000..0a590f9
--- /dev/null
@@ -0,0 +1,49 @@
+/*
+ *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ *  Copyright (C) 2010 - DIGITEO - 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_ui_data.h"
+#include "stack-c.h"
+#include "callFunctionFromGateway.h"
+#include "BOOL.h"
+#include "scilabmode.h"
+#include "localization.h"
+#include "Scierror.h"
+#include "BOOL.h"
+#include "loadOnUseClassPath.h"
+/*--------------------------------------------------------------------------*/
+static BOOL loadedDep = FALSE;
+/*--------------------------------------------------------------------------*/
+static gw_generic_table Tab[]=
+{
+  {sci_editvar, "editvar"}
+};
+/*--------------------------------------------------------------------------*/
+int gw_ui_data(void)
+{
+       Rhs = Max(0, Rhs);
+
+       if ( getScilabMode() == SCILAB_NWNI)
+       {
+               Scierror(999,_("Scilab '%s' module disabled in -nogui or -nwni mode.\n"), "ui_data");
+               return 0;
+       }
+
+/*     if (!loadedDep) 
+       {
+               loadOnUseClassPath("ui_data");
+               loadedDep = TRUE;
+       }
+*/     
+       callFunctionFromGateway(Tab, SIZE_CURRENT_GENERIC_TABLE(Tab));
+       return 0;
+}
+/*--------------------------------------------------------------------------*/
diff --git a/scilab/modules/ui_data/sci_gateway/cpp/sci_editvar.cpp b/scilab/modules/ui_data/sci_gateway/cpp/sci_editvar.cpp
new file mode 100644 (file)
index 0000000..6991e5a
--- /dev/null
@@ -0,0 +1,34 @@
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2010 - DIGITEO - 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
+ *
+ */
+
+extern "C"
+{
+#include "gw_ui_data.h"
+#include "stack-c.h"
+#include "api_scilab.h"
+#include "localization.h"
+#include "Scierror.h"
+#include "MALLOC.h"
+#include "freeArrayOfString.h"
+#include "sciprint.h"
+}
+
+/*--------------------------------------------------------------------------*/
+int sci_editvar(char *fname,unsigned long fname_len)
+{
+       sciprint("from module ui_data, %s\n", fname);
+       
+       LhsVar(1) = 0;
+       PutLhsVar();
+       return 0;
+}
+/*--------------------------------------------------------------------------*/
diff --git a/scilab/modules/ui_data/sci_gateway/ui_data_gateway.xml b/scilab/modules/ui_data/sci_gateway/ui_data_gateway.xml
new file mode 100644 (file)
index 0000000..f54e11e
--- /dev/null
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+
+<!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">
+<GATEWAY name="ui_data">
+<!-- =================== -->
+<!--
+ Scilab
+ Interface description. In this file, we define the list of the function which
+ will be available into Scilab and the link to the "native" function.
+
+ gatewayId is the position in the hashtable 'Interfaces' defined in the
+ file SCI/modules/core/src/c/callinterf.h
+
+ primitiveId is the position in the hashtable '<module>Table Tab[]' defined
+ in the file modules/<module>/sci_gateway/c/gw_<module>.c
+
+ primitiveName is the name of the Scilab function
+
+ @author Allan CORNET
+ @date DIGITEO 2010
+ ===================
+ Don't touch if you do not know what you are doing
+-->
+<!-- =================== -->
+
+<PRIMITIVE gatewayId="65" primitiveId="1" primitiveName="editvar" />
+
+</GATEWAY>
diff --git a/scilab/modules/ui_data/src/c/DllmainUi_data.c b/scilab/modules/ui_data/src/c/DllmainUi_data.c
new file mode 100644 (file)
index 0000000..ec65911
--- /dev/null
@@ -0,0 +1,33 @@
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2010 - DIGITEO - 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 <windows.h> 
+/*--------------------------------------------------------------------------*/ 
+#pragma comment(lib,"../../../../bin/libintl.lib")
+/*--------------------------------------------------------------------------*/ 
+int WINAPI DllMain (HINSTANCE hInstance , DWORD reason, PVOID pvReserved)
+{
+       switch (reason) 
+       {
+       case DLL_PROCESS_ATTACH:
+               break;
+       case DLL_PROCESS_DETACH:
+               break;
+       case DLL_THREAD_ATTACH:
+               break;
+       case DLL_THREAD_DETACH:
+               break;
+       }
+       return 1;
+}
+/*--------------------------------------------------------------------------*/ 
+
diff --git a/scilab/modules/ui_data/src/c/LibScilab_Import.def b/scilab/modules/ui_data/src/c/LibScilab_Import.def
new file mode 100644 (file)
index 0000000..3e6f7e7
--- /dev/null
@@ -0,0 +1,15 @@
+LIBRARY    LibScilab.dll
+
+
+EXPORTS
+;
+callFunctionFromGateway
+putlhsvar_
+intersci_
+getScilabMode
+com_
+stack_
+getrhsvar_
+vartype_
+checkrhs_ 
+checklhs_
diff --git a/scilab/modules/ui_data/src/c/ui_data.vcproj b/scilab/modules/ui_data/src/c/ui_data.vcproj
new file mode 100644 (file)
index 0000000..7598966
--- /dev/null
@@ -0,0 +1,443 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+       ProjectType="Visual C++"
+       Version="9,00"
+       Name="ui_data"
+       ProjectGUID="{142D643B-A9EC-49DB-9D48-A925A20F63B1}"
+       RootNamespace="ui_data"
+       Keyword="Win32Proj"
+       TargetFrameworkVersion="0"
+       >
+       <Platforms>
+               <Platform
+                       Name="Win32"
+               />
+               <Platform
+                       Name="x64"
+               />
+       </Platforms>
+       <ToolFiles>
+       </ToolFiles>
+       <Configurations>
+               <Configuration
+                       Name="Debug|Win32"
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+                       IntermediateDirectory="$(ConfigurationName)"
+                       ConfigurationType="2"
+                       CharacterSet="2"
+                       >
+                       <Tool
+                               Name="VCPreBuildEventTool"
+                       />
+                       <Tool
+                               Name="VCCustomBuildTool"
+                       />
+                       <Tool
+                               Name="VCXMLDataGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCMIDLTool"
+                       />
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               AdditionalOptions=""
+                               Optimization="0"
+                               AdditionalIncludeDirectories=".;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/intl;../../includes;../../../../libs/MALLOC/includes;../../../api_scilab/includes;../../../core/includes;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../cpp;../../../functions/includes;../../../fileio/includes"
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;UI_DATA_EXPORTS"
+                               MinimalRebuild="true"
+                               BasicRuntimeChecks="0"
+                               RuntimeLibrary="3"
+                               UsePrecompiledHeader="0"
+                               WarningLevel="3"
+                               Detect64BitPortabilityProblems="false"
+                               DebugInformationFormat="3"
+                       />
+                       <Tool
+                               Name="VCManagedResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCPreLinkEventTool"
+                               Description="Make dependencies"
+                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalDependencies="..\..\..\..\bin\scilocalization.lib libscilab.lib"
+                               OutputFile="../../../../bin/sci$(ProjectName).dll"
+                               LinkIncremental="1"
+                               ModuleDefinitionFile=""
+                               GenerateDebugInformation="true"
+                               SubSystem="2"
+                               RandomizedBaseAddress="1"
+                               DataExecutionPrevention="0"
+                               ImportLibrary="../../../../bin/sci$(ProjectName).lib"
+                               TargetMachine="1"
+                               CLRUnmanagedCodeCheck="true"
+                       />
+                       <Tool
+                               Name="VCALinkTool"
+                       />
+                       <Tool
+                               Name="VCManifestTool"
+                       />
+                       <Tool
+                               Name="VCXDCMakeTool"
+                       />
+                       <Tool
+                               Name="VCBscMakeTool"
+                       />
+                       <Tool
+                               Name="VCFxCopTool"
+                       />
+                       <Tool
+                               Name="VCAppVerifierTool"
+                       />
+                       <Tool
+                               Name="VCPostBuildEventTool"
+                       />
+               </Configuration>
+               <Configuration
+                       Name="Debug|x64"
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+                       IntermediateDirectory="$(ConfigurationName)"
+                       ConfigurationType="2"
+                       CharacterSet="2"
+                       >
+                       <Tool
+                               Name="VCPreBuildEventTool"
+                       />
+                       <Tool
+                               Name="VCCustomBuildTool"
+                       />
+                       <Tool
+                               Name="VCXMLDataGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCMIDLTool"
+                               TargetEnvironment="3"
+                       />
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               Optimization="0"
+                               AdditionalIncludeDirectories=".;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/intl;../../includes;../../../../libs/MALLOC/includes;../../../api_scilab/includes;../../../core/includes;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../cpp;../../../functions/includes;../../../fileio/includes"
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;UI_DATA_EXPORTS"
+                               MinimalRebuild="true"
+                               BasicRuntimeChecks="0"
+                               RuntimeLibrary="3"
+                               UsePrecompiledHeader="0"
+                               WarningLevel="3"
+                               Detect64BitPortabilityProblems="false"
+                               DebugInformationFormat="3"
+                       />
+                       <Tool
+                               Name="VCManagedResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCPreLinkEventTool"
+                               Description="Make dependencies"
+                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;&#x0D;&#x0A;"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalDependencies="libscilab.lib"
+                               OutputFile="../../../../bin/sci$(ProjectName).dll"
+                               LinkIncremental="1"
+                               ModuleDefinitionFile=""
+                               GenerateDebugInformation="true"
+                               SubSystem="2"
+                               RandomizedBaseAddress="1"
+                               DataExecutionPrevention="0"
+                               ImportLibrary="../../../../bin/sci$(ProjectName).lib"
+                               TargetMachine="17"
+                               CLRUnmanagedCodeCheck="true"
+                       />
+                       <Tool
+                               Name="VCALinkTool"
+                       />
+                       <Tool
+                               Name="VCManifestTool"
+                       />
+                       <Tool
+                               Name="VCXDCMakeTool"
+                       />
+                       <Tool
+                               Name="VCBscMakeTool"
+                       />
+                       <Tool
+                               Name="VCFxCopTool"
+                       />
+                       <Tool
+                               Name="VCAppVerifierTool"
+                       />
+                       <Tool
+                               Name="VCPostBuildEventTool"
+                       />
+               </Configuration>
+               <Configuration
+                       Name="Release|Win32"
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+                       IntermediateDirectory="$(ConfigurationName)"
+                       ConfigurationType="2"
+                       CharacterSet="2"
+                       WholeProgramOptimization="0"
+                       >
+                       <Tool
+                               Name="VCPreBuildEventTool"
+                       />
+                       <Tool
+                               Name="VCCustomBuildTool"
+                       />
+                       <Tool
+                               Name="VCXMLDataGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCMIDLTool"
+                       />
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               AdditionalOptions=""
+                               InlineFunctionExpansion="1"
+                               FavorSizeOrSpeed="1"
+                               WholeProgramOptimization="false"
+                               AdditionalIncludeDirectories=".;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/intl;../../includes;../../../../libs/MALLOC/includes;../../../api_scilab/includes;../../../core/includes;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../cpp;../../../functions/includes;../../../fileio/includes"
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;UI_DATA_EXPORTS"
+                               StringPooling="true"
+                               RuntimeLibrary="2"
+                               EnableEnhancedInstructionSet="0"
+                               UsePrecompiledHeader="0"
+                               WarningLevel="3"
+                               Detect64BitPortabilityProblems="false"
+                               DebugInformationFormat="3"
+                       />
+                       <Tool
+                               Name="VCManagedResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCPreLinkEventTool"
+                               Description="Make dependencies"
+                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalDependencies="..\..\..\..\bin\scilocalization.lib libscilab.lib"
+                               OutputFile="../../../../bin/sci$(ProjectName).dll"
+                               LinkIncremental="1"
+                               ModuleDefinitionFile=""
+                               GenerateDebugInformation="false"
+                               SubSystem="2"
+                               OptimizeReferences="2"
+                               EnableCOMDATFolding="2"
+                               LinkTimeCodeGeneration="0"
+                               RandomizedBaseAddress="1"
+                               DataExecutionPrevention="0"
+                               ImportLibrary="../../../../bin/sci$(ProjectName).lib"
+                               TargetMachine="1"
+                               CLRUnmanagedCodeCheck="true"
+                       />
+                       <Tool
+                               Name="VCALinkTool"
+                       />
+                       <Tool
+                               Name="VCManifestTool"
+                       />
+                       <Tool
+                               Name="VCXDCMakeTool"
+                       />
+                       <Tool
+                               Name="VCBscMakeTool"
+                       />
+                       <Tool
+                               Name="VCFxCopTool"
+                       />
+                       <Tool
+                               Name="VCAppVerifierTool"
+                       />
+                       <Tool
+                               Name="VCPostBuildEventTool"
+                       />
+               </Configuration>
+               <Configuration
+                       Name="Release|x64"
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+                       IntermediateDirectory="$(ConfigurationName)"
+                       ConfigurationType="2"
+                       CharacterSet="2"
+                       WholeProgramOptimization="0"
+                       >
+                       <Tool
+                               Name="VCPreBuildEventTool"
+                       />
+                       <Tool
+                               Name="VCCustomBuildTool"
+                       />
+                       <Tool
+                               Name="VCXMLDataGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCMIDLTool"
+                               TargetEnvironment="3"
+                       />
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               InlineFunctionExpansion="1"
+                               FavorSizeOrSpeed="1"
+                               WholeProgramOptimization="false"
+                               AdditionalIncludeDirectories=".;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/intl;../../includes;../../../../libs/MALLOC/includes;../../../api_scilab/includes;../../../core/includes;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../cpp;../../../functions/includes;../../../fileio/includes"
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;UI_DATA_EXPORTS"
+                               StringPooling="true"
+                               RuntimeLibrary="2"
+                               EnableEnhancedInstructionSet="0"
+                               UsePrecompiledHeader="0"
+                               WarningLevel="3"
+                               Detect64BitPortabilityProblems="false"
+                               DebugInformationFormat="3"
+                       />
+                       <Tool
+                               Name="VCManagedResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCPreLinkEventTool"
+                               Description="Make dependencies"
+                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;&#x0D;&#x0A;"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalDependencies="libscilab.lib"
+                               OutputFile="../../../../bin/sci$(ProjectName).dll"
+                               LinkIncremental="1"
+                               ModuleDefinitionFile=""
+                               GenerateDebugInformation="false"
+                               SubSystem="2"
+                               OptimizeReferences="2"
+                               EnableCOMDATFolding="2"
+                               LinkTimeCodeGeneration="0"
+                               RandomizedBaseAddress="1"
+                               DataExecutionPrevention="0"
+                               ImportLibrary="../../../../bin/sci$(ProjectName).lib"
+                               TargetMachine="17"
+                               CLRUnmanagedCodeCheck="true"
+                       />
+                       <Tool
+                               Name="VCALinkTool"
+                       />
+                       <Tool
+                               Name="VCManifestTool"
+                       />
+                       <Tool
+                               Name="VCXDCMakeTool"
+                       />
+                       <Tool
+                               Name="VCBscMakeTool"
+                       />
+                       <Tool
+                               Name="VCFxCopTool"
+                       />
+                       <Tool
+                               Name="VCAppVerifierTool"
+                       />
+                       <Tool
+                               Name="VCPostBuildEventTool"
+                       />
+               </Configuration>
+       </Configurations>
+       <References>
+       </References>
+       <Files>
+               <Filter
+                       Name="Source Files"
+                       Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+                       >
+                       <File
+                               RelativePath=".\DllmainUi_data.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\sci_gateway\c\gw_ui_data.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\sci_gateway\cpp\sci_editvar.cpp"
+                               >
+                       </File>
+               </Filter>
+               <Filter
+                       Name="Header Files"
+                       Filter="h;hpp;hxx;hm;inl"
+                       >
+                       <File
+                               RelativePath="..\..\includes\dynlib_ui_data.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\includes\gw_ui_data.h"
+                               >
+                       </File>
+               </Filter>
+               <Filter
+                       Name="localization"
+                       >
+                       <File
+                               RelativePath="..\..\locales\en_US\messages.pot"
+                               >
+                       </File>
+               </Filter>
+               <Filter
+                       Name="Libraries Dependencies"
+                       >
+                       <Filter
+                               Name="Imports"
+                               >
+                               <File
+                                       RelativePath=".\LibScilab_Import.def"
+                                       >
+                               </File>
+                       </Filter>
+               </Filter>
+               <Filter
+                       Name="swig"
+                       >
+               </Filter>
+               <File
+                       RelativePath="..\..\Makefile.am"
+                       >
+               </File>
+               <File
+                       RelativePath="..\..\ui_data.iss"
+                       >
+               </File>
+               <File
+                       RelativePath="..\..\sci_gateway\uidata_gateway.xml"
+                       >
+               </File>
+               <File
+                       RelativePath="..\..\version.xml"
+                       >
+               </File>
+       </Files>
+       <Globals>
+       </Globals>
+</VisualStudioProject>
diff --git a/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/ui_data.java b/scilab/modules/ui_data/src/java/org/scilab/modules/ui_data/ui_data.java
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/scilab/modules/ui_data/src/java/ui_data-JAVA.vcproj b/scilab/modules/ui_data/src/java/ui_data-JAVA.vcproj
new file mode 100644 (file)
index 0000000..60914d3
--- /dev/null
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+       ProjectType="Visual C++"
+       Version="9,00"
+       Name="ui_data-Ant"
+       ProjectGUID="{405E6B33-DBA9-4850-A19F-19298DA5A64D}"
+       RootNamespace="ui_data-Ant"
+       Keyword="MakeFileProj"
+       TargetFrameworkVersion="0"
+       >
+       <Platforms>
+               <Platform
+                       Name="Win32"
+               />
+               <Platform
+                       Name="x64"
+               />
+       </Platforms>
+       <ToolFiles>
+       </ToolFiles>
+       <Configurations>
+               <Configuration
+                       Name="Debug|Win32"
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+                       IntermediateDirectory="$(ConfigurationName)"
+                       ConfigurationType="0"
+                       >
+                       <Tool
+                               Name="VCNMakeTool"
+                               BuildCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ..\..&#x0D;&#x0A;call ant&#x0D;&#x0A;"
+                               ReBuildCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ..\..&#x0D;&#x0A;call ant clean&#x0D;&#x0A;call ant"
+                               CleanCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ..\..&#x0D;&#x0A;call ant clean&#x0D;&#x0A;"
+                               Output=""
+                               PreprocessorDefinitions="WIN32;_DEBUG"
+                               IncludeSearchPath=""
+                               ForcedIncludes=""
+                               AssemblySearchPath=""
+                               ForcedUsingAssemblies=""
+                               CompileAsManaged=""
+                       />
+               </Configuration>
+               <Configuration
+                       Name="Debug|x64"
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+                       IntermediateDirectory="$(ConfigurationName)"
+                       ConfigurationType="0"
+                       >
+                       <Tool
+                               Name="VCNMakeTool"
+                               BuildCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ..\..&#x0D;&#x0A;call ant&#x0D;&#x0A;"
+                               ReBuildCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ..\..&#x0D;&#x0A;call ant clean&#x0D;&#x0A;call ant"
+                               CleanCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ..\..&#x0D;&#x0A;call ant clean&#x0D;&#x0A;"
+                               Output=""
+                               PreprocessorDefinitions="WIN32;_DEBUG"
+                               IncludeSearchPath=""
+                               ForcedIncludes=""
+                               AssemblySearchPath=""
+                               ForcedUsingAssemblies=""
+                               CompileAsManaged=""
+                       />
+               </Configuration>
+               <Configuration
+                       Name="Release|Win32"
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+                       IntermediateDirectory="$(ConfigurationName)"
+                       ConfigurationType="0"
+                       >
+                       <Tool
+                               Name="VCNMakeTool"
+                               BuildCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ..\..&#x0D;&#x0A;call ant&#x0D;&#x0A;"
+                               ReBuildCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ..\..&#x0D;&#x0A;call ant clean&#x0D;&#x0A;call ant"
+                               CleanCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ..\..&#x0D;&#x0A;call ant clean&#x0D;&#x0A;"
+                               Output=""
+                               PreprocessorDefinitions="WIN32;NDEBUG"
+                               IncludeSearchPath=""
+                               ForcedIncludes=""
+                               AssemblySearchPath=""
+                               ForcedUsingAssemblies=""
+                               CompileAsManaged=""
+                       />
+               </Configuration>
+               <Configuration
+                       Name="Release|x64"
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+                       IntermediateDirectory="$(ConfigurationName)"
+                       ConfigurationType="0"
+                       >
+                       <Tool
+                               Name="VCNMakeTool"
+                               BuildCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ..\..&#x0D;&#x0A;call ant&#x0D;&#x0A;"
+                               ReBuildCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ..\..&#x0D;&#x0A;call ant clean&#x0D;&#x0A;call ant"
+                               CleanCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ..\..&#x0D;&#x0A;call ant clean&#x0D;&#x0A;"
+                               Output=""
+                               PreprocessorDefinitions="WIN32;NDEBUG"
+                               IncludeSearchPath=""
+                               ForcedIncludes=""
+                               AssemblySearchPath=""
+                               ForcedUsingAssemblies=""
+                               CompileAsManaged=""
+                       />
+               </Configuration>
+       </Configurations>
+       <References>
+       </References>
+       <Files>
+               <Filter
+                       Name="Source Files"
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+                       >
+               </Filter>
+               <File
+                       RelativePath="..\..\build.xml"
+                       >
+               </File>
+       </Files>
+       <Globals>
+       </Globals>
+</VisualStudioProject>
diff --git a/scilab/modules/ui_data/src/jni/ui_data.giws.xml b/scilab/modules/ui_data/src/jni/ui_data.giws.xml
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/scilab/modules/ui_data/src/jni/ui_data.i b/scilab/modules/ui_data/src/jni/ui_data.i
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/scilab/modules/ui_data/src/noui_data/noui_data.c b/scilab/modules/ui_data/src/noui_data/noui_data.c
new file mode 100644 (file)
index 0000000..1734b3e
--- /dev/null
@@ -0,0 +1,22 @@
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2009 - DIGITEO - 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 "noui_data.h"
+#include "Scierror.h"
+#include "localization.h"
+/*--------------------------------------------------------------------------*/
+int gw_ui_data(void)
+{
+       Scierror(999,_("Scilab '%s' module not installed.\n"), "ui_data");
+       return 0;
+}
+/*--------------------------------------------------------------------------*/
diff --git a/scilab/modules/ui_data/src/noui_data/noui_data.h b/scilab/modules/ui_data/src/noui_data/noui_data.h
new file mode 100644 (file)
index 0000000..34f32e1
--- /dev/null
@@ -0,0 +1,19 @@
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2009 - DIGITEO - 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
+ *
+ */
+/*--------------------------------------------------------------------------*/
+/**
+ * This function is a wrapper / fake when Scilab is compiled without xpad
+ *
+ * @return 0
+ */
+int gw_ui_data(void);
+/*--------------------------------------------------------------------------*/
diff --git a/scilab/modules/ui_data/ui_data.iss b/scilab/modules/ui_data/ui_data.iss
new file mode 100644 (file)
index 0000000..afc05aa
--- /dev/null
@@ -0,0 +1,19 @@
+;##############################################################################################################
+; Scilab ( http://mwww.scilab.org/ ) - This file is part of Scilab
+; Copyright (C) 2010 - DIGITEO - 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
+;##############################################################################################################
+;--------------------------------------------------------------------------------------------------------------
+; ui_data module
+;--------------------------------------------------------------------------------------------------------------
+;
+#define UI_DATA "ui_data"
+;
+Source: bin\ui_data.dll; DestDir: {app}\bin; Components: {#COMPN_UI_DATA}
+;
+;--------------------------------------------------------------------------------------------------------------
diff --git a/scilab/modules/ui_data/version.xml b/scilab/modules/ui_data/version.xml
new file mode 100644 (file)
index 0000000..9eec741
--- /dev/null
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2010 - DIGITEO
+ * 
+ *  This file is distributed under the same license as the Scilab package.
+ -->
+<!DOCTYPE MODULE_VERSION SYSTEM "../core/xml/version.dtd">
+<MODULE_VERSION name="ui_data">
+<VERSION major="1" minor="0" maintenance="0" revision="0" string="unstable-git" />
+</MODULE_VERSION>
index 6c1ce54..f3687fe 100644 (file)
@@ -80,3 +80,6 @@ library.xcos.name=org.scilab.modules.xcos.jar
 
 library.xpad.dir=${modules.dir}/xpad/${build.jar.dir}/
 library.xpad.name=org.scilab.modules.xpad.jar
+
+library.ui_data.dir=${modules.dir}/ui_data/${build.jar.dir}/
+library.ui_data.name=org.scilab.modules.ui_data.jar
index 5fd5bd2..2a0010a 100644 (file)
@@ -77,3 +77,6 @@ library.xcos.name=org.scilab.modules.xcos.jar
 
 library.xpad.dir=${modules.dir}/xpad/${build.jar.dir}/
 library.xpad.name=org.scilab.modules.xpad.jar
+
+library.ui_data.dir=${modules.dir}/ui_data/${build.jar.dir}/
+library.ui_data.name=org.scilab.modules.ui_data.jar