* Bug #9444 fixed - jvm: remove with_embedded_jre 85/13485/2
Paul Bignier [Tue, 21 Jan 2014 08:16:32 +0000 (09:16 +0100)]
Change-Id: I466b66c1fc6299948cf8c225f7e4298313c74672

14 files changed:
scilab/CHANGES_5.5.X
scilab/modules/completion/tests/nonreg_tests/bug_2848.dia.ref
scilab/modules/completion/tests/nonreg_tests/bug_2848.tst
scilab/modules/jvm/Makefile.am
scilab/modules/jvm/Makefile.in
scilab/modules/jvm/help/en_US/with_embedded_jre.xml [deleted file]
scilab/modules/jvm/includes/gw_jvm.h
scilab/modules/jvm/libjvm.vcxproj
scilab/modules/jvm/libjvm.vcxproj.filters
scilab/modules/jvm/sci_gateway/c/gw_jvm.c
scilab/modules/jvm/sci_gateway/c/sci_with_embedded_jre.c [deleted file]
scilab/modules/jvm/sci_gateway/jvm_gateway.xml
scilab/modules/jvm/tests/unit_tests/with_embedded_jre.dia.ref [deleted file]
scilab/modules/jvm/tests/unit_tests/with_embedded_jre.tst [deleted file]

index 4e8aaae..b1849e7 100644 (file)
@@ -37,6 +37,8 @@ Obsolete & Removed Functions
 
 * demo_message and demo_mdialog removed.
 
+* with_embedded_jre removed.
+
 
 Scilab Bug Fixes
 ================
@@ -146,6 +148,8 @@ Scilab Bug Fixes
 
 * Bug #9319 fixed - Big polylines could not be exported in PS/EPS.
 
+* Bug #9444 fixed - with_embedded_jre function removed.
+
 * Bug #9627 fixed - Arguments checking added in optimsimplex_* functions.
 
 * Bug #9697 fixed - Printed information for optim "qn" and "gc" with bounds and imp=1 fixed.
index a93f658..b096732 100644 (file)
@@ -23,17 +23,17 @@ clear with_tk
 assert_checkequal(c, []);
 with_tk();
 function x = with_foo(y, z)
-  x = y + z;
+    x = y + z;
 endfunction
 [a, b, c, d] = completion("with");
-ref_a = ["with_embedded_jre"; "with_module"];
+ref_a = ["with_module"];
 ref_b = [];
 ref_c = [];
 ref_d = ["with_foo"; ..
-         "with_javasci"; ..
-         "with_macros_source"; ..
-         "with_modelica_compiler"; ..
-         "with_tk"];
+"with_javasci"; ..
+"with_macros_source"; ..
+"with_modelica_compiler"; ..
+"with_tk"];
 assert_checkequal(a, ref_a);
 assert_checkequal(b, ref_b);
 assert_checkequal(c, ref_c);
index 0807feb..7a159f7 100644 (file)
@@ -31,18 +31,18 @@ assert_checkequal(c, []);
 with_tk();
 
 function x = with_foo(y, z)
-  x = y + z;
+    x = y + z;
 endfunction
 
 [a, b, c, d] = completion("with");
-ref_a = ["with_embedded_jre"; "with_module"];
+ref_a = ["with_module"];
 ref_b = [];
 ref_c = [];
 ref_d = ["with_foo"; ..
-         "with_javasci"; ..
-         "with_macros_source"; ..
-         "with_modelica_compiler"; ..
-         "with_tk"];
+"with_javasci"; ..
+"with_macros_source"; ..
+"with_modelica_compiler"; ..
+"with_tk"];
 
 assert_checkequal(a, ref_a);
 assert_checkequal(b, ref_b);
index a0280dc..f207dbd 100644 (file)
@@ -2,11 +2,11 @@
 # Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
 # Copyright (C) INRIA   - 2006 - Sylvestre Ledru
 # Copyright (C) DIGITEO - 2009 - Pierre MARECHAL
-# 
+#
 # 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    
+# are also available at
 # http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
 #
 
@@ -16,7 +16,7 @@ modulename=jvm
 
 #### jvm : Conf files ####
 libscijvm_la_rootdir = $(mydatadir)
-libscijvm_la_root_DATA =  license.txt 
+libscijvm_la_root_DATA =  license.txt
 
 #### jvm : init scripts ####
 libscijvm_la_etcdir = $(mydatadir)/etc
@@ -50,7 +50,7 @@ endif
 libscijvm_la_LDFLAGS = -lpthread $(XML_LIBS) $(JAVA_JNI_LIBS) $(AM_LDFLAGS)
 
 # FIXME: This a platform specific flag, this should be done on configure.ac
-if IS_MACOSX 
+if IS_MACOSX
 libscijvm_la_LDFLAGS += -framework JavaVM
 endif
 
@@ -74,7 +74,6 @@ includes/getScilabObject.h
 
 GATEWAY_C_SOURCES = sci_gateway/c/sci_system_getproperty.c \
 sci_gateway/c/sci_system_setproperty.c \
-sci_gateway/c/sci_with_embedded_jre.c \
 sci_gateway/c/sci_javaclasspath.c \
 sci_gateway/c/gw_jvm.c \
 sci_gateway/c/sci_javalibrarypath.c
index a99dcac..19edc2e 100644 (file)
 # Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
 # Copyright (C) INRIA   - 2006 - Sylvestre Ledru
 # Copyright (C) DIGITEO - 2009 - Pierre MARECHAL
-# 
+#
 # 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    
+# are also available at
 # http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
 #
 
@@ -209,7 +209,6 @@ libscijvm_disable_la_OBJECTS = $(am_libscijvm_disable_la_OBJECTS)
 libscijvm_la_DEPENDENCIES = libscijvm-algo.la
 am__objects_2 = sci_gateway/c/libscijvm_la-sci_system_getproperty.lo \
        sci_gateway/c/libscijvm_la-sci_system_setproperty.lo \
-       sci_gateway/c/libscijvm_la-sci_with_embedded_jre.lo \
        sci_gateway/c/libscijvm_la-sci_javaclasspath.lo \
        sci_gateway/c/libscijvm_la-gw_jvm.lo \
        sci_gateway/c/libscijvm_la-sci_javalibrarypath.lo
@@ -562,7 +561,7 @@ modulename = jvm
 
 #### jvm : Conf files ####
 libscijvm_la_rootdir = $(mydatadir)
-libscijvm_la_root_DATA = license.txt 
+libscijvm_la_root_DATA = license.txt
 
 #### jvm : init scripts ####
 libscijvm_la_etcdir = $(mydatadir)/etc
@@ -606,7 +605,6 @@ includes/getScilabObject.h
 
 GATEWAY_C_SOURCES = sci_gateway/c/sci_system_getproperty.c \
 sci_gateway/c/sci_system_setproperty.c \
-sci_gateway/c/sci_with_embedded_jre.c \
 sci_gateway/c/sci_javaclasspath.c \
 sci_gateway/c/gw_jvm.c \
 sci_gateway/c/sci_javalibrarypath.c
@@ -870,9 +868,6 @@ sci_gateway/c/libscijvm_la-sci_system_getproperty.lo:  \
 sci_gateway/c/libscijvm_la-sci_system_setproperty.lo:  \
        sci_gateway/c/$(am__dirstamp) \
        sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
-sci_gateway/c/libscijvm_la-sci_with_embedded_jre.lo:  \
-       sci_gateway/c/$(am__dirstamp) \
-       sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
 sci_gateway/c/libscijvm_la-sci_javaclasspath.lo:  \
        sci_gateway/c/$(am__dirstamp) \
        sci_gateway/c/$(DEPDIR)/$(am__dirstamp)
@@ -902,7 +897,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscijvm_la-sci_javalibrarypath.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscijvm_la-sci_system_getproperty.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscijvm_la-sci_system_setproperty.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@sci_gateway/c/$(DEPDIR)/libscijvm_la-sci_with_embedded_jre.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/$(DEPDIR)/libscijvm_algo_la-InitializeJVM.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/$(DEPDIR)/libscijvm_algo_la-JVM.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/$(DEPDIR)/libscijvm_algo_la-JVM_Unix.Plo@am__quote@
@@ -1094,13 +1088,6 @@ sci_gateway/c/libscijvm_la-sci_system_setproperty.lo: sci_gateway/c/sci_system_s
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscijvm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sci_gateway/c/libscijvm_la-sci_system_setproperty.lo `test -f 'sci_gateway/c/sci_system_setproperty.c' || echo '$(srcdir)/'`sci_gateway/c/sci_system_setproperty.c
 
-sci_gateway/c/libscijvm_la-sci_with_embedded_jre.lo: sci_gateway/c/sci_with_embedded_jre.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscijvm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sci_gateway/c/libscijvm_la-sci_with_embedded_jre.lo -MD -MP -MF sci_gateway/c/$(DEPDIR)/libscijvm_la-sci_with_embedded_jre.Tpo -c -o sci_gateway/c/libscijvm_la-sci_with_embedded_jre.lo `test -f 'sci_gateway/c/sci_with_embedded_jre.c' || echo '$(srcdir)/'`sci_gateway/c/sci_with_embedded_jre.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) sci_gateway/c/$(DEPDIR)/libscijvm_la-sci_with_embedded_jre.Tpo sci_gateway/c/$(DEPDIR)/libscijvm_la-sci_with_embedded_jre.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='sci_gateway/c/sci_with_embedded_jre.c' object='sci_gateway/c/libscijvm_la-sci_with_embedded_jre.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscijvm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sci_gateway/c/libscijvm_la-sci_with_embedded_jre.lo `test -f 'sci_gateway/c/sci_with_embedded_jre.c' || echo '$(srcdir)/'`sci_gateway/c/sci_with_embedded_jre.c
-
 sci_gateway/c/libscijvm_la-sci_javaclasspath.lo: sci_gateway/c/sci_javaclasspath.c
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscijvm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sci_gateway/c/libscijvm_la-sci_javaclasspath.lo -MD -MP -MF sci_gateway/c/$(DEPDIR)/libscijvm_la-sci_javaclasspath.Tpo -c -o sci_gateway/c/libscijvm_la-sci_javaclasspath.lo `test -f 'sci_gateway/c/sci_javaclasspath.c' || echo '$(srcdir)/'`sci_gateway/c/sci_javaclasspath.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) sci_gateway/c/$(DEPDIR)/libscijvm_la-sci_javaclasspath.Tpo sci_gateway/c/$(DEPDIR)/libscijvm_la-sci_javaclasspath.Plo
diff --git a/scilab/modules/jvm/help/en_US/with_embedded_jre.xml b/scilab/modules/jvm/help/en_US/with_embedded_jre.xml
deleted file mode 100644 (file)
index 00c724f..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) INRIA - 
- * 
- * 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.1-en.txt
- *
- -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="en" xml:id="with_embedded_jre">
-    <refnamediv>
-        <refname>with_embedded_jre</refname>
-        <refpurpose>checks if scilab uses a embedded JRE</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Calling Sequence</title>
-        <synopsis>res=with_embedded_jre()</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Arguments</title>
-        <variablelist>
-            <varlistentry>
-                <term>res</term>
-                <listitem>
-                    <para>a boolean</para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Description</title>
-        <para>checks if scilab uses a embedded JRE.</para>
-    </refsection>
-    <refsection>
-        <title>Examples</title>
-        <programlisting role="example"><![CDATA[ 
-res=with_embedded_jre();
- ]]></programlisting>
-    </refsection>
-</refentry>
index b62d16f..f1a17d8 100644 (file)
@@ -21,7 +21,6 @@ JVM_IMPEXP int gw_jvm(void);
 /*--------------------------------------------------------------------------*/
 /* Declaration of all the profile function declared and */
 /* used in sci_gateway */
-JVM_IMPEXP int sci_with_embedded_jre(char *fname, unsigned long fname_len);
 JVM_IMPEXP int sci_system_setproperty(char *fname, unsigned long fname_len);
 JVM_IMPEXP int sci_system_getproperty(char *fname, unsigned long fname_len);
 JVM_IMPEXP int sci_javaclasspath(char *fname, unsigned long fname_len);
index fc2f821..92f3c1d 100644 (file)
@@ -241,7 +241,6 @@ lib /DEF:"$(ProjectDir)preferences_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Pla
     <ClCompile Include="sci_gateway\c\sci_javalibrarypath.c" />
     <ClCompile Include="sci_gateway\c\sci_system_getproperty.c" />
     <ClCompile Include="sci_gateway\c\sci_system_setproperty.c" />
-    <ClCompile Include="sci_gateway\c\sci_with_embedded_jre.c" />
     <ClCompile Include="src\c\system_getproperty.c" />
     <ClCompile Include="src\c\system_setproperty.c" />
     <ClCompile Include="src\c\TerminateJVM.c" />
@@ -321,4 +320,4 @@ lib /DEF:"$(ProjectDir)preferences_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Pla
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
index 36cd8f3..c4b2932 100644 (file)
@@ -90,9 +90,6 @@
     <ClCompile Include="sci_gateway\c\sci_system_setproperty.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="sci_gateway\c\sci_with_embedded_jre.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="src\c\system_getproperty.c">
       <Filter>Source Files</Filter>
     </ClCompile>
       <Filter>localization</Filter>
     </None>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
index 99496a1..d7dae08 100644 (file)
@@ -22,7 +22,6 @@
 /*--------------------------------------------------------------------------*/
 static gw_generic_table  Tab[] =
 {
-    {sci_with_embedded_jre, "with_embedded_jre"},
     {sci_system_setproperty, "system_setproperty"},
     {sci_system_getproperty, "system_getproperty"},
     {sci_javaclasspath, "javaclasspath"},
diff --git a/scilab/modules/jvm/sci_gateway/c/sci_with_embedded_jre.c b/scilab/modules/jvm/sci_gateway/c/sci_with_embedded_jre.c
deleted file mode 100644 (file)
index f8b82de..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 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.1-en.txt
- *
- */
-
-/*--------------------------------------------------------------------------*/
-#include "gw_jvm.h"
-#include "MALLOC.h"
-#include "stack-c.h"
-#include "JVM_functions.h"
-/*--------------------------------------------------------------------------*/
-int sci_with_embedded_jre(char *fname, unsigned long fname_len)
-{
-    static int n1 = 0, l1 = 0;
-    CheckRhs(0, 0);
-    n1 = 1;
-    CreateVar(Rhs + 1, MATRIX_OF_BOOLEAN_DATATYPE, &n1, &n1, &l1);
-    *istk(l1) = (int)withEmbeddedJRE();
-
-    LhsVar(1) = Rhs + 1;
-    PutLhsVar();
-    return 0;
-}
-/*--------------------------------------------------------------------------*/
index 3a9b6fc..5639618 100644 (file)
 
  primitiveName is the name of the Scilab function
 
+
  ===================
  Don't touch if you do not know what you are doing
 -->
-    
+
     <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) 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    
+ * are also available at
  * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
  *
  -->
-    
+
     <!-- =================== -->
-    
-    <PRIMITIVE gatewayId="52" primitiveId="1" primitiveName="with_embedded_jre" />
-    <PRIMITIVE gatewayId="52" primitiveId="2" primitiveName="system_setproperty" />
-    
-    <PRIMITIVE gatewayId="52" primitiveId="3" primitiveName="system_getproperty" />
-    <PRIMITIVE gatewayId="52" primitiveId="4" primitiveName="javaclasspath" />
-    <PRIMITIVE gatewayId="52" primitiveId="5" primitiveName="javalibrarypath" />
+
+    <PRIMITIVE gatewayId="52" primitiveId="1" primitiveName="system_setproperty" />
+
+    <PRIMITIVE gatewayId="52" primitiveId="2" primitiveName="system_getproperty" />
+    <PRIMITIVE gatewayId="52" primitiveId="3" primitiveName="javaclasspath" />
+    <PRIMITIVE gatewayId="52" primitiveId="4" primitiveName="javalibrarypath" />
 </GATEWAY>
diff --git a/scilab/modules/jvm/tests/unit_tests/with_embedded_jre.dia.ref b/scilab/modules/jvm/tests/unit_tests/with_embedded_jre.dia.ref
deleted file mode 100644 (file)
index d29d234..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-// =============================================================================
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) 2011 - DIGITEO - Sylvestre LEDRU
-//
-//  This file is distributed under the same license as the Scilab package.
-// =============================================================================
-ierr = execstr('a = with_embedded_jre(''TOTO'',2);','errcatch');
-if ierr <> 77 then bugmes();quit;end
-result = with_embedded_jre();
-if result <> %t & result <> %f then bugmes();quit;end
diff --git a/scilab/modules/jvm/tests/unit_tests/with_embedded_jre.tst b/scilab/modules/jvm/tests/unit_tests/with_embedded_jre.tst
deleted file mode 100644 (file)
index 03a68d9..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-// =============================================================================
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) 2011 - DIGITEO - Sylvestre LEDRU
-//
-//  This file is distributed under the same license as the Scilab package.
-// =============================================================================
-
-ierr = execstr('a = with_embedded_jre(''TOTO'',2);','errcatch');
-if ierr <> 77 then pause,end
-
-result = with_embedded_jre();
-if result <> %t & result <> %f then pause, end