Mercurial Mercurial > hg > stx-libjava / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Bugfix: OpenJDK6>>searchForSourcePath. development
authorJan Vrany <jan.vrany@fit.cvut.cz>
Wed, 09 Jan 2013 15:20:17 +0000
branchdevelopment
changeset 1925 e159b0acb161
parent 1924 894ac7aac7a7
child 1926 32f3cef32ca5
Bugfix: OpenJDK6>>searchForSourcePath. Modern linux dostros like Ubuntu 12.10 have different directory layout. Updated to search more paths.
JavaRelease.st file | annotate | diff | comparison | revisions
libjava.rc file | annotate | diff | comparison | revisions 
--- a/JavaRelease.st	Tue Jan 08 13:15:20 2013 +0000
+++ b/JavaRelease.st	Wed Jan 09 15:20:17 2013 +0000
@@ -990,6 +990,45 @@
     "Created: / 19-07-2012 / 11:04:34 / jv"
 ! !
 
+!JavaRelease::OpenJDK6 methodsFor:'searching'!
+
+searchForSourcePath
+
+    | java_homes src_zip |
+
+    super searchForSourcePath.
+
+    sourcePath := OrderedCollection new.
+    java_homes := OrderedCollection new.
+    self javaHome notNil ifTrue:[
+        java_homes add: self javaHome
+    ].
+    "OpenJDK 7 on Linux is in two directories:
+        /usr/lib/jvm/java-7-openjdk-amd64  - self javaHome
+        /usr/lib/jvm/java-7-openjdk-common
+
+    Search both...
+    "
+    OperatingSystem isUNIXlike ifTrue:[
+        '/usr/lib/jvm/java-7-openjdk-common' asFilename exists ifTrue:[
+            java_homes add: '/usr/lib/jvm/java-7-openjdk-common/jre'
+        ]
+    ].
+    
+
+    java_homes do:[ :java_home |
+        src_zip := java_home asFilename directory / 'src.zip'.
+        src_zip exists ifTrue:[sourcePath add: (JavaPathElement newFromRelease:src_zip asString)].
+    ].
+
+    "
+        JavaRelease openJDK7 searchForSourcePath; sourcePath      
+    "
+
+    "Created: / 03-09-2012 / 18:38:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 09-01-2013 / 15:16:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
 !JavaRelease::OpenJDK7 class methodsFor:'documentation'!
 
 copyright
@@ -1070,42 +1109,6 @@
     "Created: / 19-07-2012 / 11:05:02 / jv"
 ! !
 
-!JavaRelease::OpenJDK7 methodsFor:'searching'!
-
-searchForSourcePath
-
-    | java_homes src_zip |
-
-    sourcePath := OrderedCollection new.
-    java_homes := OrderedCollection new.
-    self javaHome notNil ifTrue:[
-        java_homes add: self javaHome
-    ].
-    "OpenJDK 7 on Linux is in two directories:
-        /usr/lib/jvm/java-7-openjdk-amd64  - self javaHome
-        /usr/lib/jvm/java-7-openjdk-common
-
-    Search both...
-    "
-    OperatingSystem isUNIXlike ifTrue:[
-        '/usr/lib/jvm/java-7-openjdk-common' asFilename exists ifTrue:[
-            java_homes add: '/usr/lib/jvm/java-7-openjdk-common/jre'
-        ]
-    ].
-    
-
-    java_homes do:[ :java_home |
-        src_zip := java_home asFilename directory / 'src.zip'.
-        src_zip exists ifTrue:[sourcePath add: (JavaPathElement newFromRelease:src_zip asString)].
-    ].
-
-    "
-        JavaRelease openJDK7 searchForSourcePath; sourcePath      
-    "
-
-    "Created: / 03-09-2012 / 18:38:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
 !JavaRelease::SunJDK122 class methodsFor:'documentation'!
 
 copyright
--- a/libjava.rc	Tue Jan 08 13:15:20 2013 +0000
+++ b/libjava.rc	Wed Jan 09 15:20:17 2013 +0000
@@ -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", "Fri, 21 Dec 2012 18:11:53 GMT\0"
+      VALUE "ProductDate", "Wed, 09 Jan 2013 15:18:51 GMT\0"
     END
 
   END
hg/stx-libjava