--- a/stx_libjava.st Fri Aug 16 19:52:36 2013 +0200
+++ b/stx_libjava.st Fri Sep 06 02:45:44 2013 +0200
@@ -51,15 +51,6 @@
as of 1.9.2010
"
-!
-
-extensionsVersion_HG
-
- ^ '$Changeset: <not expanded> $'
-!
-
-extensionsVersion_SVN
- ^ '$Id: stx_libjava.st,v 1.17 2013-04-19 11:40:48 stefan Exp $'
! !
!stx_libjava class methodsFor:'accessing'!
@@ -83,7 +74,7 @@
!stx_libjava class methodsFor:'accessing - tests'!
-excludedFromTestSuite
+excludedFromTestSuite
"List of testcases and/or tests excluded from testsuite.
Entries maybe ClassName or #(ClassName testName)
"
@@ -116,7 +107,7 @@
tc isAbstract ifFalse:[javaTestCases add:tc ]]].
javaTestCases do:
- [:each |
+ [:each |
suite addTests:each buildSuite tests ].
@@ -153,10 +144,11 @@
preRequisites scan. See #preRequisites for more."
^ #(
- #'stx:goodies/sunit' "TestSuite - referenced by stx_libjava class>>testSuite "
- #'stx:libjava/experiments' "NoReflectionObject - referenced by JavaObjectDictionary>>reflectionOf: "
- #'stx:libjava/tools' "JavaSyntaxHighlighter - referenced by GroovyLanguage>>syntaxHighlighterClass "
+ #'stx:libjava/experiments'
+ #'stx:libjava/tools'
)
+
+ "Modified: / 06-09-2013 / 00:09:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
mandatoryPreRequisites
@@ -165,11 +157,10 @@
or classes which are extended by this package.
This list can be maintained manually or (better) generated and
updated by scanning the superclass hierarchies
- (the browser has a menu function for that)
- However, often too much is found, and you may want to explicitely
- exclude individual packages in the #excludedFromPreRequisites method."
+ (the browser has a menu function for that)"
^ #(
+ #'stx:goodies/sunit' "TestAsserter - superclass of JUnitTestCaseProxy "
#'stx:libbasic' "AbstractNumberVector - extended "
#'stx:libbasic2' "BitArray - extended "
#'stx:libbasic3' "WrappedMethod - extended "
@@ -186,13 +177,15 @@
exclude individual packages in the #excludedFromPreRequisites method."
^ #(
- #'stx:libcomp' "BlockNode - referenced by ProxyMethodAndNode>>generate: "
+ #'stx:libcomp' "BlockNode - referenced by JavaNativeMethod>>numberOfArgs: "
#'stx:libhtml' "URL - referenced by JavaEmbeddedFrameView>>setupAppletFrameIn:initializeJava: "
#'stx:libtool' "DebugView - referenced by Java class>>flushClasses "
#'stx:libview2' "GIFReader - referenced by JavaNativeMethodImpl_OpenJDK6 class>>_GifImageDecoder_parseImage: "
#'stx:libwidg' "Button - referenced by JavaNativeMethodImpl_OpenJDK6 class>>_WButtonPeer_create: "
#'stx:libwidg2' "CheckBox - referenced by JavaNativeMethodImpl_OpenJDK6 class>>_WCheckboxPeer_create: "
)
+
+ "Modified: / 06-09-2013 / 00:09:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
subProjects
@@ -202,6 +195,14 @@
for those, redefine requiredPrerequisites"
^ #(
+ #'stx:libjava/libs'
+ #'stx:libjava/mauve'
+ #'stx:libjava/tools'
+ #'stx:libjava/experiments'
+ #'stx:libjava/examples'
+ #'stx:libjava/benchmarks'
+ #'stx:libjava/examples/tomcat6'
+ #'stx:libjava/startup'
)
! !
@@ -223,6 +224,8 @@
additionalRules_bc_dot_mak
^ '
+java: ant
+
ant:
ant -f java\build.xml
@@ -241,38 +244,20 @@
$(MAKE) $(MAKE_BZ2LIB_ARG) bz2.lib
cd ..\..\libjava
-!!ifdef USEBC
support\fdlibm\libfdm.lib:
cd support\fdlibm
$(MAKE) -f Makefile.bcc
cd ..\..
-!!endif
-!!ifdef USEVC
-support\fdlibm\libfdm.lib:
- cd support\fdlibm
- $(MAKE) -f Makefile.msvc
- cd ..\..
-!!endif
-!!if defined(USEMING32)
-support\fdlibm\libfdm.lib:
- cd support\fdlibm
- $(MAKE) -f Makefile.mingw32
- cd ..\..
-!!endif
-!!if defined(USEMINGW64)
-support\fdlibm\libfdm.lib:
- cd support\fdlibm
- $(MAKE) -f Makefile.mingw64
- cd ..\..
-!!endif
'
- "Modified: / 15-11-2012 / 23:23:33 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 26-02-2013 / 16:51:24 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
additionalRules_make_dot_proto
^ '
+java: ant
+
ant:
ant -f java/build.xml
@@ -289,7 +274,7 @@
'
- "Modified: / 15-11-2012 / 23:22:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 26-02-2013 / 16:51:33 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
additionalTargets_bc_dot_mak
@@ -330,13 +315,13 @@
^ #(
"<className> or (<className> attributes...) in load order"
- JavaVMData
- (JavaRefsAndConstantPoolTestCase autoload)
GroovyCompiler
GroovyEvaluator
GroovyLanguage
GroovySourceFileWriter
- Java
+ (JavaTestCaseProxy autoload)
+ (JUnitTestCaseProxy autoload)
+ (JavaRefsAndConstantPoolTestCase autoload)
JavaAnnotation
JavaAnnotationContainer
JavaAnnotationDefault
@@ -350,18 +335,23 @@
JavaByteCodeProcessor
JavaClassAccessor
(JavaClassLoadingTests autoload)
+ JavaClassQuery
+ (JavaClassReaderTests autoload)
(JavaClassRefTests autoload)
- JavaClassRegistry
JavaClassReloader
+ JavaCodeLibraryOrBundle
+ #'JavaCompiler_Eclipse'
JavaConstantPool
JavaConstants
JavaContext
JavaDecompiler
JavaDescriptor
JavaError
- JavaExceptionTableEntry
+ JavaExceptionTable
+ (JavaExceptionTests autoload)
JavaField
(JavaFieldRefTests autoload)
+ JavaFinalizationRegistry
(JavaFreshlyInitializedResource autoload)
(JavaInitializedResource autoload)
(JavaInterfaceMethodRefTests autoload)
@@ -372,12 +362,19 @@
JavaLocalVariableTable
JavaLocalVariableTableEntry
JavaLookup
+ (JavaLookupResolutionAlgorithmTests autoload)
+ (JavaLookupTests autoload)
+ (JavaLookupTestsResource autoload)
JavaMathSupport
+ JavaMetaclass
(JavaMethodRefTests autoload)
+ JavaMirror
JavaMonitor
(JavaMonitorsTests autoload)
JavaNameAndType2
JavaNativeMemory
+ (JavaNativeMemoryTests autoload)
+ JavaNioSupport
JavaObject
JavaObjectDictionary
JavaPackage
@@ -385,7 +382,6 @@
JavaProcess
JavaRef2
(JavaRefMock autoload)
- JavaRelease
JavaResolver
(JavaRuntimeConstantPoolTests autoload)
JavaShort
@@ -393,16 +389,16 @@
JavaSocket
JavaSourceCodeCache
JavaSourceFileWriter
- (JavaTestCaseProxy autoload)
JavaTestsLoader
(JavaTestsResource autoload)
JavaTopView
(JavaUTF8Tests autoload)
+ JavaUnresolvedCompilationError
JavaUnresolvedConstant
JavaUtilities
+ JavaVMData
JavaView
JavaZipSupport
- PPJavaNode
ProxyMethod
ProxyMethodCompiler
ProxyMethodNode
@@ -410,6 +406,8 @@
SmalltalkAppletStub
(TestletTestCaseProxy autoload)
#'stx_libjava'
+ GroovyMetaclass
+ Java
JavaAnnotationArrayValue
JavaAnnotationClassValue
JavaAnnotationEnumValue
@@ -423,6 +421,9 @@
JavaClassContentRef2
JavaClassReader
JavaClassRef2
+ JavaClassRegistry
+ JavaCodeBundle
+ JavaCodeLibrary
JavaEmbeddedFrameView
JavaFieldAnnotationContainer
JavaFieldDescriptor
@@ -430,58 +431,43 @@
JavaInvalidRefError
JavaMethod
JavaMethodAnnotationContainer
- JavaMethodDeclarationNode
JavaMethodDescriptor
+ #'JavaNativeMethodImpl_OpenJDK6'
+ JavaRelease
JavaStringRef2
JavaUnhandledExceptionError
JavaUnresolvedClassConstant
JavaUnresolvedStringConstant
JavaVM
- JavadocDeclarationNode
ProxyMethodConditionNode
ProxyMethodGuardNode
ProxyMethodInvocationNode
+ ProxyMethodJavaFieldAccessor
JavaByteCodePreresolver
JavaClass
+ JavaClassPathBundle
JavaFieldRef2
+ JavaMethodAnalyzer
JavaMethodRef2
JavaMethodWithException
+ #'JavaNativeMethodImpl_OpenJDK7'
+ #'JavaNativeMethodImpl_SunJDK6'
ProxyMethodAndNode
ProxyMethodBlockInvocationNode
+ ProxyMethodJavaFieldGetter
+ ProxyMethodJavaFieldSetter
ProxyMethodMethodInvocationNode
ProxyMethodTypeCheckNode
GroovyClass
JavaInterfaceMethodRef2
JavaMethodWithHandler
+ #'JavaNativeMethodImpl_SunJDK7'
ProxyMethodJavaMethodInvocationNode
ProxyMethodJavaTypeCheckNode
JavaNativeMethod
- ProxyMethodJavaFieldAccessor
- ProxyMethodJavaFieldGetter
- ProxyMethodJavaFieldSetter
- (JavaExceptionTests autoload)
- #'JavaCompiler_Eclipse'
- JavaMetaclass
- GroovyMetaclass
- (JavaClassReaderTests autoload)
- JavaNioSupport
- (JavaNativeMemoryTests autoload)
- JavaFinalizationRegistry
- JavaMirror
- JavaClassQuery
- (JUnitTestCaseProxy autoload)
- (JavaLookupResolutionAlgorithmTests autoload)
- (JavaLookupTests autoload)
- (JavaLookupTestsResource autoload)
- JavaCodeLibraryOrBundle
- JavaCodeBundle
- JavaClassPathBundle
- JavaCodeLibrary
- #'JavaNativeMethodImpl_OpenJDK6'
- #'JavaNativeMethodImpl_SunJDK6'
- #'JavaNativeMethodImpl_OpenJDK7'
- #'JavaNativeMethodImpl_SunJDK7'
)
+
+ "Modified: / 06-09-2013 / 00:14:47 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
extensionMethodNames
@@ -647,6 +633,7 @@
'Unicode16String class' javaName
Context arg1Index
'Float class' javaUnbox:onError:
+ 'ShortFloat class' javaUnbox:onError:
)
! !
@@ -663,7 +650,7 @@
<resource: #obsolete>
"Defines paths to Java .class files (for packages that
- contains Java code"
+ contains Java code"
^#()
"Created: / 15-01-2013 / 18:04:19 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -714,7 +701,7 @@
"Return a SVN repository URL of myself.
(Generated since 2011-04-08)
Do not make the string shorter!!!!!! We have to use fixed-length keyword!!!!!!
- "
+ "
^ '$URL:: $'
!
@@ -723,7 +710,7 @@
"Return a SVN revision number of myself.
This number is updated after a commit"
- ^ "$SVN-Revision:"'Nicht versioniertes Verzeichnis'"$"
+ ^ "$SVN-Revision:"'2242 '"$"
! !
!stx_libjava class methodsFor:'file generation'!
@@ -736,7 +723,7 @@
dict := super basicFileNamesToGenerate.
- dict
+ dict
at:'builder/package.deps.rake' put: #'generate_package_dot_deps_dot_rake'.
^ dict.
@@ -748,20 +735,20 @@
version_HG
- ^ '§Changeset: <not expanded> §'
+ ^ '$Changeset: <not expanded> $'
! !
!stx_libjava class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libjava/stx_libjava.st,v 1.17 2013-04-19 11:40:48 stefan Exp $'
+ ^ '$Header: /cvs/stx/stx/libjava/stx_libjava.st,v 1.18 2013-09-06 00:41:29 vrany Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libjava/stx_libjava.st,v 1.17 2013-04-19 11:40:48 stefan Exp $'
+ ^ '$Header: /cvs/stx/stx/libjava/stx_libjava.st,v 1.18 2013-09-06 00:41:29 vrany Exp $'
!
version_SVN
- ^ '§Id§'
+ ^ 'Id'
! !