--- a/src/JavaAntProjectResource.st Fri Sep 02 08:20:58 2011 +0000
+++ b/src/JavaAntProjectResource.st Fri Sep 02 08:50:18 2011 +0000
@@ -130,6 +130,13 @@
^ Array with: (self antProjectDir / 'bin')
"Created: / 18-07-2011 / 15:02:28 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+properties
+
+ ^#()
+
+ "Created: / 02-09-2011 / 09:27:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!JavaAntProjectResource class methodsFor:'accessing - ant project'!
@@ -143,10 +150,14 @@
!JavaAntProjectResource class methodsFor:'running'!
build
+
"
- JavaTestsResource build: true.
- JavaTestsResource build: false.
+ JavaTestsResource built: true.
+ JavaTestsResource built: false.
+ JavaTestsResource build.
"
+
+ | properties cmd |
built == true
ifFalse:
@@ -156,11 +167,20 @@
self assert:self antBuildDotXml exists
description:'No build.xml in ' , self antProjectDir asString.
"Launch ant"
+ properties := String streamContents:[:s|
+ self properties pairsDo:[:name :value|
+ s nextPutAll:' "-D'; nextPutAll: name; nextPut: $=; nextPutAll: value; nextPut: $".
+ ].
+ ].
+
+ cmd := 'ant -f build.xml' , properties.
+
Transcript
show:'Running ant in ';
- showCR:self antProjectDir asString.
+ showCR:self antProjectDir asString;
+ showCR: cmd.
OperatingSystem
- executeCommand:'ant -f build.xml'
+ executeCommand:cmd
inputFrom:nil
outputTo:Stdout
errorTo:Stderr
@@ -174,9 +194,8 @@
built := true. ].
^ built.
- "Modified: / 16-03-2011 / 15:20:22 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Modified: / 04-06-2011 / 18:03:00 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
- "Modified (format): / 18-07-2011 / 15:05:55 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified (comment): / 02-09-2011 / 09:32:07 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!JavaAntProjectResource methodsFor:'running'!
--- a/src/JavaLibraries.st Fri Sep 02 08:20:58 2011 +0000
+++ b/src/JavaLibraries.st Fri Sep 02 08:50:18 2011 +0000
@@ -147,6 +147,27 @@
!JavaLibraries class methodsFor:'utilities'!
+addToClassPath
+
+ | dir |
+
+ (dir := self directory) exists
+ ifFalse:[self update].
+
+ dir directoryContentsAsFilenames do:[:file|
+ file suffix = 'jar' ifTrue:[
+ Java addToClassPath: file pathName
+ ]
+ ]
+
+ "
+ JavaLibraries addToClassPath.
+ Java classPath
+ "
+
+ "Created: / 02-09-2011 / 09:24:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
addToClassPath: jarname
| dir jar |
--- a/src/JavaLibrariesResource.st Fri Sep 02 08:20:58 2011 +0000
+++ b/src/JavaLibrariesResource.st Fri Sep 02 08:50:18 2011 +0000
@@ -100,14 +100,12 @@
setUp
JavaLibraries
update;
- addToClassPath: 'junit4.jar';
- addToClassPath: 'log4j-1.2.jar';
- addToClassPath: 'asm3-all.jar';
- addToClassPath: 'hamcrest-core.jar';
+ addToClassPath;
yourself.
"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>"
! !
!JavaLibrariesResource class methodsFor:'documentation'!
--- a/src/JavaTestsResource.st Fri Sep 02 08:20:58 2011 +0000
+++ b/src/JavaTestsResource.st Fri Sep 02 08:50:18 2011 +0000
@@ -146,6 +146,22 @@
"
JavaTestsResource testsClasspathForMauve"
"Created: / 11-06-2011 / 15:59:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+properties
+
+ ^{
+ { 'dir.libs' . JavaLibraries directory pathName }
+ }
+
+ "Created: / 02-09-2011 / 09:37:08 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+resources
+
+ ^Array with: JavaLibrariesResource
+
+ "Created: / 02-09-2011 / 09:13:03 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!JavaTestsResource class methodsFor:'accessing - ant project'!