Java settings cleanup (part 1): minor tweaks and fixes
* show only releases relevant for current operating system (including those, that are
not installed / found)
* couple fixes in user code bundle editor
--- a/JavaRelease.st Sun Dec 07 22:55:46 2014 +0000
+++ b/JavaRelease.st Mon Dec 08 10:26:50 2014 +0000
@@ -291,6 +291,22 @@
"Created: / 27-07-2012 / 00:10:22 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
+allForCurrentOperatingSystem
+ "Return all releases for current operating system, even those that
+ are not installed / autodetected.
+
+ For example, there's no AppleJDK for Linux or OpenJDK for Windows.
+ "
+
+ ^ self all select:[:each | each isAvailableOnCurrentOperatingSystem ]
+
+ "
+ JavaRelease allForCurrentOperatingSystem
+ "
+
+ "Created: / 07-12-2014 / 23:45:08 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
any
<resource: #obsolete>
| releases |
@@ -312,7 +328,7 @@
available
| releases out path |
- releases := self all select: [:rel | rel isAvailable ].
+ releases := self allForCurrentOperatingSystem select: [:rel | rel isAvailable ].
releases isEmpty ifTrue: [
"/ none of the releases seems to be installed in a way that it is found
"/ out of the box. Try a 'java' command...
@@ -338,6 +354,7 @@
"
"Created: / 26-07-2012 / 23:41:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 08-12-2014 / 00:03:23 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
default
@@ -421,16 +438,21 @@
].
javaExecutable := javaExecutable asAbsoluteFilename.
].
- System := self forExecutable: javaExecutable
+ System := self forExecutable: javaExecutable.
+ "/ Use the autodetected release if that's the system one...
+ System javaHome = System class instance javaHome ifTrue:[
+ System := System class instance
+ ].
].
^ System
"
JavaRelease system
+ JavaRelease system == JavaRelease system class instance
"
"Created: / 11-11-2013 / 14:18:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 27-10-2014 / 22:11:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified (comment): / 08-12-2014 / 00:14:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!JavaRelease class methodsFor:'instance creation-private'!
@@ -682,7 +704,7 @@
dir := javaExecutableFilename directory.
dir baseName ~= 'bin' ifTrue:[ ^ nil ].
dir := dir directory.
- ^ dir baseName = 'jre' ifTrue:[ dir directory ] ifFalse:[ dir ]
+ ^ dir baseName = 'jre' ifTrue:[ dir directory pathName ] ifFalse:[ dir pathName]
"
JavaRelease basicNew javaHomeForJavaExecutable: (OperatingSystem pathOfCommand:'java')
@@ -692,6 +714,7 @@
"
"Created: / 08-04-2014 / 14:21:33 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 08-12-2014 / 00:16:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
javaHomeOrNil
@@ -941,22 +964,31 @@
!JavaRelease methodsFor:'displaying'!
displayString
- | displayString |
-
- displayString := '%1 (%2%3) ' bindWith: self name
- with: (self jdkHome notNil ifTrue:[ 'JDK' ] ifFalse:[ 'JRE' ])
- with: (self isSystem ifTrue:[ ', system' ] ifFalse:[ '' ]).
- self isAvailable ifTrue: [
- displayString := displayString , (('- ', self javaHome asFilename pathName) asText colorizeAllWith: Color gray).
+ | displayString available |
+
+ available := self isAvailable.
+
+ available ifTrue:[
+ displayString := '%1 (%2%3) ' bindWith: self name
+ with: (self jdkHome notNil ifTrue:[ 'JDK' ] ifFalse:[ 'JRE' ])
+ with: (self isSystem ifTrue:[ ', system' ] ifFalse:[ '' ]).
+ self isSystem ifTrue:[
+ displayString := displayString asText allUnderlined.
+ ].
+ ] ifFalse:[
+ displayString := self name.
+ ].
+ available ifTrue: [
+ displayString := displayString , ((' - ', self javaHome asFilename pathName) asText colorizeAllWith: Color gray).
] ifFalse: [
- displayString := displayString , ('(not available)' asText colorizeAllWith: Color gray).
+ displayString := displayString , ((self class classResources string: ' - not found') asText colorizeAllWith: Color gray).
].
^ displayString
"Created: / 27-07-2012 / 00:01:44 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 15-04-2014 / 18:47:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Modified: / 07-12-2014 / 13:31:42 / Jakub Nesveda <nesvejak@fit.cvut.cz>"
+ "Modified: / 08-12-2014 / 09:17:47 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!JavaRelease methodsFor:'object conversions'!
@@ -1076,6 +1108,16 @@
"Modified (comment): / 12-02-2013 / 03:18:28 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
+isAvailableOnCurrentOperatingSystem
+ "Return if at all available for current operating system.
+ For example, there's no AppleJDK for Linux or OpenJDK for Windows.
+ "
+
+ ^self subclassResponsibility
+
+ "Created: / 07-12-2014 / 23:55:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
isCustom
^false
@@ -1165,13 +1207,10 @@
!
isSystem
- | system |
-
- system := self class system.
- ^ system notNil
- and:[self javaHome = system javaHome].
+ ^ self == self class system
"Created: / 15-04-2014 / 18:32:07 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 08-12-2014 / 00:21:43 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!JavaRelease methodsFor:'validating'!
@@ -1436,6 +1475,18 @@
"Modified: / 08-02-2013 / 00:58:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
+!JavaRelease::OpenJDK6 methodsFor:'queries'!
+
+isAvailableOnCurrentOperatingSystem
+ "Return if at all available for current operating system.
+ For example, there's no AppleJDK for Linux or OpenJDK for Windows."
+
+ "/ Q: Is OpenJDK available on OS/X?
+ ^ OperatingSystem isUNIXlike and:[ OperatingSystem isOSXlike not ]
+
+ "Created: / 07-12-2014 / 23:56:44 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
!JavaRelease::OpenJDK6 methodsFor:'searching'!
searchForSourcePath
@@ -1657,6 +1708,17 @@
^#osxJDK6
! !
+!JavaRelease::AppleJDK6 methodsFor:'queries'!
+
+isAvailableOnCurrentOperatingSystem
+ "Return if at all available for current operating system.
+ For example, there's no AppleJDK for Linux or OpenJDK for Windows."
+
+ ^ OperatingSystem isOSXlike
+
+ "Created: / 07-12-2014 / 23:57:02 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
!JavaRelease::AppleJDK6 methodsFor:'searching'!
javaExecutableForJavaHome: javaHomeArg
@@ -1712,7 +1774,7 @@
(jdk construct:'Classes') exists ifFalse:[^ nil].
(jdk construct:'Classes/classes.jar') exists ifFalse:[^ nil].
- ^ jdk
+ ^ jdk pathName
"
JavaRelease basicNew javaHomeForJavaExecutable: (OperatingSystem pathOfCommand:'java')
@@ -1722,6 +1784,7 @@
"
"Created: / 08-04-2014 / 14:21:33 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 08-12-2014 / 00:17:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
searchForSourcePath
@@ -2233,6 +2296,18 @@
"Created: / 21-02-2013 / 03:19:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
+!JavaRelease::OracleJDK6 methodsFor:'queries'!
+
+isAvailableOnCurrentOperatingSystem
+ "Return if at all available for current operating system.
+ For example, there's no AppleJDK for Linux or OpenJDK for Windows."
+
+ "/ Q: Is OpenJDK available on OS/X?
+ ^ true
+
+ "Created: / 07-12-2014 / 23:57:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
!JavaRelease::OracleJDK6 methodsFor:'searching'!
searchForJavaHome
@@ -2476,6 +2551,17 @@
"Modified: / 03-04-2014 / 12:31:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
+!JavaRelease::OracleJDK7 methodsFor:'queries'!
+
+isAvailableOnCurrentOperatingSystem
+ "Return if at all available for current operating system.
+ For example, there's no AppleJDK for Linux or OpenJDK for Windows."
+
+ ^ true
+
+ "Created: / 07-12-2014 / 23:57:23 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
!JavaRelease::OracleJDK7 methodsFor:'searching'!
searchForJavaHome
@@ -2752,6 +2838,16 @@
^false
"Created: / 27-07-2012 / 00:04:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+isAvailableOnCurrentOperatingSystem
+ "Return if at all available for current operating system.
+ For example, there's no AppleJDK for Linux or OpenJDK for Windows.
+ "
+
+ ^ false "/ Not supported any longer
+
+ "Created: / 07-12-2014 / 23:57:53 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!JavaRelease::SunJDK122 methodsFor:'validating'!
--- a/Make.proto Sun Dec 07 22:55:46 2014 +0000
+++ b/Make.proto Mon Dec 08 10:26:50 2014 +0000
@@ -205,7 +205,6 @@
$(OUTDIR)JavaNioSupport.$(O) JavaNioSupport.$(H): JavaNioSupport.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)JavaObject.$(O) JavaObject.$(H): JavaObject.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)JavaObjectDictionary.$(O) JavaObjectDictionary.$(H): JavaObjectDictionary.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)JavaPackage.$(O) JavaPackage.$(H): JavaPackage.st $(INCLUDE_TOP)/stx/libbasic/NameSpace.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)JavaPopUpView.$(O) JavaPopUpView.$(H): JavaPopUpView.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview/DisplaySurface.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsMedium.$(H) $(INCLUDE_TOP)/stx/libview/PopUpView.$(H) $(INCLUDE_TOP)/stx/libview/SimpleView.$(H) $(INCLUDE_TOP)/stx/libview/TopView.$(H) $(INCLUDE_TOP)/stx/libview/View.$(H) $(STCHDR)
$(OUTDIR)JavaProcess.$(O) JavaProcess.$(H): JavaProcess.st $(INCLUDE_TOP)/stx/libbasic/Link.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/Process.$(H) $(STCHDR)
$(OUTDIR)JavaRef2.$(O) JavaRef2.$(H): JavaRef2.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
--- a/Make.spec Sun Dec 07 22:55:46 2014 +0000
+++ b/Make.spec Mon Dec 08 10:26:50 2014 +0000
@@ -42,6 +42,7 @@
# -warnNonStandard : no warnings about ST/X extensions
# -warnEOLComments : no warnings about EOL comment extension
# -warnPrivacy : no warnings about privateClass extension
+# -warnUnused : no warnings about unused variables
#
# ********** OPTIONAL: MODIFY the next line(s) ***
# STCWARNINGS=-warn
--- a/abbrev.stc Sun Dec 07 22:55:46 2014 +0000
+++ b/abbrev.stc Mon Dec 08 10:26:50 2014 +0000
@@ -3,6 +3,7 @@
# it provides information about a classes filename, category and especially namespace.
GroovyCompiler GroovyCompiler stx:libjava 'Languages-Groovy-Compiler' 0
GroovyEvaluator GroovyEvaluator stx:libjava 'Languages-Groovy-Compiler' 0
+GroovyEvaluatorTests GroovyEvaluatorTests stx:libjava 'Languages-Groovy-Tests' 1
GroovyLanguage GroovyLanguage stx:libjava 'Languages-Groovy-Support' 1
GroovySourceFileWriter GroovySourceFileWriter stx:libjava 'Languages-Groovy-Support' 0
JavaAnnotation JavaAnnotation stx:libjava 'Languages-Java-Reader-Support' 0
@@ -15,8 +16,10 @@
JavaBooleanArray JavaBooleanArray stx:libjava 'Languages-Java-Support' 0
JavaByte JavaByte stx:libjava 'Languages-Java-Support' 0
JavaByteCodeProcessor JavaByteCodeProcessor stx:libjava 'Languages-Java-Bytecode' 0
+JavaByteCodeProcessorTests JavaByteCodeProcessorTests stx:libjava 'Languages-Java-Tests' 1
JavaClassAccessor JavaClassAccessor stx:libjava 'Languages-Java-Classes' 0
JavaClassEnvironment JavaClassEnvironment stx:libjava 'Languages-Java-Support' 0
+JavaClassLoadingTests JavaClassLoadingTests stx:libjava 'Languages-Java-Tests-ClassLoading' 1
JavaClassQuery JavaClassQuery stx:libjava 'Languages-Java-Classes' 1
JavaClassReloader JavaClassReloader stx:libjava 'Languages-Java-Support' 0
JavaCodeLibraryOrBundle JavaCodeLibraryOrBundle stx:libjava 'Languages-Java-Support-Libraries' 0
@@ -29,34 +32,46 @@
JavaDescriptor JavaDescriptor stx:libjava 'Languages-Java-Support' 0
JavaError JavaError stx:libjava 'Languages-Java-Support' 1
JavaExceptionTable JavaExceptionTable stx:libjava 'Languages-Java-Support' 0
+JavaExceptionTests JavaExceptionTests stx:libjava 'Languages-Java-Tests' 1
JavaField JavaField stx:libjava 'Languages-Java-Reader-Support' 0
JavaFinalizationRegistry JavaFinalizationRegistry stx:libjava 'Languages-Java-Support' 0
+JavaFreshlyInitializedResource JavaFreshlyInitializedResource stx:libjava 'Languages-Java-Tests' 1
JavaInnerClasses JavaInnerClasses stx:libjava 'Languages-Java-Support' 0
+JavaJUnitTests JavaJUnitTests stx:libjava 'Languages-Java-Tests-Libraries' 1
JavaLanguage JavaLanguage stx:libjava 'Languages-Java-Support' 1
JavaLibraries JavaLibraries stx:libjava 'Languages-Java-Support' 0
+JavaLibrariesResource JavaLibrariesResource stx:libjava 'Languages-Java-Tests' 1
JavaLocalVariableTable JavaLocalVariableTable stx:libjava 'Languages-Java-Support' 0
JavaLocalVariableTableEntry JavaLocalVariableTableEntry stx:libjava 'Languages-Java-Support' 0
JavaLookup JavaLookup stx:libjava 'Languages-Java-Interop' 0
+JavaLookupResolutionAlgorithmTests JavaLookupResolutionAlgorithmTests stx:libjava 'Languages-Java-Tests-Interop' 1
+JavaLookupTests JavaLookupTests stx:libjava 'Languages-Java-Tests-Interop' 1
JavaMetaclass JavaMetaclass stx:libjava 'Languages-Java-Classes' 0
JavaMonitor JavaMonitor stx:libjava 'Languages-Java-Support' 0
+JavaMonitorsTests JavaMonitorsTests stx:libjava 'Languages-Java-Tests' 1
JavaNameAndType2 JavaNameAndType2 stx:libjava 'Languages-Java-Reader-Support-new' 0
JavaNativeMemory JavaNativeMemory stx:libjava 'Languages-Java-Support' 0
+JavaNativeMemoryTests JavaNativeMemoryTests stx:libjava 'Languages-Java-Tests' 1
JavaNioSupport JavaNioSupport stx:libjava 'Languages-Java-Support-Native' 0
JavaObject JavaObject stx:libjava 'Languages-Java-Classes' 0
JavaObjectDictionary JavaObjectDictionary stx:libjava 'Languages-Java-Support' 0
-JavaPackage JavaPackage stx:libjava 'Languages-Java-Support' 0
JavaPopUpView JavaPopUpView stx:libjava 'Languages-Java-Views-Support' 2
JavaProcess JavaProcess stx:libjava 'Languages-Java-Classes' 0
JavaRef2 JavaRef2 stx:libjava 'Languages-Java-Reader-Support-new' 0
+JavaRefsAndConstantPoolTestCase JavaRefsAndConstantPoolTestCase stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 1
JavaRelease JavaRelease stx:libjava 'Languages-Java-Support' 1
+JavaReleaseTests JavaReleaseTests stx:libjava 'Languages-Java-Tests' 1
JavaResolver JavaResolver stx:libjava 'Languages-Java-Reader-Support-new' 0
JavaShort JavaShort stx:libjava 'Languages-Java-Support' 0
JavaSlotIndexCache JavaSlotIndexCache stx:libjava 'Languages-Java-Support' 0
JavaSocket JavaSocket stx:libjava 'Languages-Java-Support' 0
JavaSourceCodeCache JavaSourceCodeCache stx:libjava 'Languages-Java-Support' 1
JavaSourceFileWriter JavaSourceFileWriter stx:libjava 'Languages-Java-Support' 0
+JavaTestCaseProxy JavaTestCaseProxy stx:libjava 'Languages-Java-Tests-Proxies' 3
JavaTestsLoader JavaTestsLoader stx:libjava 'Languages-Java-Tests' 0
+JavaThreadingTests JavaThreadingTests stx:libjava 'Languages-Java-Tests' 1
JavaTopView JavaTopView stx:libjava 'Languages-Java-Views-Support' 2
+JavaUTF8Tests JavaUTF8Tests stx:libjava 'Languages-Java-Tests' 1
JavaUnresolvedCompilationError JavaUnresolvedCompilationError stx:libjava 'Languages-Java-Support' 1
JavaUnresolvedConstant JavaUnresolvedConstant stx:libjava 'Languages-Java-Reader-Support' 0
JavaUtilities JavaUtilities stx:libjava 'Languages-Java-Utilities' 0
@@ -72,6 +87,7 @@
SmalltalkAppletStub SmalltalkAppletStub stx:libjava 'Languages-Java-Views-Support' 0
stx_libjava stx_libjava stx:libjava '* Projects & Packages *' 3
GroovyMetaclass GroovyMetaclass stx:libjava 'Languages-Groovy-Classes' 0
+JUnitTestCaseProxy JUnitTestCaseProxy stx:libjava 'Languages-Java-Tests-Proxies' 3
Java Java stx:libjava 'Languages-Java-Support' 0
JavaAnnotationArrayValue JavaAnnotationArrayValue stx:libjava 'Languages-Java-Reader-Support' 0
JavaAnnotationClassValue JavaAnnotationClassValue stx:libjava 'Languages-Java-Reader-Support' 0
@@ -80,12 +96,15 @@
JavaAnnotationPrimitiveValue JavaAnnotationPrimitiveValue stx:libjava 'Languages-Java-Reader-Support' 0
JavaBehavior JavaBehavior stx:libjava 'Languages-Java-Classes' 0
JavaByteCodeDisassembler JavaByteCodeDisassembler stx:libjava 'Languages-Java-Bytecode' 0
+JavaByteCodeDisassemblerTests JavaByteCodeDisassemblerTests stx:libjava 'Languages-Java-Tests' 1
JavaByteCodeEnumerator JavaByteCodeEnumerator stx:libjava 'Languages-Java-Support-Decompiling' 0
JavaByteCodeProcessorAdapter JavaByteCodeProcessorAdapter stx:libjava 'Languages-Java-Bytecode' 0
JavaClassAnnotationContainer JavaClassAnnotationContainer stx:libjava 'Languages-Java-Annotations' 1
JavaClassMemberRef2 JavaClassMemberRef2 stx:libjava 'Languages-Java-Reader-Support-new' 0
JavaClassReader JavaClassReader stx:libjava 'Languages-Java-Support' 0
+JavaClassReaderTests JavaClassReaderTests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 1
JavaClassRef2 JavaClassRef2 stx:libjava 'Languages-Java-Reader-Support-new' 0
+JavaClassRefTests JavaClassRefTests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 1
JavaClassRegistry JavaClassRegistry stx:libjava 'Languages-Java-Support' 0
JavaCodeBundle JavaCodeBundle stx:libjava 'Languages-Java-Support-Libraries' 0
JavaCodeLibrary JavaCodeLibrary stx:libjava 'Languages-Java-Support-Libraries' 0
@@ -93,17 +112,23 @@
JavaFieldAnnotationContainer JavaFieldAnnotationContainer stx:libjava 'Languages-Java-Annotations' 1
JavaFieldDescriptor JavaFieldDescriptor stx:libjava 'Languages-Java-Support' 0
JavaFieldDescriptorWithUnionType JavaFieldDescriptorWithUnionType stx:libjava 'Languages-Java-Support' 0
+JavaFieldRefTests JavaFieldRefTests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 1
JavaInitializedResource JavaInitializedResource stx:libjava 'Languages-Java-Tests' 2
+JavaInterfaceMethodRefTests JavaInterfaceMethodRefTests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 1
JavaInvalidRefError JavaInvalidRefError stx:libjava 'Languages-Java-Support' 1
JavaInvokeDynamic2 JavaInvokeDynamic2 stx:libjava 'Languages-Java-Reader-Support-new' 0
JavaMethod JavaMethod stx:libjava 'Languages-Java-Classes' 0
JavaMethodAnnotationContainer JavaMethodAnnotationContainer stx:libjava 'Languages-Java-Annotations' 1
JavaMethodDescriptor JavaMethodDescriptor stx:libjava 'Languages-Java-Support' 0
JavaMethodHandle2 JavaMethodHandle2 stx:libjava 'Languages-Java-Reader-Support-new' 0
+JavaMethodRefTests JavaMethodRefTests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 1
JavaMethodType2 JavaMethodType2 stx:libjava 'Languages-Java-Reader-Support-new' 0
JavaMirror JavaMirror stx:libjava 'Languages-Java-Classes' 0
JavaNativeMethodImpl_OpenJDK6 JavaNativeMethodImpl_OpenJDK6 stx:libjava 'Languages-Java-Support-Java 6' 0
+JavaRefMock JavaRefMock stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 0
+JavaRuntimeConstantPoolTests JavaRuntimeConstantPoolTests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 1
JavaStringRef2 JavaStringRef2 stx:libjava 'Languages-Java-Reader-Support-new' 0
+JavaTestsResource JavaTestsResource stx:libjava 'Languages-Java-Tests' 2
JavaUnhandledExceptionError JavaUnhandledExceptionError stx:libjava 'Languages-Java-Support' 1
JavaUnhandledThreadDeathError JavaUnhandledThreadDeathError stx:libjava 'Languages-Java-Support' 1
JavaUnresolvedClassConstant JavaUnresolvedClassConstant stx:libjava 'Languages-Java-Reader-Support' 0
@@ -113,6 +138,7 @@
ProxyMethodGuardNode ProxyMethodGuardNode stx:libjava 'System-Compiler-Interop' 0
ProxyMethodInvocationNode ProxyMethodInvocationNode stx:libjava 'System-Compiler-Interop' 0
ProxyMethodJavaFieldAccessor ProxyMethodJavaFieldAccessor stx:libjava 'Languages-Java-Interop' 0
+TestletTestCaseProxy TestletTestCaseProxy stx:libjava 'Languages-Java-Tests-Proxies' 3
JavaAlienMirror JavaAlienMirror stx:libjava 'Languages-Java-Classes' 0
JavaArrayMirror JavaArrayMirror stx:libjava 'Languages-Java-Classes' 0
JavaByteCodePreresolver JavaByteCodePreresolver stx:libjava 'Languages-Java-Bytecode' 0
@@ -142,30 +168,3 @@
ProxyMethodJavaTypeCheckNode ProxyMethodJavaTypeCheckNode stx:libjava 'Languages-Java-Interop' 0
JavaNativeMethod JavaNativeMethod stx:libjava 'Languages-Java-Classes' 0
JavaNativeMethodImpl_OracleJDK8 JavaNativeMethodImpl_OracleJDK8 stx:libjava 'Languages-Java-Support-Java 8' 0
-GroovyEvaluatorTests GroovyEvaluatorTests stx:libjava 'Languages-Groovy-Tests' 1
-JUnitTestCaseProxy JUnitTestCaseProxy stx:libjava 'Languages-Java-Tests-Proxies' 3
-JavaByteCodeDisassemblerTests JavaByteCodeDisassemblerTests stx:libjava 'Languages-Java-Tests' 1
-JavaByteCodeProcessorTests JavaByteCodeProcessorTests stx:libjava 'Languages-Java-Tests' 1
-JavaClassLoadingTests JavaClassLoadingTests stx:libjava 'Languages-Java-Tests-ClassLoading' 1
-JavaClassReaderTests JavaClassReaderTests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 1
-JavaClassRefTests JavaClassRefTests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 1
-JavaExceptionTests JavaExceptionTests stx:libjava 'Languages-Java-Tests' 1
-JavaFieldRefTests JavaFieldRefTests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 1
-JavaFreshlyInitializedResource JavaFreshlyInitializedResource stx:libjava 'Languages-Java-Tests' 1
-JavaInterfaceMethodRefTests JavaInterfaceMethodRefTests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 1
-JavaJUnitTests JavaJUnitTests stx:libjava 'Languages-Java-Tests-Libraries' 1
-JavaLibrariesResource JavaLibrariesResource stx:libjava 'Languages-Java-Tests' 1
-JavaLookupResolutionAlgorithmTests JavaLookupResolutionAlgorithmTests stx:libjava 'Languages-Java-Tests-Interop' 1
-JavaLookupTests JavaLookupTests stx:libjava 'Languages-Java-Tests-Interop' 1
-JavaMethodRefTests JavaMethodRefTests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 1
-JavaMonitorsTests JavaMonitorsTests stx:libjava 'Languages-Java-Tests' 1
-JavaNativeMemoryTests JavaNativeMemoryTests stx:libjava 'Languages-Java-Tests' 1
-JavaRefMock JavaRefMock stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 0
-JavaRefsAndConstantPoolTestCase JavaRefsAndConstantPoolTestCase stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 1
-JavaReleaseTests JavaReleaseTests stx:libjava 'Languages-Java-Tests' 1
-JavaRuntimeConstantPoolTests JavaRuntimeConstantPoolTests stx:libjava 'Languages-Java-Tests-RuntimeConstantPool' 1
-JavaTestCaseProxy JavaTestCaseProxy stx:libjava 'Languages-Java-Tests-Proxies' 3
-JavaTestsResource JavaTestsResource stx:libjava 'Languages-Java-Tests' 2
-JavaThreadingTests JavaThreadingTests stx:libjava 'Languages-Java-Tests' 1
-JavaUTF8Tests JavaUTF8Tests stx:libjava 'Languages-Java-Tests' 1
-TestletTestCaseProxy TestletTestCaseProxy stx:libjava 'Languages-Java-Tests-Proxies' 3
--- a/bc.mak Sun Dec 07 22:55:46 2014 +0000
+++ b/bc.mak Mon Dec 08 10:26:50 2014 +0000
@@ -30,6 +30,7 @@
!INCLUDE Make.spec
LIBNAME=libstx_libjava
+MODULE_PATH=libjava
RESFILES=libjava.$(RES)
@@ -138,7 +139,6 @@
$(OUTDIR)JavaNioSupport.$(O) JavaNioSupport.$(H): JavaNioSupport.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)JavaObject.$(O) JavaObject.$(H): JavaObject.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)JavaObjectDictionary.$(O) JavaObjectDictionary.$(H): JavaObjectDictionary.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)JavaPackage.$(O) JavaPackage.$(H): JavaPackage.st $(INCLUDE_TOP)\stx\libbasic\NameSpace.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)JavaPopUpView.$(O) JavaPopUpView.$(H): JavaPopUpView.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsMedium.$(H) $(INCLUDE_TOP)\stx\libview\PopUpView.$(H) $(INCLUDE_TOP)\stx\libview\SimpleView.$(H) $(INCLUDE_TOP)\stx\libview\TopView.$(H) $(INCLUDE_TOP)\stx\libview\View.$(H) $(STCHDR)
$(OUTDIR)JavaProcess.$(O) JavaProcess.$(H): JavaProcess.st $(INCLUDE_TOP)\stx\libbasic\Link.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\Process.$(H) $(STCHDR)
$(OUTDIR)JavaRef2.$(O) JavaRef2.$(H): JavaRef2.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
--- a/bmake.bat Sun Dec 07 22:55:46 2014 +0000
+++ b/bmake.bat Mon Dec 08 10:26:50 2014 +0000
@@ -9,6 +9,8 @@
@IF "%HGROOT%" NEQ "" SET DEFINES=%DEFINES% "-DHGROOT=%HGROOT%"
make.exe -N -f bc.mak %DEFINES% %*
+@IF "%1" EQU "exe" GOTO finish
+
@echo "***********************************"
@echo "Buildung stx/libjava/experiments
@echo "***********************************"
@@ -24,3 +26,5 @@
@cd ..
+
+:finish
--- a/experiments/Make.spec Sun Dec 07 22:55:46 2014 +0000
+++ b/experiments/Make.spec Mon Dec 08 10:26:50 2014 +0000
@@ -42,6 +42,7 @@
# -warnNonStandard : no warnings about ST/X extensions
# -warnEOLComments : no warnings about EOL comment extension
# -warnPrivacy : no warnings about privateClass extension
+# -warnUnused : no warnings about unused variables
#
# ********** OPTIONAL: MODIFY the next line(s) ***
# STCWARNINGS=-warn
--- a/experiments/abbrev.stc Sun Dec 07 22:55:46 2014 +0000
+++ b/experiments/abbrev.stc Mon Dec 08 10:26:50 2014 +0000
@@ -1,7 +1,9 @@
# automagically generated by the project definition
# this file is needed for stc to be able to compile modules independently.
# it provides information about a classes filename, category and especially namespace.
+Benchmarks::JavaLookup Benchmarks__JavaLookup stx:libjava/experiments 'benchmarks-Misc' 0
JavaByteCodeInterpreter JavaByteCodeInterpreter stx:libjava/experiments 'Languages-Java-Bytecode' 0
+JavaByteCodeInterpreterTests JavaByteCodeInterpreterTests stx:libjava/experiments 'Languages-Java-Tests' 1
JavaClassReloaderTests JavaClassReloaderTests stx:libjava/experiments 'Languages-Java-Tests-ClassReloading' 1
JavaMethodWrapperCompiler JavaMethodWrapperCompiler stx:libjava/experiments 'Languages-Java-Experiments-Lookup' 0
NoReflectionObject NoReflectionObject stx:libjava/experiments 'Languages-Java-Experiments-Lookup' 0
@@ -10,5 +12,3 @@
SetSample SetSample stx:libjava/experiments 'Languages-Java-Experiments-Tests' 0
stx_libjava_experiments stx_libjava_experiments stx:libjava/experiments '* Projects & Packages *' 3
JavaByteCodeSteppableInterpreter JavaByteCodeSteppableInterpreter stx:libjava/experiments 'Languages-Java-Bytecode' 0
-Benchmarks::JavaLookup Benchmarks__JavaLookup stx:libjava/experiments 'benchmarks-Misc' 0
-JavaByteCodeInterpreterTests JavaByteCodeInterpreterTests stx:libjava/experiments 'Languages-Java-Tests' 1
--- a/experiments/bc.mak Sun Dec 07 22:55:46 2014 +0000
+++ b/experiments/bc.mak Mon Dec 08 10:26:50 2014 +0000
@@ -30,6 +30,7 @@
!INCLUDE Make.spec
LIBNAME=libstx_libjava_experiments
+MODULE_PATH=libjava\experiments
RESFILES=experiments.$(RES)
--- a/experiments/bmake.bat Sun Dec 07 22:55:46 2014 +0000
+++ b/experiments/bmake.bat Mon Dec 08 10:26:50 2014 +0000
@@ -9,4 +9,8 @@
@IF "%HGROOT%" NEQ "" SET DEFINES=%DEFINES% "-DHGROOT=%HGROOT%"
make.exe -N -f bc.mak %DEFINES% %*
+@IF "%1" EQU "exe" GOTO finish
+
+
+:finish
--- a/experiments/experiments.rc Sun Dec 07 22:55:46 2014 +0000
+++ b/experiments/experiments.rc Mon Dec 08 10:26:50 2014 +0000
@@ -3,8 +3,8 @@
// automagically generated from the projectDefinition: stx_libjava_experiments.
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 6,2,26747,26747
- PRODUCTVERSION 6,2,4,0
+ FILEVERSION 6,2,32767,32767
+ PRODUCTVERSION 6,2,5,0
#if (__BORLANDC__)
FILEFLAGSMASK VS_FF_DEBUG | VS_FF_PRERELEASE
FILEFLAGS VS_FF_PRERELEASE | VS_FF_SPECIALBUILD
@@ -20,12 +20,12 @@
BEGIN
VALUE "CompanyName", "eXept Software AG\0"
VALUE "FileDescription", "Smalltalk/X Class library (LIB)\0"
- VALUE "FileVersion", "6.2.26747.26747\0"
+ VALUE "FileVersion", "6.2.32767.32767\0"
VALUE "InternalName", "stx:libjava/experiments\0"
VALUE "LegalCopyright", "Copyright Claus Gittinger 1988-2014\nCopyright eXept Software AG 1998-2014\0"
VALUE "ProductName", "Smalltalk/X\0"
- VALUE "ProductVersion", "6.2.4.0\0"
- VALUE "ProductDate", "Sat, 11 Oct 2014 22:19:46 GMT\0"
+ VALUE "ProductVersion", "6.2.5.0\0"
+ VALUE "ProductDate", "Mon, 08 Dec 2014 10:20:54 GMT\0"
END
END
--- a/experiments/stx_libjava_experiments.st Sun Dec 07 22:55:46 2014 +0000
+++ b/experiments/stx_libjava_experiments.st Mon Dec 08 10:26:50 2014 +0000
@@ -63,11 +63,6 @@
OTHER DEALINGS IN THE SOFTWARE.
"
-!
-
-extensionsVersion_HG
-
- ^ '$Changeset: <not expanded> $'
! !
!stx_libjava_experiments class methodsFor:'description'!
@@ -92,7 +87,7 @@
by searching along the inheritance chain of all of my classes."
^ #(
- #'stx:libbasic' "Autoload - superclass of Benchmarks::JavaLookup"
+ #'stx:libbasic' "Collection - superclass of SetSample"
#'stx:libjava' "Java - superclass of JavaMethodWrapperCompiler"
)
!
@@ -197,7 +192,9 @@
^ #(
"<className> or (<className> attributes...) in load order"
+ (#'Benchmarks::JavaLookup' autoload)
JavaByteCodeInterpreter
+ (JavaByteCodeInterpreterTests autoload)
(JavaClassReloaderTests autoload)
JavaMethodWrapperCompiler
NoReflectionObject
@@ -206,8 +203,6 @@
SetSample
#'stx_libjava_experiments'
JavaByteCodeSteppableInterpreter
- (#'Benchmarks::JavaLookup' autoload)
- (JavaByteCodeInterpreterTests autoload)
)
!
--- a/libjava.rc Sun Dec 07 22:55:46 2014 +0000
+++ b/libjava.rc Mon Dec 08 10:26:50 2014 +0000
@@ -3,8 +3,8 @@
// automagically generated from the projectDefinition: stx_libjava.
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 6,2,26747,26747
- PRODUCTVERSION 6,2,4,0
+ FILEVERSION 6,2,32767,32767
+ PRODUCTVERSION 6,2,5,0
#if (__BORLANDC__)
FILEFLAGSMASK VS_FF_DEBUG | VS_FF_PRERELEASE
FILEFLAGS VS_FF_PRERELEASE | VS_FF_SPECIALBUILD
@@ -20,12 +20,12 @@
BEGIN
VALUE "CompanyName", "eXept Software AG & SWING Research Group\0"
VALUE "FileDescription", "Java support for Smalltalk/X (LIB)\0"
- VALUE "FileVersion", "6.2.26747.26747\0"
+ VALUE "FileVersion", "6.2.32767.32767\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\n SWING Research Group, Czech Technical University In Prague\0"
VALUE "ProductName", "Smalltalk/X\0"
- VALUE "ProductVersion", "6.2.4.0\0"
- VALUE "ProductDate", "Sat, 11 Oct 2014 22:19:43 GMT\0"
+ VALUE "ProductVersion", "6.2.5.0\0"
+ VALUE "ProductDate", "Mon, 08 Dec 2014 10:20:52 GMT\0"
END
END
--- a/stx_libjava.st Sun Dec 07 22:55:46 2014 +0000
+++ b/stx_libjava.st Mon Dec 08 10:26:50 2014 +0000
@@ -51,11 +51,6 @@
as of 1.9.2010
"
-!
-
-extensionsVersion_HG
-
- ^ '$Changeset: <not expanded> $'
! !
!stx_libjava class methodsFor:'accessing'!
@@ -313,6 +308,7 @@
"<className> or (<className> attributes...) in load order"
GroovyCompiler
GroovyEvaluator
+ (GroovyEvaluatorTests autoload)
GroovyLanguage
GroovySourceFileWriter
JavaAnnotation
@@ -325,8 +321,10 @@
JavaBooleanArray
JavaByte
JavaByteCodeProcessor
+ (JavaByteCodeProcessorTests autoload)
JavaClassAccessor
JavaClassEnvironment
+ (JavaClassLoadingTests autoload)
JavaClassQuery
JavaClassReloader
JavaCodeLibraryOrBundle
@@ -339,33 +337,46 @@
JavaDescriptor
JavaError
JavaExceptionTable
+ (JavaExceptionTests autoload)
JavaField
JavaFinalizationRegistry
+ (JavaFreshlyInitializedResource autoload)
JavaInnerClasses
+ (JavaJUnitTests autoload)
JavaLanguage
JavaLibraries
+ (JavaLibrariesResource autoload)
JavaLocalVariableTable
JavaLocalVariableTableEntry
JavaLookup
+ (JavaLookupResolutionAlgorithmTests autoload)
+ (JavaLookupTests autoload)
JavaMetaclass
JavaMonitor
+ (JavaMonitorsTests autoload)
JavaNameAndType2
JavaNativeMemory
+ (JavaNativeMemoryTests autoload)
JavaNioSupport
JavaObject
JavaObjectDictionary
JavaPopUpView
JavaProcess
JavaRef2
+ (JavaRefsAndConstantPoolTestCase autoload)
JavaRelease
+ (JavaReleaseTests autoload)
JavaResolver
JavaShort
JavaSlotIndexCache
JavaSocket
JavaSourceCodeCache
JavaSourceFileWriter
+ (JavaTestCaseProxy autoload)
JavaTestsLoader
+ (JavaThreadingTests autoload)
JavaTopView
+ (JavaUTF8Tests autoload)
JavaUnresolvedCompilationError
JavaUnresolvedConstant
JavaUtilities
@@ -381,6 +392,7 @@
SmalltalkAppletStub
#'stx_libjava'
GroovyMetaclass
+ (JUnitTestCaseProxy autoload)
Java
JavaAnnotationArrayValue
JavaAnnotationClassValue
@@ -389,12 +401,15 @@
JavaAnnotationPrimitiveValue
JavaBehavior
JavaByteCodeDisassembler
+ (JavaByteCodeDisassemblerTests autoload)
JavaByteCodeEnumerator
JavaByteCodeProcessorAdapter
JavaClassAnnotationContainer
JavaClassMemberRef2
JavaClassReader
+ (JavaClassReaderTests autoload)
JavaClassRef2
+ (JavaClassRefTests autoload)
JavaClassRegistry
JavaCodeBundle
JavaCodeLibrary
@@ -402,17 +417,23 @@
JavaFieldAnnotationContainer
JavaFieldDescriptor
JavaFieldDescriptorWithUnionType
+ (JavaFieldRefTests autoload)
(JavaInitializedResource autoload)
+ (JavaInterfaceMethodRefTests autoload)
JavaInvalidRefError
JavaInvokeDynamic2
JavaMethod
JavaMethodAnnotationContainer
JavaMethodDescriptor
JavaMethodHandle2
+ (JavaMethodRefTests autoload)
JavaMethodType2
JavaMirror
#'JavaNativeMethodImpl_OpenJDK6'
+ (JavaRefMock autoload)
+ (JavaRuntimeConstantPoolTests autoload)
JavaStringRef2
+ (JavaTestsResource autoload)
JavaUnhandledExceptionError
JavaUnhandledThreadDeathError
JavaUnresolvedClassConstant
@@ -422,6 +443,7 @@
ProxyMethodGuardNode
ProxyMethodInvocationNode
ProxyMethodJavaFieldAccessor
+ (TestletTestCaseProxy autoload)
JavaAlienMirror
JavaArrayMirror
JavaByteCodePreresolver
@@ -451,33 +473,6 @@
ProxyMethodJavaTypeCheckNode
JavaNativeMethod
#'JavaNativeMethodImpl_OracleJDK8'
- (GroovyEvaluatorTests autoload)
- (JUnitTestCaseProxy autoload)
- (JavaByteCodeDisassemblerTests autoload)
- (JavaByteCodeProcessorTests autoload)
- (JavaClassLoadingTests autoload)
- (JavaClassReaderTests autoload)
- (JavaClassRefTests autoload)
- (JavaExceptionTests autoload)
- (JavaFieldRefTests autoload)
- (JavaFreshlyInitializedResource autoload)
- (JavaInterfaceMethodRefTests autoload)
- (JavaJUnitTests autoload)
- (JavaLibrariesResource autoload)
- (JavaLookupResolutionAlgorithmTests autoload)
- (JavaLookupTests autoload)
- (JavaMethodRefTests autoload)
- (JavaMonitorsTests autoload)
- (JavaNativeMemoryTests autoload)
- (JavaRefMock autoload)
- (JavaRefsAndConstantPoolTestCase autoload)
- (JavaReleaseTests autoload)
- (JavaRuntimeConstantPoolTests autoload)
- (JavaTestCaseProxy autoload)
- (JavaTestsResource autoload)
- (JavaThreadingTests autoload)
- (JavaUTF8Tests autoload)
- (TestletTestCaseProxy autoload)
)
!
--- a/tools/JavaCodeBundleEditor.st Sun Dec 07 22:55:46 2014 +0000
+++ b/tools/JavaCodeBundleEditor.st Mon Dec 08 10:26:50 2014 +0000
@@ -441,9 +441,9 @@
!
doBrowseFiles
- UserPreferences fileBrowserClass openOnDirectory: (JavaCodeLibraryEditor lastDirectory) ? (Filename currentDirectory pathName)
+ UserPreferences fileBrowserClass openOnDirectory: (Array with: ((JavaCodeLibraryEditor lastDirectory) ? (Filename currentDirectory pathName)) asFilename)
- "Modified: / 22-02-2013 / 00:31:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 08-12-2014 / 00:26:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
doEdit
--- a/tools/JavaCodeLibraryEditor.st Sun Dec 07 22:55:46 2014 +0000
+++ b/tools/JavaCodeLibraryEditor.st Mon Dec 08 10:26:50 2014 +0000
@@ -416,12 +416,12 @@
!JavaCodeLibraryEditor methodsFor:'initialization'!
initialize
-"/ super initialize.
+ super initialize.
accept addDependent: self.
nameIsDefault := true.
"Created: / 21-02-2013 / 19:52:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 15-04-2014 / 18:55:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 08-12-2014 / 00:29:33 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!JavaCodeLibraryEditor methodsFor:'private'!
--- a/tools/JavaSettingsApplication.st Sun Dec 07 22:55:46 2014 +0000
+++ b/tools/JavaSettingsApplication.st Mon Dec 08 10:26:50 2014 +0000
@@ -625,11 +625,14 @@
javaReleaseList isNil ifTrue:[
- javaReleaseList := JavaRelease all asList addFirst: JavaRelease system; yourself
+ javaReleaseList := JavaRelease allForCurrentOperatingSystem asList.
+ (javaReleaseList includesIdentical: JavaRelease system) ifFalse:[
+ javaReleaseList add: JavaRelease system.
+ ].
].
^ javaReleaseList.
- "Modified: / 11-11-2013 / 16:06:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified (format): / 08-12-2014 / 00:38:38 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
jdkBundleHolder
--- a/tools/Make.spec Sun Dec 07 22:55:46 2014 +0000
+++ b/tools/Make.spec Mon Dec 08 10:26:50 2014 +0000
@@ -42,6 +42,7 @@
# -warnNonStandard : no warnings about ST/X extensions
# -warnEOLComments : no warnings about EOL comment extension
# -warnPrivacy : no warnings about privateClass extension
+# -warnUnused : no warnings about unused variables
#
# ********** OPTIONAL: MODIFY the next line(s) ***
# STCWARNINGS=-warn
--- a/tools/abbrev.stc Sun Dec 07 22:55:46 2014 +0000
+++ b/tools/abbrev.stc Mon Dec 08 10:26:50 2014 +0000
@@ -5,6 +5,7 @@
JavaCodeBundleEditor JavaCodeBundleEditor stx:libjava/tools 'Languages-Java-Tools' 1
JavaCodeLibraryEditor JavaCodeLibraryEditor stx:libjava/tools 'Languages-Java-Tools' 1
JavaCompiler JavaCompiler stx:libjava/tools 'Languages-Java-Support-Compiling' 0
+JavaCompilerTests JavaCompilerTests stx:libjava/tools 'Languages-Java-Tests-Compiling' 1
JavaLintAnnotation JavaLintAnnotation stx:libjava/tools 'Languages-Java-Tools-Editor-Lint' 0
JavaLintHighlighter JavaLintHighlighter stx:libjava/tools 'Languages-Java-Tools-Editor-Lint' 0
JavaLintPopupWindow JavaLintPopupWindow stx:libjava/tools 'Languages-Java-Tools-Editor-Lint' 1
@@ -24,4 +25,3 @@
GroovyScanner GroovyScanner stx:libjava/tools 'Languages-Groovy-Tools-Source' 3
JavaLexicalHighlighter JavaLexicalHighlighter stx:libjava/tools 'Languages-Java-Tools-Source' 0
GroovySourceHighlighter GroovySourceHighlighter stx:libjava/tools 'Languages-Groovy-Tools-Source' 0
-JavaCompilerTests JavaCompilerTests stx:libjava/tools 'Languages-Java-Tests-Compiling' 1
--- a/tools/bc.mak Sun Dec 07 22:55:46 2014 +0000
+++ b/tools/bc.mak Mon Dec 08 10:26:50 2014 +0000
@@ -30,6 +30,7 @@
!INCLUDE Make.spec
LIBNAME=libstx_libjava_tools
+MODULE_PATH=libjava\tools
RESFILES=tools.$(RES)
--- a/tools/bmake.bat Sun Dec 07 22:55:46 2014 +0000
+++ b/tools/bmake.bat Mon Dec 08 10:26:50 2014 +0000
@@ -9,4 +9,8 @@
@IF "%HGROOT%" NEQ "" SET DEFINES=%DEFINES% "-DHGROOT=%HGROOT%"
make.exe -N -f bc.mak %DEFINES% %*
+@IF "%1" EQU "exe" GOTO finish
+
+
+:finish
--- a/tools/stx_libjava_tools.st Sun Dec 07 22:55:46 2014 +0000
+++ b/tools/stx_libjava_tools.st Mon Dec 08 10:26:50 2014 +0000
@@ -7,12 +7,6 @@
category:'* Projects & Packages *'
!
-!stx_libjava_tools class methodsFor:'documentation'!
-
-extensionsVersion_HG
-
- ^ '$Changeset: <not expanded> $'
-! !
!stx_libjava_tools class methodsFor:'description'!
@@ -38,7 +32,7 @@
by searching along the inheritance chain of all of my classes."
^ #(
- #'stx:libbasic' "Autoload - superclass of JavaCompilerTests"
+ #'stx:libbasic' "ConfigurableFeatures - extended"
#'stx:libjava' "JavaObject - extended"
#'stx:libtool' "AbstractSettingsApplication - superclass of JavaSettingsApplication"
#'stx:libview' "DisplaySurface - superclass of JavaListInspectorView"
@@ -133,6 +127,7 @@
JavaCodeBundleEditor
JavaCodeLibraryEditor
JavaCompiler
+ (JavaCompilerTests autoload)
JavaLintAnnotation
JavaLintHighlighter
JavaLintPopupWindow
@@ -152,7 +147,6 @@
GroovyScanner
JavaLexicalHighlighter
GroovySourceHighlighter
- (JavaCompilerTests autoload)
)
!
--- a/tools/tools.rc Sun Dec 07 22:55:46 2014 +0000
+++ b/tools/tools.rc Mon Dec 08 10:26:50 2014 +0000
@@ -3,8 +3,8 @@
// automagically generated from the projectDefinition: stx_libjava_tools.
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 6,2,26747,26747
- PRODUCTVERSION 6,2,4,0
+ FILEVERSION 6,2,32767,32767
+ PRODUCTVERSION 6,2,5,0
#if (__BORLANDC__)
FILEFLAGSMASK VS_FF_DEBUG | VS_FF_PRERELEASE
FILEFLAGS VS_FF_PRERELEASE | VS_FF_SPECIALBUILD
@@ -20,12 +20,12 @@
BEGIN
VALUE "CompanyName", "eXept Software AG\0"
VALUE "FileDescription", "Smalltalk/X Class library (LIB)\0"
- VALUE "FileVersion", "6.2.26747.26747\0"
+ VALUE "FileVersion", "6.2.32767.32767\0"
VALUE "InternalName", "stx:libjava/tools\0"
VALUE "LegalCopyright", "Copyright Claus Gittinger 1988-2011\nCopyright eXept Software AG 1998-2011\0"
VALUE "ProductName", "Smalltalk/X\0"
- VALUE "ProductVersion", "6.2.4.0\0"
- VALUE "ProductDate", "Sat, 11 Oct 2014 22:19:48 GMT\0"
+ VALUE "ProductVersion", "6.2.5.0\0"
+ VALUE "ProductDate", "Mon, 08 Dec 2014 10:20:56 GMT\0"
END
END