--- a/JavaNativeMethodImpl_OpenJDK6.st Fri Sep 11 16:08:20 2015 +0100
+++ b/JavaNativeMethodImpl_OpenJDK6.st Fri Sep 11 16:22:17 2015 +0100
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
"
COPYRIGHT (c) 2010-2015 by Jan Vrany, Jan Kurs and Marcel Hlopko
SWING Research Group, Czech Technical University in Prague
@@ -9980,12 +9978,15 @@
"get a classes loader"
- |jClass cls |
+ | jClass cls cl|
+
jClass := this.
cls := Reflection classForJavaClassObject:jClass.
- ^cls javaMirror getClassLoader
+ cl := cls javaMirror getClassLoader.
+ ^ cl
"Created: / 19-01-2013 / 23:40:55 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 11-09-2015 / 15:31:10 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
_java_lang_Class_getComponentType: this
--- a/Make.proto Fri Sep 11 16:08:20 2015 +0100
+++ b/Make.proto Fri Sep 11 16:22:17 2015 +0100
@@ -86,7 +86,8 @@
clean::
$(MAKE) -C docs/user clean
-
+
+
zlib:
cd $(ZLIB_DIR); $(MAKE) $(MAKE_ZLIB_ARG)
--- a/abbrev.stc Fri Sep 11 16:08:20 2015 +0100
+++ b/abbrev.stc Fri Sep 11 16:22:17 2015 +0100
@@ -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
@@ -10,14 +11,18 @@
JavaAnnotationDefault JavaAnnotationDefault stx:libjava 'Languages-Java-Annotations' 1
JavaAnnotationDictionary JavaAnnotationDictionary stx:libjava 'Languages-Java-Annotations' 1
JavaAnnotationValue JavaAnnotationValue stx:libjava 'Languages-Java-Reader-Support' 0
+JavaAntProjectResource JavaAntProjectResource stx:libjava 'Languages-Java-Tests' 2
JavaArray JavaArray stx:libjava 'Languages-Java-Classes' 1
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
+JavaClassReloaderTests JavaClassReloaderTests stx:libjava 'Languages-Java-Tests-ClassReloading' 1
JavaCodeLibraryOrBundle JavaCodeLibraryOrBundle stx:libjava 'Languages-Java-Support-Libraries' 0
JavaCompilerForSmalltalkExtensionsOnly JavaCompilerForSmalltalkExtensionsOnly stx:libjava 'Languages-Java-Support-Compiling' 0
JavaCompiler_Eclipse JavaCompiler_Eclipse stx:libjava 'Languages-Java-Tools-Eclipse' 0
@@ -28,33 +33,47 @@
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
+JavaInitializedResource JavaInitializedResource 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
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
@@ -70,6 +89,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
@@ -78,12 +98,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
@@ -91,16 +114,22 @@
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
+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
@@ -110,6 +139,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
@@ -139,33 +169,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
-JavaAntProjectResource JavaAntProjectResource stx:libjava 'Languages-Java-Tests' 2
-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
-JavaClassReloaderTests JavaClassReloaderTests stx:libjava 'Languages-Java-Tests-ClassReloading' 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
-JavaInitializedResource JavaInitializedResource 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 Fri Sep 11 16:08:20 2015 +0100
+++ b/bc.mak Fri Sep 11 16:22:17 2015 +0100
@@ -70,6 +70,7 @@
ALL:: java_compile
+
doc:
pushd docs\user & $(MAKE_BAT) html
@@ -80,6 +81,7 @@
clean::
pushd docs\user & $(MAKE_BAT) clean
+
$(ZLIB):
cd $(ZLIB_DIR)
$(MAKE) $(MAKE_ZLIB_ARG) $(ZLIB)
@@ -107,8 +109,7 @@
$(MAKE) -f Makefile.bcc
cd ..\..
! endif
-!endif
-
+!endif
--- a/bmake.bat Fri Sep 11 16:08:20 2015 +0100
+++ b/bmake.bat Fri Sep 11 16:22:17 2015 +0100
@@ -5,8 +5,9 @@
@REM -------
@SET DEFINES=
@REM Kludge got Mercurial, cannot be implemented in Borland make
-@FOR /F "tokens=*" %%i in ('hg root') do SET HGROOT=%%i
+@FOR /F "tokens=*" %i in ('hg root') do SET HGROOT=%i
@IF "%HGROOT%" NEQ "" SET DEFINES=%DEFINES% "-DHGROOT=%HGROOT%"
+
make.exe -N -f bc.mak %DEFINES% %*
@echo "***********************************"
--- a/experiments/bc.mak Fri Sep 11 16:08:20 2015 +0100
+++ b/experiments/bc.mak Fri Sep 11 16:22:17 2015 +0100
@@ -60,18 +60,18 @@
+java_clean:
+ ant -f java\build.xml clean
+
+clean:: java_clean
+
+
java_compile:
ant -f java\build.xml compile
ALL:: java_compile
-java_clean:
- ant -f java\build.xml clean
-
-clean:: java_clean
-
-
--- a/experiments/bmake.bat Fri Sep 11 16:08:20 2015 +0100
+++ b/experiments/bmake.bat Fri Sep 11 16:22:17 2015 +0100
@@ -5,8 +5,9 @@
@REM -------
@SET DEFINES=
@REM Kludge got Mercurial, cannot be implemented in Borland make
-@FOR /F "tokens=*" %%i in ('hg root') do SET HGROOT=%%i
+@FOR /F "tokens=*" %i in ('hg root') do SET HGROOT=%i
@IF "%HGROOT%" NEQ "" SET DEFINES=%DEFINES% "-DHGROOT=%HGROOT%"
+
make.exe -N -f bc.mak %DEFINES% %*
--- a/experiments/mingwmake.bat Fri Sep 11 16:08:20 2015 +0100
+++ b/experiments/mingwmake.bat Fri Sep 11 16:22:17 2015 +0100
@@ -5,7 +5,7 @@
@REM -------
@SET DEFINES=
@REM Kludge got Mercurial, cannot be implemented in Borland make
-@FOR /F "tokens=*" %%i in ('hg root') do SET HGROOT=%%i
+@FOR /F "tokens=*" %i in ('hg root') do SET HGROOT=%i
@IF "%HGROOT%" NEQ "" SET DEFINES=%DEFINES% "-DHGROOT=%HGROOT%"
@pushd ..\..\rules
--- a/experiments/stx_libjava_experiments.st Fri Sep 11 16:08:20 2015 +0100
+++ b/experiments/stx_libjava_experiments.st Fri Sep 11 16:22:17 2015 +0100
@@ -115,7 +115,10 @@
referencedPreRequisites
"list packages which are a prerequisite, because they contain
classes which are referenced by my classes.
- We do not need these packages as a prerequisite for loading or compiling.
+ We do not need these packages as a prerequisite for compiling or loading,
+ however, a class from it may be referenced during execution and having it
+ unloaded then may lead to a runtime doesNotUnderstand error, unless the caller
+ includes explicit checks for the package being present.
This method is generated automatically,
by searching all classes (and their packages) which are referenced by my classes."
--- a/experiments/vcmake.bat Fri Sep 11 16:08:20 2015 +0100
+++ b/experiments/vcmake.bat Fri Sep 11 16:22:17 2015 +0100
@@ -10,11 +10,8 @@
popd
)
@SET DEFINES=
-@REM Kludge got Mercurial, cannot be implemented in Borland make
-@FOR /F "tokens=*" %%i in ('hg root') do SET HGROOT=%%i
-@IF "%HGROOT%" NEQ "" SET DEFINES=%DEFINES% "-DHGROOT=%HGROOT%"
+
make.exe -N -f bc.mak -DUSEVC=1 %DEFINES% %*
-
--- a/extensions.st Fri Sep 11 16:08:20 2015 +0100
+++ b/extensions.st Fri Sep 11 16:22:17 2015 +0100
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
"{ Package: 'stx:libjava' }"!
!Behavior methodsFor:'queries'!
--- a/mingwmake.bat Fri Sep 11 16:08:20 2015 +0100
+++ b/mingwmake.bat Fri Sep 11 16:22:17 2015 +0100
@@ -5,7 +5,7 @@
@REM -------
@SET DEFINES=
@REM Kludge got Mercurial, cannot be implemented in Borland make
-@FOR /F "tokens=*" %%i in ('hg root') do SET HGROOT=%%i
+@FOR /F "tokens=*" %i in ('hg root') do SET HGROOT=%i
@IF "%HGROOT%" NEQ "" SET DEFINES=%DEFINES% "-DHGROOT=%HGROOT%"
@pushd ..\rules
--- a/stx_libjava.st Fri Sep 11 16:08:20 2015 +0100
+++ b/stx_libjava.st Fri Sep 11 16:22:17 2015 +0100
@@ -213,14 +213,27 @@
$(MAKE) $(MAKE_BZ2LIB_ARG) bz2.lib
cd ..\..\libjava
+!!ifdef USEMINGW64
+support\fdlibm\libfdm.lib:
+ cd support\fdlibm
+ $(MAKE) -f Makefile.mingw64
+ cd ..\..
+!!else
+!! ifdef USEMINGW32
+support\fdlibm\libfdm.lib:
+ cd support\fdlibm
+ $(MAKE) -f Makefile.mingw32
+ cd ..\..
+!! else
support\fdlibm\libfdm.lib:
cd support\fdlibm
$(MAKE) -f Makefile.bcc
cd ..\..
-
+!! endif
+!!endif
'
- "Modified: / 04-02-2015 / 06:51:23 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 11-09-2015 / 16:16:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
additionalRules_make_dot_proto
@@ -286,6 +299,7 @@
"<className> or (<className> attributes...) in load order"
GroovyCompiler
GroovyEvaluator
+ (GroovyEvaluatorTests autoload)
GroovyLanguage
GroovySourceFileWriter
JavaAnnotation
@@ -293,14 +307,18 @@
JavaAnnotationDefault
JavaAnnotationDictionary
JavaAnnotationValue
+ (JavaAntProjectResource autoload)
JavaArray
JavaBooleanArray
JavaByte
JavaByteCodeProcessor
+ (JavaByteCodeProcessorTests autoload)
JavaClassAccessor
JavaClassEnvironment
+ (JavaClassLoadingTests autoload)
JavaClassQuery
JavaClassReloader
+ (JavaClassReloaderTests autoload)
JavaCodeLibraryOrBundle
JavaCompilerForSmalltalkExtensionsOnly
#'JavaCompiler_Eclipse'
@@ -311,33 +329,47 @@
JavaDescriptor
JavaError
JavaExceptionTable
+ (JavaExceptionTests autoload)
JavaField
JavaFinalizationRegistry
+ (JavaFreshlyInitializedResource autoload)
+ (JavaInitializedResource 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
@@ -353,6 +385,7 @@
SmalltalkAppletStub
#'stx_libjava'
GroovyMetaclass
+ (JUnitTestCaseProxy autoload)
Java
JavaAnnotationArrayValue
JavaAnnotationClassValue
@@ -361,12 +394,15 @@
JavaAnnotationPrimitiveValue
JavaBehavior
JavaByteCodeDisassembler
+ (JavaByteCodeDisassemblerTests autoload)
JavaByteCodeEnumerator
JavaByteCodeProcessorAdapter
JavaClassAnnotationContainer
JavaClassMemberRef2
JavaClassReader
+ (JavaClassReaderTests autoload)
JavaClassRef2
+ (JavaClassRefTests autoload)
JavaClassRegistry
JavaCodeBundle
JavaCodeLibrary
@@ -374,16 +410,22 @@
JavaFieldAnnotationContainer
JavaFieldDescriptor
JavaFieldDescriptorWithUnionType
+ (JavaFieldRefTests 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
@@ -393,6 +435,7 @@
ProxyMethodGuardNode
ProxyMethodInvocationNode
ProxyMethodJavaFieldAccessor
+ (TestletTestCaseProxy autoload)
JavaAlienMirror
JavaArrayMirror
JavaByteCodePreresolver
@@ -422,36 +465,6 @@
ProxyMethodJavaTypeCheckNode
JavaNativeMethod
#'JavaNativeMethodImpl_OracleJDK8'
- (GroovyEvaluatorTests autoload)
- (JUnitTestCaseProxy autoload)
- (JavaAntProjectResource autoload)
- (JavaByteCodeDisassemblerTests autoload)
- (JavaByteCodeProcessorTests autoload)
- (JavaClassLoadingTests autoload)
- (JavaClassReaderTests autoload)
- (JavaClassRefTests autoload)
- (JavaClassReloaderTests autoload)
- (JavaExceptionTests autoload)
- (JavaFieldRefTests autoload)
- (JavaFreshlyInitializedResource autoload)
- (JavaInitializedResource 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)
)
!
@@ -652,27 +665,16 @@
'ProjectDefinition class' #'additionalRules_java_clean_in_make_dot_proto'
'ProjectDefinition class' #'additionalRules_java_compile_in_bc_dot_mak'
'ProjectDefinition class' #'additionalRules_java_compile_in_make_dot_proto'
+ 'ProjectDefinition class' #'javaBundle_code'
+ 'ProjectDefinition class' postLoadJavaHook
)
! !
!stx_libjava class methodsFor:'description - java'!
javaBundle
- | bundle jdkBundle |
-
- bundle := JavaCodeBundle standardPackageBundleFor: self package.
- jdkBundle := Java release jdkBundle.
- jdkBundle notNil ifTrue:[
- bundle add: jdkBundle.
- ].
- ^ bundle.
-
- "
- self javaBundle
- "
-
- "Created: / 15-01-2013 / 17:35:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified (comment): / 11-11-2013 / 15:34:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+
+ ^ JavaCodeBundle standardPackageBundleFor: self package
! !
!stx_libjava class methodsFor:'description - project information'!
--- a/tools/Make.proto Fri Sep 11 16:08:20 2015 +0100
+++ b/tools/Make.proto Fri Sep 11 16:22:17 2015 +0100
@@ -167,7 +167,7 @@
# BEGINMAKEDEPEND --- do not remove this line; make depend needs it
$(OUTDIR)JavaAbstractSourceHighlighter.$(O) JavaAbstractSourceHighlighter.$(H): JavaAbstractSourceHighlighter.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)JavaCodeBundleEditor.$(O) JavaCodeBundleEditor.$(H): JavaCodeBundleEditor.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItem.$(H) $(STCHDR)
+$(OUTDIR)JavaCodeBundleEditor.$(O) JavaCodeBundleEditor.$(H): JavaCodeBundleEditor.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libwidg2/AbstractHierarchicalItem.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItem.$(H) $(STCHDR)
$(OUTDIR)JavaCodeLibraryEditor.$(O) JavaCodeLibraryEditor.$(H): JavaCodeLibraryEditor.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libview2/SimpleDialog.$(H) $(STCHDR)
$(OUTDIR)JavaCodeLibraryValidationWarning.$(O) JavaCodeLibraryValidationWarning.$(H): JavaCodeLibraryValidationWarning.st $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Notification.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/UserNotification.$(H) $(INCLUDE_TOP)/stx/libbasic/Warning.$(H) $(STCHDR)
$(OUTDIR)JavaCompiler.$(O) JavaCompiler.$(H): JavaCompiler.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
--- a/tools/bc.mak Fri Sep 11 16:08:20 2015 +0100
+++ b/tools/bc.mak Fri Sep 11 16:22:17 2015 +0100
@@ -92,7 +92,7 @@
# BEGINMAKEDEPEND --- do not remove this line; make depend needs it
$(OUTDIR)JavaAbstractSourceHighlighter.$(O) JavaAbstractSourceHighlighter.$(H): JavaAbstractSourceHighlighter.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)JavaCodeBundleEditor.$(O) JavaCodeBundleEditor.$(H): JavaCodeBundleEditor.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItem.$(H) $(STCHDR)
+$(OUTDIR)JavaCodeBundleEditor.$(O) JavaCodeBundleEditor.$(H): JavaCodeBundleEditor.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(INCLUDE_TOP)\stx\libwidg2\AbstractHierarchicalItem.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItem.$(H) $(STCHDR)
$(OUTDIR)JavaCodeLibraryEditor.$(O) JavaCodeLibraryEditor.$(H): JavaCodeLibraryEditor.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(INCLUDE_TOP)\stx\libview2\SimpleDialog.$(H) $(STCHDR)
$(OUTDIR)JavaCodeLibraryValidationWarning.$(O) JavaCodeLibraryValidationWarning.$(H): JavaCodeLibraryValidationWarning.st $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Notification.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\UserNotification.$(H) $(INCLUDE_TOP)\stx\libbasic\Warning.$(H) $(STCHDR)
$(OUTDIR)JavaCompiler.$(O) JavaCompiler.$(H): JavaCompiler.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
--- a/tools/bmake.bat Fri Sep 11 16:08:20 2015 +0100
+++ b/tools/bmake.bat Fri Sep 11 16:22:17 2015 +0100
@@ -5,8 +5,9 @@
@REM -------
@SET DEFINES=
@REM Kludge got Mercurial, cannot be implemented in Borland make
-@FOR /F "tokens=*" %%i in ('hg root') do SET HGROOT=%%i
+@FOR /F "tokens=*" %i in ('hg root') do SET HGROOT=%i
@IF "%HGROOT%" NEQ "" SET DEFINES=%DEFINES% "-DHGROOT=%HGROOT%"
+
make.exe -N -f bc.mak %DEFINES% %*
--- a/tools/extensions.st Fri Sep 11 16:08:20 2015 +0100
+++ b/tools/extensions.st Fri Sep 11 16:22:17 2015 +0100
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
"{ Package: 'stx:libjava/tools' }"!
!ConfigurableFeatures class methodsFor:'queries-features'!
--- a/tools/mingwmake.bat Fri Sep 11 16:08:20 2015 +0100
+++ b/tools/mingwmake.bat Fri Sep 11 16:22:17 2015 +0100
@@ -5,7 +5,7 @@
@REM -------
@SET DEFINES=
@REM Kludge got Mercurial, cannot be implemented in Borland make
-@FOR /F "tokens=*" %%i in ('hg root') do SET HGROOT=%%i
+@FOR /F "tokens=*" %i in ('hg root') do SET HGROOT=%i
@IF "%HGROOT%" NEQ "" SET DEFINES=%DEFINES% "-DHGROOT=%HGROOT%"
@pushd ..\..\rules
--- a/tools/stx_libjava_tools.st Fri Sep 11 16:08:20 2015 +0100
+++ b/tools/stx_libjava_tools.st Fri Sep 11 16:22:17 2015 +0100
@@ -39,7 +39,7 @@
#'stx:libtool' "AbstractSettingsApplication - superclass of JavaSettingsApplication"
#'stx:libview' "DisplaySurface - superclass of JavaListInspectorView"
#'stx:libview2' "ApplicationModel - extended"
- #'stx:libwidg2' "HierarchicalItem - superclass of JavaCodeBundleEditor::BundleItem"
+ #'stx:libwidg2' "AbstractHierarchicalItem - superclass of JavaCodeBundleEditor::BundleItem"
)
!
--- a/tools/vcmake.bat Fri Sep 11 16:08:20 2015 +0100
+++ b/tools/vcmake.bat Fri Sep 11 16:22:17 2015 +0100
@@ -10,11 +10,8 @@
popd
)
@SET DEFINES=
-@REM Kludge got Mercurial, cannot be implemented in Borland make
-@FOR /F "tokens=*" %%i in ('hg root') do SET HGROOT=%%i
-@IF "%HGROOT%" NEQ "" SET DEFINES=%DEFINES% "-DHGROOT=%HGROOT%"
+
make.exe -N -f bc.mak -DUSEVC=1 %DEFINES% %*
-
--- a/vcmake.bat Fri Sep 11 16:08:20 2015 +0100
+++ b/vcmake.bat Fri Sep 11 16:22:17 2015 +0100
@@ -10,13 +10,10 @@
popd
)
@SET DEFINES=
-@REM Kludge got Mercurial, cannot be implemented in Borland make
-@FOR /F "tokens=*" %%i in ('hg root') do SET HGROOT=%%i
-@IF "%HGROOT%" NEQ "" SET DEFINES=%DEFINES% "-DHGROOT=%HGROOT%"
+
make.exe -N -f bc.mak -DUSEVC=1 %DEFINES% %*
-
@echo "***********************************"
@echo "Buildung stx/libjava/experiments
@echo "***********************************"