Test & library helper classes refactored to reflect new directory layout.
--- a/JavaLibraries.st Fri Nov 16 00:04:46 2012 +0000
+++ b/JavaLibraries.st Fri Nov 16 00:21:19 2012 +0000
@@ -56,44 +56,22 @@
!JavaLibraries class methodsFor:'accessing'!
directory
-
- | dir |
+ | base |
- dir := OperatingSystem getEnvironment: 'LIBJAVA_LIBS'.
- dir notNil and:[(dir := dir asFilename) exists ifTrue:[ ^ dir ]].
-
- ^Java cacheDirectory / 'libs'
+ base := Smalltalk getPackageDirectoryForPackage: 'stx:libjava/libs'.
+ base isNil ifTrue:[ ^ nil ].
+ ^base asFilename / 'java' / 'libs'
"
JavaLibraries directory
"
"Created: / 08-04-2011 / 16:27:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-url
-
- ^(Smalltalk at:#stx_libjava) svnRepositoryUrlBase , '/libs'
-
- "Created: / 08-04-2011 / 16:32:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 16-11-2012 / 00:11:47 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!JavaLibraries class methodsFor:'private'!
-checkoutDirectory
-
-"/ OperatingSystem getNetworkAddresses size < 2
-"/ ifTrue:
-"/ [self error: 'No network connection!!'. ^self].
-
- (OperatingSystem
- executeCommand:('svn co "%1" "%2"' bindWith: self url with: self directory asString))
- ifFalse:
- [self error: 'Cannot checkout libraries!!'. ^self].
-
- "Created: / 08-04-2011 / 16:38:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
runMaven
MavenRun ~~ true ifTrue:[
@@ -103,20 +81,6 @@
].
"Created: / 20-08-2012 / 19:39:08 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-updateDirectory
-
-"/ OperatingSystem getNetworkAddresses size < 2
-"/ ifTrue:
-"/ [^self].
-
- (OperatingSystem
- executeCommand:('svn update "%1" "%2"' bindWith: self url with: self directory asString))
-"/ ifFalse:
-"/ [self error: 'Cannot update libraries!!' mayProceed: true. ^self].
-
- "Created: / 08-04-2011 / 16:38:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!JavaLibraries class methodsFor:'utilities'!
@@ -176,13 +140,10 @@
!
update
-
- | dir |
- dir := self directory.
- dir exists
- ifTrue: [self updateDirectory]
- ifFalse:[self checkoutDirectory].
- self runMaven.
+ (Smalltalk at:#stx_libjava_libs) isNil ifTrue:[
+ Smalltalk loadPackage:#'stx:libjava/libs'
+ ].
+ self runMaven.
"
JavaLibraries flush
@@ -193,6 +154,7 @@
"
"Created: / 08-04-2011 / 16:29:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 16-11-2012 / 00:16:24 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!JavaLibraries class methodsFor:'documentation'!
@@ -200,4 +162,3 @@
version_SVN
^ '$Id$'
! !
-
--- a/JavaLibrariesResource.st Fri Nov 16 00:04:46 2012 +0000
+++ b/JavaLibrariesResource.st Fri Nov 16 00:21:19 2012 +0000
@@ -56,14 +56,12 @@
!JavaLibrariesResource methodsFor:'running'!
setUp
- JavaLibraries
- update;
- addToClassPath;
- yourself.
+ JavaLibraries update.
+ JavaLibraries addToClassPath.
"Created: / 08-04-2011 / 17:02:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Modified: / 04-06-2011 / 20:36:07 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
- "Modified: / 02-09-2011 / 09:24:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 16-11-2012 / 00:18:07 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!JavaLibrariesResource class methodsFor:'documentation'!
--- a/JavaTestsResource.st Fri Nov 16 00:04:46 2012 +0000
+++ b/JavaTestsResource.st Fri Nov 16 00:21:19 2012 +0000
@@ -139,11 +139,18 @@
!JavaTestsResource class methodsFor:'accessing - ant project'!
antProjectDir
+ | base |
- ^ UserPreferences current javaTestsDirectory asFilename
+ base := (Smalltalk getPackageDirectoryForPackage: #'stx:libjava').
+ base isNil ifTrue:[ ^ nil ].
+ ^ base / 'tests'
- "Modified: / 07-05-2011 / 17:57:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "
+ JavaTestsResource antProjectDir
+ "
+
"Created: / 18-07-2011 / 18:15:15 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified (comment): / 16-11-2012 / 00:21:23 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!JavaTestsResource class methodsFor:'documentation'!
--- a/JavaVM.st Fri Nov 16 00:04:46 2012 +0000
+++ b/JavaVM.st Fri Nov 16 00:21:19 2012 +0000
@@ -1907,12 +1907,6 @@
"/props at:'jws.home' put:(self defaultJWSHome).
"/ new with jws 2.0 ...
"/props at:'jws.startcmd' put:'jws.showwin.mainide'.
-
- props at: 'stx.libjava.tomcat.dir'
- put: (JavaLibraries directory / 'tomcat6') pathName.
- props at: 'libjava.tests.dir'
- put: (JavaTestsResource antProjectDir) pathName.
-
"/ props at: 'sun.misc.URLClassPath.debug' put: 'true'.
^ props
@@ -1923,9 +1917,9 @@
"Created: / 03-01-1998 / 14:26:39 / cg"
"Modified: / 27-01-2000 / 02:20:18 / cg"
"Modified (format): / 03-11-2011 / 12:40:56 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
- "Modified: / 12-12-2011 / 15:23:22 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Modified: / 21-12-2011 / 23:05:11 / jv"
"Modified: / 13-09-2012 / 20:33:56 / m"
+ "Modified: / 16-11-2012 / 00:17:28 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
initializeVM
--- a/libjava.rc Fri Nov 16 00:04:46 2012 +0000
+++ b/libjava.rc Fri Nov 16 00:21:19 2012 +0000
@@ -3,7 +3,7 @@
// automagically generated from the projectDefinition: stx_libjava.
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 6,2,2196,2196
+ FILEVERSION 6,2,2201,2201
PRODUCTVERSION 6,2,3,1
#if (__BORLANDC__)
FILEFLAGSMASK VS_FF_DEBUG | VS_FF_PRERELEASE
@@ -18,14 +18,14 @@
BEGIN
BLOCK "040904E4"
BEGIN
- VALUE "CompanyName", "eXept Software AG\0"
- VALUE "FileDescription", "Smalltalk/X Class library (LIB)\0"
- VALUE "FileVersion", "6.2.2196.2196\0"
+ VALUE "CompanyName", "eXept Software AG & SWING Research Group\0"
+ VALUE "FileDescription", "Java support for Smalltalk/X (LIB)\0"
+ VALUE "FileVersion", "6.2.2201.2201\0"
VALUE "InternalName", "stx:libjava\0"
- VALUE "LegalCopyright", "Copyright Claus Gittinger 1988-2011\nCopyright eXept Software AG 1998-2011\nCopyright Jan Vrany, Jan Kurs and Marcel Hlopko\b SWING Research Group, Czech Technical University In Prague\0"
+ 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.1\0"
- VALUE "ProductDate", "Thu, 15 Nov 2012 23:47:42 GMT\0"
+ VALUE "ProductDate", "Fri, 16 Nov 2012 00:22:39 GMT\0"
END
END