octave-cvsupdate

[Octave-cvsupdate] SF.net SVN: octave:[8109] trunk/octave-forge/extra/java/inst/dlgtest.m

[<prn...@us...>]

Revision: 8109
          http://octave.svn.sourceforge.net/octave/?rev=8109&view=rev
Author:   prnienhuis
Date:     2011-02-14 22:05:10 +0000 (Mon, 14 Feb 2011)

Log Message:
-----------
Fixed wrong input arg order in call to javaMethod() (used java_invoke instead), & minor style edits

Modified Paths:
--------------
    trunk/octave-forge/extra/java/inst/dlgtest.m

Modified: trunk/octave-forge/extra/java/inst/dlgtest.m
===================================================================
--- trunk/octave-forge/extra/java/inst/dlgtest.m	2011-02-14 22:03:46 UTC (rev 8108)
+++ trunk/octave-forge/extra/java/inst/dlgtest.m	2011-02-14 22:05:10 UTC (rev 8109)
@@ -11,11 +11,11 @@
    if ispc()
       % NOTE: do NOT use backslashes as separator, only forward slashes!
       pkgpath = 'z:/java-1.2.8.tar.gz';
-      java_home = 'C:/Java/jdk1.6.0_21';
+      java_home = getenv ("JAVA_HOME");
    elseif isunix()
       % Linux example paths
       pkgpath = '~/java-1.2.8.tar.gz';
-      java_home = '/usr/local/jdk1.6.0_21';
+      java_home = getenv ("JAVA_HOME");
    else
       pkgpath = 'unknown';
       java_home = 'unknown';   


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Octave-cvsupdate] SF.net SVN: octave:[10706] trunk/octave-forge/extra/java/inst/dlgtest.m

[<prn...@us...>]

Revision: 10706
          http://octave.svn.sourceforge.net/octave/?rev=10706&view=rev
Author:   prnienhuis
Date:     2012-06-29 16:37:50 +0000 (Fri, 29 Jun 2012)
Log Message:
-----------
Allow dlgtest.m to run w/o JAVA_HOME setting when not reinstalling Java pkg

Modified Paths:
--------------
    trunk/octave-forge/extra/java/inst/dlgtest.m

Modified: trunk/octave-forge/extra/java/inst/dlgtest.m
===================================================================
--- trunk/octave-forge/extra/java/inst/dlgtest.m	2012-06-29 09:03:08 UTC (rev 10705)
+++ trunk/octave-forge/extra/java/inst/dlgtest.m	2012-06-29 16:37:50 UTC (rev 10706)
@@ -29,7 +29,7 @@
       return
    end
 
-  if ! exist (java_home, "dir")
+  if (reinstall && (! exist (java_home, "dir")))
     disp(['Java JDK home directory ', java_home,' does not exist.']);
     disp('Please adapt java_home in dlgtest.m.');
     return;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.