--- a/src/stx_libjava.st Wed Sep 07 15:05:01 2011 +0000
+++ b/src/stx_libjava.st Wed Sep 07 16:08:51 2011 +0000
@@ -200,17 +200,17 @@
exclude individual packages in the #excludedFromPrerequisites method."
^ #(
- #'squeak:petitparser' "PPParser - superclass of JavaParser::BlockParser "
- #'stx:goodies/sunit' "TestResource - superclass of LookupIntegrationTestsResource "
- #'stx:libbasic' "Object - superclass of JavaMethodWithHandler "
- #'stx:libbasic2' "ZipArchive - referenced by Java class>>classSource:package:in: "
+ #'squeak:petitparser' "PPParser - superclass of JavaParser "
+ #'stx:goodies/sunit' "TestSuite - referenced by stx_libjava class>>testSuite "
+ #'stx:libbasic' "Set - superclass of JavaAnnotationDictionary "
+ #'stx:libbasic2' "UnboxedIntegerArray - superclass of extended SignedIntegerArray "
#'stx:libbasic3' "MessageTracer - referenced by JavaMethod>>setBreakPoint "
#'stx:libcomp' "ObjectFileLoader - referenced by JavaVM class>>_Runtime_loadFileInternalI: "
#'stx:libhtml' "URL - referenced by JavaEmbeddedFrameView>>setupAppletFrameIn:initializeJava: "
#'stx:libtool' "WorkspaceApplication - referenced by JavaEvaluator>>evaluate:in:receiver:notifying:logged:ifFail: "
- #'stx:libview' "DisplaySurface - superclass of JavaView "
- #'stx:libview2' "Plug - referenced by JavaSourceCodeCache>>findMethodLine:inMethods: "
- #'stx:libwidg' "Label - referenced by JavaVM class>>processEvent: "
+ #'stx:libview' "SimpleView - superclass of JavaTopView "
+ #'stx:libview2' "Icon - referenced by GenericToolbarIconLibrary class>>javaClassBrowserIcon "
+ #'stx:libwidg' "FileSelectionBox - referenced by Java class>>javaProcessForMainOf:argumentString: "
#'stx:libwidg2' "ComboBoxView - referenced by JavaVM class>>processEvent: "
)
! !
@@ -219,16 +219,16 @@
additionalLinkLibraries_bc_dot_mak
- ^ '$(ZLIB_DIR)\$(ZLIB)'
+ ^ '$(ZLIB_DIR)\$(ZLIB) support\fdlibm\fdlibm.lib'
- "Modified (comment): / 01-09-2011 / 22:08:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 07-09-2011 / 17:04:50 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
additionalLinkLibraries_make_dot_proto
- ^ '$(ZLIB_LD_ARG)'
+ ^ '$(ZLIB_LD_ARG) support/fdlibm.a'
- "Modified (format): / 01-09-2011 / 22:09:01 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 07-09-2011 / 17:01:57 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
additionalRules_bc_dot_mak
@@ -242,9 +242,15 @@
cd $(BZ2LIB_DIR)
$(MAKE) $(MAKE_BZ2LIB_ARG) bz2.lib
cd ..\..\libjava
+
+fdlibm:
+ cd support\fdlibm
+ $(MAKE) -f Makefile.bcc
+ cd ..\..\
+
'
- "Modified: / 01-09-2011 / 22:09:15 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 07-09-2011 / 17:04:33 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
additionalRules_make_dot_proto
@@ -252,31 +258,34 @@
zlib:
cd $(ZLIB_DIR); $(MAKE) $(MAKE_ZLIB_ARG)
+fdlibm:
+ $(MAKE) -C support/fdlibm
+
'
- "Modified: / 01-09-2011 / 22:09:25 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 07-09-2011 / 17:01:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
additionalTargets_bc_dot_mak
- ^ '$(ZLIB)'
+ ^ '$(ZLIB) support\fdlibm.lib'
- "Modified (comment): / 01-09-2011 / 22:09:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 07-09-2011 / 17:03:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
additionalTargets_make_dot_proto
- ^ ' zlib'
+ ^ ' zlib fdlibm'
"Created: / 05-09-2006 / 16:05:12 / cg"
- "Modified: / 01-09-2011 / 22:09:38 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 07-09-2011 / 17:00:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
localIncludes
- ^ '-I$(ZLIB_DIR)'
+ ^ '-I$(ZLIB_DIR) -Isupport/fdlibm'
"Created: / 06-09-2006 / 18:18:15 / cg"
- "Modified (format): / 01-09-2011 / 22:13:26 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 07-09-2011 / 17:03:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!stx_libjava class methodsFor:'description - contents'!
@@ -372,11 +381,13 @@
MessageDescription
NoOpTypeBox
PPJavaNode
+ PersonSample
SampleHandler
SelectorParser
Short
SmalltalkAppletContext
SmalltalkAppletStub
+ SmalltalkLookup
(SmalltalkSelectorParserTests autoload)
(TestletTestCaseProxy autoload)
TypeDictionary
@@ -399,6 +410,7 @@
JavaFieldAnnotationContainer
JavaFieldDescriptor
JavaFormalParameterNode
+ JavaIntegerBox
JavaInvalidRefError
JavaMethodAnnotationContainer
JavaMethodDeclarationNode
@@ -579,7 +591,7 @@
"Return a SVN revision number of myself.
This number is updated after a commit"
- ^ "$SVN-Revision:"'1324'"$"
+ ^ "$SVN-Revision:"'1336M'"$"
! !
!stx_libjava class methodsFor:'file generation'!