--- a/src/JavaLibraries.st Mon Aug 20 18:15:54 2012 +0000
+++ b/src/JavaLibraries.st Mon Aug 20 18:52:10 2012 +0000
@@ -89,6 +89,16 @@
"Created: / 08-04-2011 / 16:38:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
+runMaven
+
+ (OperatingSystem
+ executeCommand:'mvn package' inDirectory: self directory asString)
+ ifFalse:
+ [self error: 'Cannot run maven to download libraries!!'. ^self].
+
+ "Created: / 20-08-2012 / 19:39:08 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
updateDirectory
"/ OperatingSystem getNetworkAddresses size < 2
@@ -107,11 +117,20 @@
addToClassPath
| dir |
- (dir := self directory) exists ifFalse: [ self update ].
- dir recursiveDirectoryContentsAsFilenames do: [
- :file |
+
+ (dir := self directory / 'libs') exists ifFalse: [ self update ].
+ dir recursiveDirectoryContentsAsFilenames do: [ :file |
file suffix = 'jar' ifTrue: [ Java addToClassPath: file pathName ]
- ]
+ ].
+
+ (dir := self directory / 'libs-src') exists ifTrue:[
+ dir recursiveDirectoryContentsAsFilenames do: [ :file |
+ file suffix = 'jar' ifTrue: [ Java addToSourcePath: file pathName ]
+ ]
+ ].
+
+
+
"
JavaLibraries addToClassPath.
@@ -119,6 +138,7 @@
"Created: / 02-09-2011 / 09:24:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Modified: / 03-11-2011 / 12:51:00 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
+ "Modified: / 20-08-2012 / 19:30:50 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
addToClassPath: jarname
@@ -153,10 +173,15 @@
dir := self directory.
dir exists
ifTrue: [self updateDirectory]
- ifFalse:[self checkoutDirectory]
+ ifFalse:[self checkoutDirectory].
+ self runMaven.
"
- JavaLibraries update
+ JavaLibraries flush
+ JavaLibraries update.
+
+ UserPreferences current fileBrowserClass openOn: self directory
+
"
"Created: / 08-04-2011 / 16:29:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"