Merge remote-tracking branch 'origin/JIMS' 16/12416/3
Antoine ELIAS [Tue, 3 Sep 2013 09:27:53 +0000 (11:27 +0200)]
Change-Id: I3ae127fa4a7964a285b484f2c0ed5ccc3e729978

1  2 
scilab/CHANGES_5.5.X
scilab/etc/classpath.xml.in
scilab/modules/external_objects_java/help/en_US/jcompile.xml

Simple merge
@@@ -189,4 -189,10 +189,11 @@@ The option is "disableUnderMode" and ca
  
  <path value="$SCILAB/modules/history_browser/jar/org.scilab.modules.history_browser.jar" disableUnderMode="NW"/>
  
+ <path value="$SCILAB/modules/external_objects_java/jar/org.scilab.modules.external_objects_java.jar" />
++<!--
+ <path value="$SCILAB/thirdparty/ecj.jar" load="onUse">
+     <load on="external_objects_java"/>
+ </path>
 -
++-->
  </classpaths>
index 0000000,3a9f0e0..c5a6add
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,101 +1,101 @@@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <!--
+ *
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2010 - 2011 - Calixte DENIZET <calixte@contrib.scilab.org>
+ *
+ * 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
+ *
+ *
+ -->
+ <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" version="5.0-subset Scilab" xml:lang="en" xml:id="jcompile">
+     <refnamediv>
+         <refname>jcompile</refname>
+         <refpurpose>Compile Java code or file</refpurpose>
+     </refnamediv>
+     <refsynopsisdiv>
+         <title>Calling Sequence</title>
+         <synopsis>
+             class = jcompile(className, code);
+             class = jcompile(javaFiles);
+         </synopsis>
+     </refsynopsisdiv>
+     <refsection>
+         <title>Parameters</title>
+         <variablelist>
+             <varlistentry>
+                 <term>className</term>
+                 <listitem>
+                     <para>A string giving the class name</para>
+                 </listitem>
+             </varlistentry>
+             <varlistentry>
+                 <term>code</term>
+                 <listitem>
+                     <para>A row or a column of strings containing the Java code.</para>
+                 </listitem>
+             </varlistentry>
+             <varlistentry>
+                 <term>javaFiles</term>
+                 <listitem>
+                     <para>Path to Java files.</para>
+                 </listitem>
+             </varlistentry>
+             <varlistentry>
+                 <term>class</term>
+                 <listitem>
+                     <para>A mlist typed _JClass</para>
+                 </listitem>
+             </varlistentry>
+         </variablelist>
+     </refsection>
+     <refsection>
+         <title>Description</title>
+         <para>
+             Compile Java source code and load the corresponding class. If the package tools.jar, distributed with JDK, is not in the classpath, the Eclipse Compiler for Java (ECJ) will be used.
+         </para>
 -        <para>If the argument is a file, jcompile will compile the Java code.
 -        </refsection>
 -        <refsection>
 -            <title>Examples</title>
 -            <programlisting role="example"><![CDATA[
++        <para>If the argument is a file, jcompile will compile the Java code.</para>
++    </refsection>
++    <refsection>
++        <title>Examples</title>
++        <programlisting role="example"><![CDATA[
+                hw = jcompile("HelloWorld", ["public class HelloWorld {"
+                                             "public static String getHello() {"
+                                             "return ""Hello World !!"";"
+                                             "}"
+                                             "}"]);
+                hello = hw.getHello()
+                jremove hello hw
+       ]]></programlisting>
 -            <programlisting role="example"><![CDATA[
++        <programlisting role="example"><![CDATA[
+ fd = mopen(TMPDIR+'/HelloWorld.java','wt');
+ mputl(["public class HelloWorld {"
+                    "public static String getHello() {"
+                    "return ""Hello World !!"";"
+                    "}"
+                    "}"],fd);
+ mclose(fd);
+ jcompile(TMPDIR+"/HelloWorld.java")
+       ]]></programlisting>
 -            <programlisting role="example"><![CDATA[
++        <programlisting role="example"><![CDATA[
+ directory=SCI+"/modules/external_objects_java/examples/com/foo/";
+ // Compile of all them
+ jcompile(ls(directory + "/*.java"))
+       ]]></programlisting>
 -        </refsection>
 -        <refsection role="see also">
 -            <title>See Also</title>
 -            <simplelist type="inline">
 -                <member>
 -                    <link linkend="jimport">jimport</link>
 -                </member>
 -            </simplelist>
 -        </refsection>
 -    </refentry>
++    </refsection>
++    <refsection role="see also">
++        <title>See Also</title>
++        <simplelist type="inline">
++            <member>
++                <link linkend="jimport">jimport</link>
++            </member>
++        </simplelist>
++    </refsection>
++</refentry>