fix javaHome for oracle-7 development
authorMarcel Hlopko <marcel.hlopko@gmail.com>
Sat, 25 Jan 2014 21:35:58 +0100
branchdevelopment
changeset 3002 c1ec15d94457
parent 2985 369b56b7f766
child 3003 c9f0019485ff
fix javaHome for oracle-7
JavaRelease.st
libjava.rc
--- a/JavaRelease.st	Thu Jan 23 23:10:26 2014 +0000
+++ b/JavaRelease.st	Sat Jan 25 21:35:58 2014 +0100
@@ -1774,7 +1774,7 @@
 
     homeFromRegistry := self javaHomeOnWindowsFromRegistry.
     homeFromRegistry = home ifTrue:[ ^ true ].
-    homeDir :=  homeDir asFilename.
+    homeDir :=  home asFilename.
 
     "JDK..."
     (f := homeDir / 'release') exists ifTrue:[
@@ -1804,6 +1804,7 @@
 
     "Created: / 12-02-2013 / 02:52:43 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 12-12-2013 / 15:29:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 25-01-2014 / 21:32:54 / Marcel Hlopko <marcel.hlopko@fit.cvut.cz>"
 !
 
 validateJavaVersionString:aVersionString
--- a/libjava.rc	Thu Jan 23 23:10:26 2014 +0000
+++ b/libjava.rc	Sat Jan 25 21:35:58 2014 +0100
@@ -25,7 +25,7 @@
       VALUE "LegalCopyright", "Copyright Claus Gittinger 1988-2011\nCopyright eXept Software AG 1998-2011\nCopyright Jan Vrany, Jan Kurs and Marcel Hlopko\n          SWING Research Group, Czech Technical University In Prague\0"
       VALUE "ProductName", "Smalltalk/X\0"
       VALUE "ProductVersion", "6.2.3.0\0"
-      VALUE "ProductDate", "Mon, 20 Jan 2014 13:59:16 GMT\0"
+      VALUE "ProductDate", "Sat, 25 Jan 2014 20:34:23 GMT\0"
     END
 
   END