FreeBSD: fix OpenJDK7 auto-detection
authorJan Vrany <jan.vrany@fit.cvut.cz>
Sun, 03 Feb 2019 23:47:29 +0000
changeset 3885 81a09bfe1d39
parent 3879 5416f5135ef2
child 3886 292b73957757
child 3912 887c0f0b3e32
FreeBSD: fix OpenJDK7 auto-detection
JavaRelease.st
JavaReleaseTests.st
--- a/JavaRelease.st	Fri Feb 01 22:31:35 2019 +0000
+++ b/JavaRelease.st	Sun Feb 03 23:47:29 2019 +0000
@@ -2121,14 +2121,18 @@
 
         '/usr/lib/jvm/java-7-openjdk-',arch, '/jre'."/ JRE - newer linuxes
         '/usr/lib/jvm/java-7-openjdk/jre'  .        "/ JRE - older linuxes
+
+        '/usr/local/openjdk7' .                     "/ FreeBSD 11
     }
 
     "
     JavaRelease::OpenJDK7 new javaHomesOnUNIX
+    JavaRelease available
     "
 
     "Created: / 11-02-2012 / 17:47:02 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 13-06-2013 / 09:10:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified (comment): / 03-02-2019 / 22:56:58 / jv"
 !
 
 javaHomesOnWindows
@@ -2277,11 +2281,11 @@
     "Return true if aVersionString (which is what 'java -version' returns)
      matches what I expect."
 
-    ^ (aVersionString matches: '*java version "1.7.*OpenJDK Runtime Environment*')
+    ^ (aVersionString matches: '* version "1.7.*OpenJDK Runtime Environment*')
         and:[ (aVersionString includesString: 'Zulu') not ]
 
     "Modified: / 03-04-2014 / 12:52:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 11-03-2015 / 09:29:59 / jv"
+    "Modified: / 03-02-2019 / 23:23:35 / jv"
 ! !
 
 !JavaRelease::OpenJDK8 class methodsFor:'queries'!
--- a/JavaReleaseTests.st	Fri Feb 01 22:31:35 2019 +0000
+++ b/JavaReleaseTests.st	Sun Feb 03 23:47:29 2019 +0000
@@ -90,6 +90,37 @@
     "Modified: / 10-12-2014 / 08:54:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
+test_freeBSD_OpenJDK_1_7_0_161_jdk
+
+    | java_home |
+
+    java_home :=  #(
+            '/usr/local/openjdk7' 
+            ) detect:[:each | each asFilename exists ] ifNone:[ nil ].
+
+    java_home notNil ifTrue:[ java_home := java_home asFilename ].                
+    self 
+        skipIf:  (java_home isNil or:[ java_home exists not ])
+        description: ('Directory does not exist (%1)' bindWith:(java_home notNil 
+                                   ifTrue:[ java_home pathName ]
+                                   ifFalse:[ 'nil' ])).
+
+    self assert: (JavaRelease openJDK6 validateJavaHome: java_home) not.
+    self assert: (JavaRelease openJDK7 validateJavaHome: java_home).
+    self assert: (JavaRelease openJDK8 validateJavaHome: java_home) not.
+
+    self assert: (JavaRelease oracleJDK6 validateJavaHome: java_home) not.
+    self assert: (JavaRelease oracleJDK7 validateJavaHome: java_home) not.
+    self assert: (JavaRelease oracleJDK8 validateJavaHome: java_home) not.
+
+    self assert: (JavaRelease zulu7 validateJavaHome: java_home) not.
+    self assert: (JavaRelease zulu8 validateJavaHome: java_home) not.          
+
+    self assert: ((JavaRelease inDirectory: java_home) isKindOf: (JavaRelease::OpenJDK7))
+
+    "Created: / 03-02-2019 / 23:35:54 / jv"
+!
+
 test_linux_OpenJDK_1_6_0_30_jdk
 
     | java_home |