Mercurial > forge

changeset 12239:f57e70879583 octave-forge

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Removed all refs to Java package; rely on 3.7.2+ config features
author prnienhuis
date Sat, 28 Dec 2013 16:06:23 +0000
parents dd02e2ffef97
children 1696f1b68d24
files main/io/PKG_ADD
diffstat 1 files changed, 11 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/main/io/PKG_ADD	Fri Dec 20 22:23:23 2013 +0000
+++ b/main/io/PKG_ADD	Sat Dec 28 16:06:23 2013 +0000
@@ -1,16 +1,11 @@
-## PKG_ADD
-## add paths of io pkg java jars if java pkg is installed and loaded
-pkglist = pkg ("list");
-javapkgind = find (cellfun (@(x) strcmp(x.name, "java"), pkglist), 1, "first");
-if (! isempty (javapkgind))
-  javapkg = pkglist{javapkgind};
-  if (javapkg.loaded)
-    # Assume jar files are in /lib/java and let chk_spreadsheet_support sort it out
-    libdir = octave_config_info ("libdir");
-    ## Allow time for package to be fully loaded
-    pause (0.25);
-    spr_status = chk_spreadsheet_support ([ libdir filesep "java" ]);
-  endif
-endif
-## Clean up
-clear javapkgind javapkg libdir spr_status pkglist ;
\ No newline at end of file
+## PKG_ADD
+## add paths of io pkg java jars. First check if Java support was built in
+if (octave_config_info ("features").JAVA)
+    # Assume jar files are in /lib/java and let chk_spreadsheet_support sort it out
+    libdir = octave_config_info ("libdir");
+    ## Allow time for package to be fully loaded
+    pause (0.25);
+    spr_status = chk_spreadsheet_support ([ libdir filesep "java" ]);
+endif
+## Clean up
+clear libdir spr_status ;
\ No newline at end of file