author | Jan Vrany <jan.vrany@fit.cvut.cz> |
Fri, 01 Aug 2014 14:25:45 +0100 | |
changeset 3187 | 3f605f43f795 |
parent 3185 | 9003a9074b2c |
child 3188 | d9a3d685c8b9 |
JavaRelease.st | file | annotate | diff | comparison | revisions |
--- a/JavaRelease.st Wed Jul 30 16:34:59 2014 +0100 +++ b/JavaRelease.st Fri Aug 01 14:25:45 2014 +0100 @@ -356,7 +356,7 @@ ! forExecutable: javaExecutable - "Returns an instance of JavaRelease for given java executable + "Returns an instance of JavaRelease for given java executable (java.exe on Windows, java on UNIX). Return nil if javaExecutable does not exits, not executable or version of that Java version is not recognized/suppported." @@ -579,7 +579,7 @@ javaExecutable exists ifTrue:[ ^ javaExecutable ]. ^ nil - + " JavaRelease basicNew javaExecutableForJavaHome: (OperatingSystem pathOfCommand:'java') asFilename directory directory. JavaRelease basicNew javaExecutableForJavaHome: '/usr/lib/jvm/java-7-openjdk-amd64/jre' @@ -900,7 +900,7 @@ dumpConfigOn: stream | dumper | - dumper := + dumper := [:name :value :isfile| | values | @@ -940,7 +940,7 @@ displayString | displayString | - displayString := '%1 (%2%3) ' bindWith: self name + displayString := '%1 (%2%3) ' bindWith: self name with: (self jdkHome notNil ifTrue:[ 'JDK' ] ifFalse:[ 'JRE' ]) with: (self isSystem ifTrue:[ ', system' ] ifFalse:[ '' ]). displayString := displayString , (('- ', self javaHome asFilename pathName) asText colorizeAllWith: Color gray). @@ -1168,7 +1168,7 @@ !JavaRelease methodsFor:'validating'! validateJavaExecutable: javaExecutable - "Validates given java executable (java.exe on Windows, java on UNIX). + "Validates given java executable (java.exe on Windows, java on UNIX). Return true, if given executable represents same version as receiver, false otherwise." @@ -1302,7 +1302,7 @@ arch := OperatingSystem getSystemInfo at:#machine. arch = 'x86_64' ifTrue:[arch := 'amd64']. - arch = 'i686' ifTrue:[arch := 'i386']. + arch = 'i686' ifTrue:[arch := 'i386']. ^ { '/usr/lib/jvm/java-6-openjdk-',arch. "/ JDK - newer linuxes @@ -1574,9 +1574,9 @@ ^ super jdkHome " - Java release jreHome - Java release javaHome - Java release jdkHome + Java release jreHome + Java release javaHome + Java release jdkHome " "Created: / 23-01-2013 / 12:20:48 / Jan Vrany <jan.vrany@fit.cvut.cz>" @@ -1720,7 +1720,7 @@ path := OrderedCollection new. jdkHome := self jdkHome. - jdkHome notNil ifTrue:[ + jdkHome notNil ifTrue:[ jdkHome := jdkHome asFilename. (src_jar := jdkHome / 'Contents' / 'Home' / 'src.jar') exists ifTrue:[ path add:src_jar. @@ -1737,7 +1737,7 @@ JavaRelease appleJDK6 searchForSourcePath; sourcePath JavaRelease openJDK6 jdkHome JavaRelease openJDK6 jreHome - JavaRelease appleJDK6 jdkHome + JavaRelease appleJDK6 jdkHome JavaRelease appleJDK6 jreHome " @@ -1772,7 +1772,7 @@ "Return true if aVersionString (which is what 'java -version' returns) matches what I expect." - ^ aVersionString matches: 'java version "1.6.*' + ^ aVersionString matches: '*java version "1.6.*' ! ! !JavaRelease::OpenJDK7 class methodsFor:'documentation'! @@ -1974,7 +1974,7 @@ "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: '*java version "1.7.*OpenJDK Runtime Environment*' "Modified: / 03-04-2014 / 12:52:41 / Jan Vrany <jan.vrany@fit.cvut.cz>" ! ! @@ -2051,7 +2051,7 @@ "Return true if aVersionString (which is what 'java -version' returns) matches what I expect." - ^ aVersionString matches: 'java version "1.8.*OpenJDK Runtime Environment*' + ^ aVersionString matches: '*java version "1.8.*OpenJDK Runtime Environment*' "Created: / 03-04-2014 / 12:32:56 / Jan Vrany <jan.vrany@fit.cvut.cz>" ! ! @@ -2287,7 +2287,7 @@ "Return true if aVersionString (which is what 'java -version' returns) matches what I expect." - ^ aVersionString matches: 'java version "1.6.*Java(TM) SE Runtime Environment*' + ^ aVersionString matches: '*java version "1.6.*Java(TM) SE Runtime Environment*' "Modified: / 03-04-2014 / 16:49:14 / Jan Vrany <jan.vrany@fit.cvut.cz>" ! ! @@ -2530,7 +2530,7 @@ "Return true if aVersionString (which is what 'java -version' returns) matches what I expect." - ^ aVersionString matches: 'java version "1.7.*Java(TM) SE Runtime Environment*' + ^ aVersionString matches: '*java version "1.7.*Java(TM) SE Runtime Environment*' "Modified: / 03-04-2014 / 14:09:08 / Jan Vrany <jan.vrany@fit.cvut.cz>" ! ! @@ -2643,7 +2643,7 @@ "Return true if aVersionString (which is what 'java -version' returns) matches what I expect." - ^ aVersionString matches: 'java version "1.8.*Java(TM) SE Runtime Environment*' + ^ aVersionString matches: '*java version "1.8.*Java(TM) SE Runtime Environment*' "Created: / 03-04-2014 / 12:32:38 / Jan Vrany <jan.vrany@fit.cvut.cz>" "Modified: / 03-04-2014 / 14:09:23 / Jan Vrany <jan.vrany@fit.cvut.cz>"