--- a/JavaRelease.st Fri Aug 16 19:52:36 2013 +0200
+++ b/JavaRelease.st Fri Sep 06 02:45:44 2013 +0200
@@ -277,7 +277,7 @@
version_HG
- ^ '§Changeset: <not expanded> §'
+ ^ '$Changeset: <not expanded> $'
! !
!JavaRelease class methodsFor:'queries'!
@@ -319,6 +319,7 @@
"Created: / 02-11-2011 / 12:19:43 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
"Modified (format): / 31-07-2012 / 10:16:25 / jv"
"Modified: / 23-01-2013 / 15:18:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified (format): / 11-04-2013 / 14:30:16 / Marcel Hlopko <marcel.hlopko@fit.cvut.cz>"
!
bootClassPath:aCollectionOfPathes
@@ -950,7 +951,7 @@
!
version_SVN
- ^ '§Id:: §'
+ ^ 'Id:: '
! !
!JavaRelease::OpenJDK6 methodsFor:'accessing'!
@@ -1133,10 +1134,13 @@
!JavaRelease::OpenJDK6 methodsFor:'validating'!
validateJavaHome2: home
- "There is nothing like OpenJDK6 for Windows"
- ^OperatingSystem isUNIXlike
+ "Bit of a hack, but..."
+ ^OperatingSystem isUNIXlike
+ and: [(home asString includesString: 'oracle') not
+ and: [(home asString includesString: 'sun') not]]
"Created: / 12-02-2013 / 02:52:19 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 11-04-2013 / 14:22:19 / Marcel Hlopko <marcel.hlopko@fit.cvut.cz>"
!
validateJavaVersionString:aVersionString
@@ -1173,7 +1177,7 @@
!
version_SVN
- ^ '§Id:: §'
+ ^ 'Id:: '
! !
!JavaRelease::OpenJDK7 methodsFor:'accessing'!
@@ -1183,6 +1187,7 @@
arch := OperatingSystem getSystemInfo at:#machine.
arch = 'x86_64' ifTrue:[arch := 'amd64'].
+ arch = 'i686' ifTrue:[arch := 'i386'].
^ {
'/usr/lib/jvm/java-7-openjdk-',arch. "/ JDK - newer linuxes
@@ -1197,7 +1202,7 @@
"
"Created: / 11-02-2012 / 17:47:02 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 21-02-2013 / 03:57:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 13-06-2013 / 09:10:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
javaHomesOnWindows
@@ -1247,12 +1252,16 @@
"Given a java.lang.String instance, returns a coresponfing
Smalltalk String"
+ Java java_lang_String instSize == 5 ifTrue:[
+ "Old implementation"
+ ^super as_ST_String:aJavaString
+ ].
^aJavaString instVarAt: 1+1"_lockWord_".
"Created: / 08-08-1997 / 12:02:55 / cg"
"Modified: / 04-01-1999 / 23:55:08 / cg"
"Modified: / 22-03-2011 / 17:21:19 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
- "Modified: / 08-02-2013 / 00:58:10 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 13-06-2013 / 09:04:38 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
as_String:aString
@@ -1261,6 +1270,10 @@
|s|
+ Java java_lang_String instSize == 5 ifTrue:[
+ "Old implementation"
+ ^super as_String:aString
+ ].
s := Java java_lang_String basicNew.
s instVarAt:1+1"_lockWord_" put: aString.
^s
@@ -1270,7 +1283,7 @@
"
"Created: / 07-08-1997 / 21:15:49 / cg"
- "Modified: / 08-02-2013 / 00:57:03 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 13-06-2013 / 09:04:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!JavaRelease::OpenJDK7 methodsFor:'validating'!
@@ -1309,7 +1322,7 @@
!
version_SVN
- ^ '§Id:: §'
+ ^ 'Id:: '
! !
!JavaRelease::OracleJDK6 methodsFor:'accessing'!
@@ -1781,7 +1794,7 @@
!
version_SVN
- ^ '§Id:: §'
+ ^ 'Id:: '
! !
!JavaRelease::SunJDK122 methodsFor:'accessing'!
@@ -1861,14 +1874,14 @@
!JavaRelease class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libjava/JavaRelease.st,v 1.10 2013-03-18 17:08:04 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libjava/JavaRelease.st,v 1.12 2013-09-06 00:41:26 vrany Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libjava/JavaRelease.st,v 1.10 2013-03-18 17:08:04 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libjava/JavaRelease.st,v 1.12 2013-09-06 00:41:26 vrany Exp $'
!
version_SVN
- ^ '§Id:: §'
+ ^ 'Id:: '
! !