Bugfix in JavaRelease::OracleJDK7>>validateJavaHome2:
Parameter is String, not a Filename so it must be converted.
--- a/JavaRelease.st Tue Dec 10 23:20:00 2013 +0000
+++ b/JavaRelease.st Thu Dec 12 15:30:33 2013 +0000
@@ -1770,22 +1770,23 @@
!JavaRelease::OracleJDK7 methodsFor:'validating'!
validateJavaHome2: home
- | homeFromRegistry f |
+ | homeFromRegistry f homeDir |
homeFromRegistry := self javaHomeOnWindowsFromRegistry.
homeFromRegistry = home ifTrue:[ ^ true ].
+ homeDir := homeDir asFilename.
"JDK..."
- (f := home / 'release') exists ifTrue:[
+ (f := homeDir / 'release') exists ifTrue:[
f readingFileDo:[:s|
s nextLine = 'JAVA_VERSION="1.7.0"' ifTrue:[ ^ true ]
].
].
"JRE..."
- (f := home / 'COPYRIGHT') exists ifTrue:[
+ (f := homeDir / 'COPYRIGHT') exists ifTrue:[
f readingFileDo:[:s|
(s nextLine includesString: 'Oracle') ifTrue:[
- ^(home / 'THIRDPARTYLICENSEREADME-JAVAFX.txt') exists
+ ^(homeDir / 'THIRDPARTYLICENSEREADME-JAVAFX.txt') exists
]
].
].
@@ -1802,7 +1803,7 @@
"
"Created: / 12-02-2013 / 02:52:43 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 16-02-2013 / 02:54:47 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 12-12-2013 / 15:29:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
validateJavaVersionString:aVersionString