CMSCOPE changed

11 files changed, 81 insertions, 0 deletions

diff --git a/modules/jvm/macros/buildmacros.bat b/modules/jvm/macros/buildmacros.bat
new file mode 100755
index 000000000..c4e35ec40
--- /dev/null
+++ b/modules/jvm/macros/buildmacros.bat
@@ -0,0 +1 @@
+@..\..\..\bin\scilex -nwni -ns -e exec('buildmacros.sce');quit;
\ No newline at end of file
diff --git a/modules/jvm/macros/buildmacros.sce b/modules/jvm/macros/buildmacros.sce
new file mode 100755
index 000000000..f6495108d
--- /dev/null
+++ b/modules/jvm/macros/buildmacros.sce
@@ -0,0 +1,9 @@
+//------------------------------------
+// Allan CORNET INRIA 2005
+//------------------------------------
+if (isdef("genlib") == %f) then
+    exec(SCI+"/modules/functions/scripts/buildmacros/loadgenlib.sce");
+end
+//------------------------------------
+genlib("jvmlib","SCI/modules/jvm/macros",%f,%t);
+//------------------------------------
diff --git a/modules/jvm/macros/check_classpath.bin b/modules/jvm/macros/check_classpath.bin
new file mode 100755
index 000000000..aea44ed03
--- /dev/null
+++ b/modules/jvm/macros/check_classpath.bin
diff --git a/modules/jvm/macros/check_classpath.sci b/modules/jvm/macros/check_classpath.sci
new file mode 100755
index 000000000..59241fad6
--- /dev/null
+++ b/modules/jvm/macros/check_classpath.sci
@@ -0,0 +1,25 @@
+//------------------------------------
+// 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
+//------------------------------------
+function ret=check_classpath(varargin)
+    [lhs,rhs]=argn(0);
+    ret=%T;
+    file_to_check=SCI+"/etc/classpath.xml";
+    printf("checking : "+file_to_check+"\n");
+    try
+        if getos() == "Windows" then
+            stat = unix_w(SCI+"\modules\helptools\bin\xmllint\xmllint --noout --valid "+file_to_check);
+        else
+            stat = unix_w("xmllint --noout --valid "+file_to_check);
+        end
+    catch
+        ret=%F;
+    end
+endfunction
+//------------------------------------
diff --git a/modules/jvm/macros/check_librarypath.bin b/modules/jvm/macros/check_librarypath.bin
new file mode 100755
index 000000000..5c90e6c66
--- /dev/null
+++ b/modules/jvm/macros/check_librarypath.bin
diff --git a/modules/jvm/macros/check_librarypath.sci b/modules/jvm/macros/check_librarypath.sci
new file mode 100755
index 000000000..46ece10f5
--- /dev/null
+++ b/modules/jvm/macros/check_librarypath.sci
@@ -0,0 +1,25 @@
+//------------------------------------
+// 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
+//------------------------------------
+function ret=check_librarypath(varargin)
+    [lhs,rhs]=argn(0);
+    ret=%T;
+    file_to_check=SCI+"/etc/librarypath.xml";
+    printf("checking : "+file_to_check+"\n");
+    try
+        if getos() == "Windows" then
+            stat = unix_w(SCI+"\modules\helptools\bin\xmllint\xmllint --noout --valid "+file_to_check);
+        else
+            stat = unix_w("xmllint --noout --valid "+file_to_check);
+        end
+    catch
+        ret=%F;
+    end
+endfunction
+//------------------------------------
diff --git a/modules/jvm/macros/cleanmacros.bat b/modules/jvm/macros/cleanmacros.bat
new file mode 100755
index 000000000..5079dfd71
--- /dev/null
+++ b/modules/jvm/macros/cleanmacros.bat
@@ -0,0 +1,3 @@
+@del *.bin 2>NUL
+@del lib 2>NUL
+@del names 2>NUL
\ No newline at end of file
diff --git a/modules/jvm/macros/jre_path.bin b/modules/jvm/macros/jre_path.bin
new file mode 100755
index 000000000..b79dbbe57
--- /dev/null
+++ b/modules/jvm/macros/jre_path.bin
diff --git a/modules/jvm/macros/jre_path.sci b/modules/jvm/macros/jre_path.sci
new file mode 100755
index 000000000..744f35535
--- /dev/null
+++ b/modules/jvm/macros/jre_path.sci
@@ -0,0 +1,15 @@
+//===============================
+// 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
+//===============================
+// returns JRE path
+//===============================
+function pathofjre=jre_path()
+    pathofjre=system_getproperty("java.home");
+endfunction
+//===============================
diff --git a/modules/jvm/macros/lib b/modules/jvm/macros/lib
new file mode 100755
index 000000000..95354f4bb
--- /dev/null
+++ b/modules/jvm/macros/lib
diff --git a/modules/jvm/macros/names b/modules/jvm/macros/names
new file mode 100755
index 000000000..357e34856
--- /dev/null
+++ b/modules/jvm/macros/names
@@ -0,0 +1,3 @@
+check_classpath
+check_librarypath
+jre_path