--- a/GroovyClass.st Wed Feb 13 20:31:46 2013 +0000
+++ b/GroovyClass.st Thu Feb 14 16:15:31 2013 +0000
@@ -72,6 +72,10 @@
!GroovyClass class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -80,3 +84,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/GroovyCompiler.st Wed Feb 13 20:31:46 2013 +0000
+++ b/GroovyCompiler.st Thu Feb 14 16:15:31 2013 +0000
@@ -260,6 +260,10 @@
!GroovyCompiler class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -268,3 +272,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/GroovyEvaluator.st Wed Feb 13 20:31:46 2013 +0000
+++ b/GroovyEvaluator.st Thu Feb 14 16:15:31 2013 +0000
@@ -221,6 +221,10 @@
!GroovyEvaluator class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -229,3 +233,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/GroovyLanguage.st Wed Feb 13 20:31:46 2013 +0000
+++ b/GroovyLanguage.st Thu Feb 14 16:15:31 2013 +0000
@@ -180,6 +180,10 @@
!GroovyLanguage class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -188,3 +192,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/GroovyMetaclass.st Wed Feb 13 20:31:46 2013 +0000
+++ b/GroovyMetaclass.st Thu Feb 14 16:15:31 2013 +0000
@@ -79,6 +79,10 @@
!GroovyMetaclass class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -87,3 +91,4 @@
version_SVN
^ '§Id:: §'
! !
+
--- a/GroovySourceFileWriter.st Wed Feb 13 20:31:46 2013 +0000
+++ b/GroovySourceFileWriter.st Thu Feb 14 16:15:31 2013 +0000
@@ -98,6 +98,10 @@
!GroovySourceFileWriter class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -106,3 +110,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/JUnitTestCaseProxy.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JUnitTestCaseProxy.st Thu Feb 14 16:15:31 2013 +0000
@@ -181,6 +181,10 @@
!JUnitTestCaseProxy class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
--- a/Java.st Wed Feb 13 20:31:46 2013 +0000
+++ b/Java.st Thu Feb 14 16:15:31 2013 +0000
@@ -1588,6 +1588,10 @@
^ '$Header$'
!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
--- a/JavaAnnotation.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaAnnotation.st Thu Feb 14 16:15:31 2013 +0000
@@ -150,6 +150,10 @@
!JavaAnnotation class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -158,3 +162,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/JavaAnnotationArrayValue.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaAnnotationArrayValue.st Thu Feb 14 16:15:31 2013 +0000
@@ -91,6 +91,10 @@
!JavaAnnotationArrayValue class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -99,3 +103,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/JavaAnnotationClassValue.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaAnnotationClassValue.st Thu Feb 14 16:15:31 2013 +0000
@@ -73,6 +73,10 @@
!JavaAnnotationClassValue class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -81,3 +85,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/JavaAnnotationContainer.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaAnnotationContainer.st Thu Feb 14 16:15:31 2013 +0000
@@ -145,6 +145,10 @@
!JavaAnnotationContainer class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -153,3 +157,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/JavaAnnotationDefault.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaAnnotationDefault.st Thu Feb 14 16:15:31 2013 +0000
@@ -90,6 +90,10 @@
!JavaAnnotationDefault class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -98,3 +102,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/JavaAnnotationDictionary.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaAnnotationDictionary.st Thu Feb 14 16:15:31 2013 +0000
@@ -94,6 +94,10 @@
!JavaAnnotationDictionary class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -102,3 +106,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/JavaAnnotationEnumValue.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaAnnotationEnumValue.st Thu Feb 14 16:15:31 2013 +0000
@@ -27,10 +27,6 @@
category:'Languages-Java-Reader-Support'
!
-JavaAnnotationEnumValue comment:'Watch out!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! name in this class represents type.
-'
-!
-
!JavaAnnotationEnumValue class methodsFor:'documentation'!
copyright
@@ -93,6 +89,10 @@
!JavaAnnotationEnumValue class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -101,3 +101,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/JavaAnnotationNestedAnnotationValue.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaAnnotationNestedAnnotationValue.st Thu Feb 14 16:15:31 2013 +0000
@@ -77,6 +77,10 @@
!JavaAnnotationNestedAnnotationValue class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
--- a/JavaAnnotationPrimitiveValue.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaAnnotationPrimitiveValue.st Thu Feb 14 16:15:31 2013 +0000
@@ -77,6 +77,10 @@
!JavaAnnotationPrimitiveValue class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -85,3 +89,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/JavaAnnotationValue.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaAnnotationValue.st Thu Feb 14 16:15:31 2013 +0000
@@ -101,6 +101,10 @@
!JavaAnnotationValue class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -109,3 +113,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/JavaAntProjectResource.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaAntProjectResource.st Thu Feb 14 16:15:31 2013 +0000
@@ -183,6 +183,10 @@
!JavaAntProjectResource class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
--- a/JavaArray.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaArray.st Thu Feb 14 16:15:31 2013 +0000
@@ -316,6 +316,10 @@
!JavaArray class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -324,3 +328,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/JavaBehavior.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaBehavior.st Thu Feb 14 16:15:31 2013 +0000
@@ -362,7 +362,7 @@
!
version_CVS
- ^ '§Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/JavaBehavior.st,v 1.3 2009/10/09 14:04:26 cg Exp §'
+ ^ '$Header$'
!
version_HG
--- a/JavaByte.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaByte.st Thu Feb 14 16:15:31 2013 +0000
@@ -115,6 +115,10 @@
!JavaByte class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -123,3 +127,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/JavaByteCodeDisassembler.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaByteCodeDisassembler.st Thu Feb 14 16:15:31 2013 +0000
@@ -1849,6 +1849,10 @@
!JavaByteCodeDisassembler class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -1858,4 +1862,5 @@
^ '§Id§'
! !
+
JavaByteCodeDisassembler initialize!
--- a/JavaByteCodeDisassemblerTests.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaByteCodeDisassemblerTests.st Thu Feb 14 16:15:31 2013 +0000
@@ -855,6 +855,10 @@
!JavaByteCodeDisassemblerTests class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -863,3 +867,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/JavaByteCodeEnumerator.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaByteCodeEnumerator.st Thu Feb 14 16:15:31 2013 +0000
@@ -143,6 +143,10 @@
^ '$Header$'
!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -151,3 +155,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/JavaByteCodePreresolver.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaByteCodePreresolver.st Thu Feb 14 16:15:31 2013 +0000
@@ -190,6 +190,10 @@
!JavaByteCodePreresolver class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -198,3 +202,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/JavaByteCodeProcessor.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaByteCodeProcessor.st Thu Feb 14 16:15:31 2013 +0000
@@ -2559,6 +2559,10 @@
^ '$Header$'
!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -2568,4 +2572,5 @@
^ '§Id§'
! !
+
JavaByteCodeProcessor initialize!
--- a/JavaByteCodeProcessorAdapter.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaByteCodeProcessorAdapter.st Thu Feb 14 16:15:31 2013 +0000
@@ -1082,6 +1082,10 @@
!JavaByteCodeProcessorAdapter class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -1090,3 +1094,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/JavaByteCodeProcessorTests.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaByteCodeProcessorTests.st Thu Feb 14 16:15:31 2013 +0000
@@ -113,6 +113,10 @@
!JavaByteCodeProcessorTests class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
--- a/JavaClass.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaClass.st Thu Feb 14 16:15:31 2013 +0000
@@ -2677,6 +2677,10 @@
^ '$Header$'
!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
--- a/JavaClassAccessor.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaClassAccessor.st Thu Feb 14 16:15:31 2013 +0000
@@ -216,6 +216,10 @@
!JavaClassAccessor class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -224,3 +228,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/JavaClassAnnotationContainer.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaClassAnnotationContainer.st Thu Feb 14 16:15:31 2013 +0000
@@ -55,6 +55,10 @@
!JavaClassAnnotationContainer class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -63,3 +67,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/JavaClassContentRef2.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaClassContentRef2.st Thu Feb 14 16:15:31 2013 +0000
@@ -177,6 +177,10 @@
!JavaClassContentRef2 class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -185,3 +189,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/JavaClassLoadingTests.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaClassLoadingTests.st Thu Feb 14 16:15:31 2013 +0000
@@ -109,6 +109,10 @@
!JavaClassLoadingTests class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -117,3 +121,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/JavaClassPathBundle.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaClassPathBundle.st Thu Feb 14 16:15:31 2013 +0000
@@ -273,6 +273,10 @@
!JavaClassPathBundle class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
--- a/JavaClassQuery.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaClassQuery.st Thu Feb 14 16:15:31 2013 +0000
@@ -81,6 +81,10 @@
!JavaClassQuery class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -89,3 +93,4 @@
version_SVN
^ '§Id:: §'
! !
+
--- a/JavaClassReader.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaClassReader.st Thu Feb 14 16:15:31 2013 +0000
@@ -2428,7 +2428,7 @@
!
version_CVS
- ^ '§Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/JavaClassReader.st,v 1.92 2009/10/09 14:21:53 cg Exp §'
+ ^ '$Header$'
!
version_HG
--- a/JavaClassReaderTests.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaClassReaderTests.st Thu Feb 14 16:15:31 2013 +0000
@@ -235,6 +235,10 @@
!JavaClassReaderTests class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -243,3 +247,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/JavaClassRef2.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaClassRef2.st Thu Feb 14 16:15:31 2013 +0000
@@ -245,6 +245,10 @@
!JavaClassRef2 class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -253,3 +257,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/JavaClassRefTests.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaClassRefTests.st Thu Feb 14 16:15:31 2013 +0000
@@ -312,6 +312,10 @@
!JavaClassRefTests class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -320,3 +324,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/JavaClassRegistry.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaClassRegistry.st Thu Feb 14 16:15:31 2013 +0000
@@ -467,6 +467,10 @@
!JavaClassRegistry class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
--- a/JavaClassReloader.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaClassReloader.st Thu Feb 14 16:15:31 2013 +0000
@@ -369,6 +369,10 @@
!JavaClassReloader class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -377,3 +381,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/JavaCodeBundle.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaCodeBundle.st Thu Feb 14 16:15:31 2013 +0000
@@ -203,6 +203,10 @@
!JavaCodeBundle class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
--- a/JavaCodeLibrary.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaCodeLibrary.st Thu Feb 14 16:15:31 2013 +0000
@@ -129,6 +129,10 @@
!JavaCodeLibrary class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
--- a/JavaCodeLibraryOrBundle.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaCodeLibraryOrBundle.st Thu Feb 14 16:15:31 2013 +0000
@@ -136,6 +136,10 @@
!JavaCodeLibraryOrBundle class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
--- a/JavaCompiler_Eclipse.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaCompiler_Eclipse.st Thu Feb 14 16:15:31 2013 +0000
@@ -134,6 +134,10 @@
!JavaCompiler_Eclipse class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -142,3 +146,4 @@
version_SVN
^ '§Id:: §'
! !
+
--- a/JavaConstantPool.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaConstantPool.st Thu Feb 14 16:15:31 2013 +0000
@@ -297,6 +297,10 @@
^ '$Header$'
!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -305,3 +309,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/JavaConstants.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaConstants.st Thu Feb 14 16:15:31 2013 +0000
@@ -174,6 +174,10 @@
!JavaConstants class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -183,4 +187,5 @@
^ '§Id§'
! !
+
JavaConstants initialize!
--- a/JavaContext.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaContext.st Thu Feb 14 16:15:31 2013 +0000
@@ -592,6 +592,10 @@
^ '$Header$'
!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -600,3 +604,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/JavaDecompiler.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaDecompiler.st Thu Feb 14 16:15:31 2013 +0000
@@ -1278,6 +1278,10 @@
^ '$Header$'
!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -1288,4 +1292,5 @@
! !
+
JavaDecompiler initialize!
--- a/JavaDescriptor.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaDescriptor.st Thu Feb 14 16:15:31 2013 +0000
@@ -306,6 +306,10 @@
!JavaDescriptor class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -315,4 +319,5 @@
^ '§Id§'
! !
+
JavaDescriptor initialize!
--- a/JavaEmbeddedFrameView.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaEmbeddedFrameView.st Thu Feb 14 16:15:31 2013 +0000
@@ -628,6 +628,10 @@
^ '$Header$'
!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -636,3 +640,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/JavaError.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaError.st Thu Feb 14 16:15:31 2013 +0000
@@ -55,6 +55,10 @@
!JavaError class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -63,3 +67,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/JavaExceptionTableEntry.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaExceptionTableEntry.st Thu Feb 14 16:15:31 2013 +0000
@@ -176,6 +176,10 @@
^ '$Header$'
!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -184,3 +188,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/JavaExceptionTests.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaExceptionTests.st Thu Feb 14 16:15:31 2013 +0000
@@ -65,7 +65,6 @@
"Created: / 30-03-2012 / 13:38:08 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!JavaExceptionTests methodsFor:'callbacks'!
call: trhower with: aBoolean
@@ -300,6 +299,10 @@
!JavaExceptionTests class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -308,3 +311,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/JavaField.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaField.st Thu Feb 14 16:15:31 2013 +0000
@@ -376,7 +376,7 @@
!
version_CVS
- ^ '§Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/JavaField.st,v 1.17 2009/10/09 14:04:34 cg Exp §'
+ ^ '$Header$'
!
version_HG
--- a/JavaFieldAnnotationContainer.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaFieldAnnotationContainer.st Thu Feb 14 16:15:31 2013 +0000
@@ -55,6 +55,10 @@
!JavaFieldAnnotationContainer class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -63,3 +67,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/JavaFieldDescriptor.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaFieldDescriptor.st Thu Feb 14 16:15:31 2013 +0000
@@ -184,6 +184,10 @@
!JavaFieldDescriptor class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -192,3 +196,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/JavaFieldDescriptorWithUnionType.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaFieldDescriptorWithUnionType.st Thu Feb 14 16:15:31 2013 +0000
@@ -97,6 +97,10 @@
!JavaFieldDescriptorWithUnionType class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -105,3 +109,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/JavaFieldRef2.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaFieldRef2.st Thu Feb 14 16:15:31 2013 +0000
@@ -175,6 +175,10 @@
!JavaFieldRef2 class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -184,4 +188,5 @@
^ '§Id§'
! !
+
JavaFieldRef2 initialize!
--- a/JavaFieldRefTests.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaFieldRefTests.st Thu Feb 14 16:15:31 2013 +0000
@@ -449,6 +449,10 @@
!JavaFieldRefTests class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -457,3 +461,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/JavaFinalizationRegistry.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaFinalizationRegistry.st Thu Feb 14 16:15:31 2013 +0000
@@ -478,6 +478,10 @@
!JavaFinalizationRegistry class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -487,4 +491,5 @@
^ '§Id:: §'
! !
+
JavaFinalizationRegistry initialize!
--- a/JavaFreshlyInitializedResource.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaFreshlyInitializedResource.st Thu Feb 14 16:15:31 2013 +0000
@@ -64,6 +64,10 @@
!JavaFreshlyInitializedResource class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -72,3 +76,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/JavaInitializedResource.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaInitializedResource.st Thu Feb 14 16:15:31 2013 +0000
@@ -82,6 +82,10 @@
!JavaInitializedResource class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
--- a/JavaInterfaceMethodRef2.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaInterfaceMethodRef2.st Thu Feb 14 16:15:31 2013 +0000
@@ -101,6 +101,10 @@
!JavaInterfaceMethodRef2 class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -109,3 +113,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/JavaInterfaceMethodRefTests.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaInterfaceMethodRefTests.st Thu Feb 14 16:15:31 2013 +0000
@@ -193,6 +193,10 @@
!JavaInterfaceMethodRefTests class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -201,3 +205,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/JavaInvalidRefError.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaInvalidRefError.st Thu Feb 14 16:15:31 2013 +0000
@@ -73,6 +73,10 @@
!JavaInvalidRefError class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -81,3 +85,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/JavaJUnitTests.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaJUnitTests.st Thu Feb 14 16:15:31 2013 +0000
@@ -131,6 +131,10 @@
!JavaJUnitTests class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -139,3 +143,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/JavaLanguage.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaLanguage.st Thu Feb 14 16:15:31 2013 +0000
@@ -207,6 +207,10 @@
!JavaLanguage class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -215,3 +219,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/JavaLibraries.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaLibraries.st Thu Feb 14 16:15:31 2013 +0000
@@ -160,6 +160,10 @@
!JavaLibraries class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -168,3 +172,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/JavaLibrariesResource.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaLibrariesResource.st Thu Feb 14 16:15:31 2013 +0000
@@ -66,6 +66,10 @@
!JavaLibrariesResource class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
--- a/JavaLocalVariableTable.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaLocalVariableTable.st Thu Feb 14 16:15:31 2013 +0000
@@ -90,6 +90,10 @@
^ '$Header$'
!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -98,3 +102,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/JavaLocalVariableTableEntry.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaLocalVariableTableEntry.st Thu Feb 14 16:15:31 2013 +0000
@@ -116,6 +116,10 @@
^ '$Header$'
!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -124,3 +128,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/JavaLookup.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaLookup.st Thu Feb 14 16:15:31 2013 +0000
@@ -818,6 +818,10 @@
!JavaLookup class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -826,3 +830,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/JavaLookupResolutionAlgorithmTests.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaLookupResolutionAlgorithmTests.st Thu Feb 14 16:15:31 2013 +0000
@@ -194,6 +194,10 @@
!JavaLookupResolutionAlgorithmTests class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -202,3 +206,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/JavaLookupTests.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaLookupTests.st Thu Feb 14 16:15:31 2013 +0000
@@ -426,6 +426,10 @@
!JavaLookupTests class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -434,3 +438,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/JavaLookupTestsResource.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaLookupTestsResource.st Thu Feb 14 16:15:31 2013 +0000
@@ -173,6 +173,10 @@
!JavaLookupTestsResource class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -182,4 +186,5 @@
^ '§Id§'
! !
+
JavaLookupTestsResource initialize!
--- a/JavaMathSupport.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaMathSupport.st Thu Feb 14 16:15:31 2013 +0000
@@ -123,6 +123,10 @@
!JavaMathSupport class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -131,3 +135,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/JavaMetaclass.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaMetaclass.st Thu Feb 14 16:15:31 2013 +0000
@@ -138,6 +138,10 @@
!JavaMetaclass class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -146,3 +150,4 @@
version_SVN
^ '§Id:: §'
! !
+
--- a/JavaMethod.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaMethod.st Thu Feb 14 16:15:31 2013 +0000
@@ -2617,7 +2617,7 @@
!
version_CVS
- ^ '§Header: /cvs/stx/stx/libjava/JavaMethod.st,v 1.108 2011/08/19 13:49:39 cg Exp §'
+ ^ '$Header$'
!
version_HG
@@ -2629,4 +2629,5 @@
^ '§Id§'
! !
+
JavaMethod initialize!
--- a/JavaMethodAnnotationContainer.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaMethodAnnotationContainer.st Thu Feb 14 16:15:31 2013 +0000
@@ -135,6 +135,10 @@
!JavaMethodAnnotationContainer class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -143,3 +147,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/JavaMethodDeclarationNode.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaMethodDeclarationNode.st Thu Feb 14 16:15:31 2013 +0000
@@ -109,6 +109,10 @@
!JavaMethodDeclarationNode class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -117,3 +121,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/JavaMethodDescriptor.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaMethodDescriptor.st Thu Feb 14 16:15:31 2013 +0000
@@ -228,6 +228,10 @@
!JavaMethodDescriptor class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -236,3 +240,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/JavaMethodRef2.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaMethodRef2.st Thu Feb 14 16:15:31 2013 +0000
@@ -137,6 +137,10 @@
!JavaMethodRef2 class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -145,3 +149,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/JavaMethodRefTests.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaMethodRefTests.st Thu Feb 14 16:15:31 2013 +0000
@@ -425,6 +425,10 @@
!JavaMethodRefTests class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -433,3 +437,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/JavaMethodWithException.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaMethodWithException.st Thu Feb 14 16:15:31 2013 +0000
@@ -101,6 +101,10 @@
^ '$Header$'
!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -110,4 +114,5 @@
^ '§Id§'
! !
+
JavaMethodWithException initialize!
--- a/JavaMethodWithHandler.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaMethodWithHandler.st Thu Feb 14 16:15:31 2013 +0000
@@ -90,6 +90,10 @@
^ '$Header$'
!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -100,4 +104,5 @@
! !
+
JavaMethodWithHandler initialize!
--- a/JavaMirror.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaMirror.st Thu Feb 14 16:15:31 2013 +0000
@@ -834,6 +834,10 @@
!JavaMirror class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -842,3 +846,4 @@
version_SVN
^ '§Id:: §'
! !
+
--- a/JavaMonitor.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaMonitor.st Thu Feb 14 16:15:31 2013 +0000
@@ -414,6 +414,10 @@
!JavaMonitor class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -423,4 +427,5 @@
^ '§Id§'
! !
+
JavaMonitor initialize!
--- a/JavaMonitorsTests.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaMonitorsTests.st Thu Feb 14 16:15:31 2013 +0000
@@ -567,6 +567,10 @@
!JavaMonitorsTests class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -575,3 +579,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/JavaNameAndType2.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaNameAndType2.st Thu Feb 14 16:15:31 2013 +0000
@@ -247,6 +247,10 @@
!JavaNameAndType2 class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -255,3 +259,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/JavaNativeMemory.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaNativeMemory.st Thu Feb 14 16:15:31 2013 +0000
@@ -589,6 +589,10 @@
!JavaNativeMemory class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -598,4 +602,5 @@
^ '§Id§'
! !
+
JavaNativeMemory initialize!
--- a/JavaNativeMemoryTests.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaNativeMemoryTests.st Thu Feb 14 16:15:31 2013 +0000
@@ -161,6 +161,10 @@
!JavaNativeMemoryTests class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -169,3 +173,4 @@
version_SVN
^ '§Id:: §'
! !
+
--- a/JavaNativeMethod.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaNativeMethod.st Thu Feb 14 16:15:31 2013 +0000
@@ -621,6 +621,10 @@
^ '$Header$'
!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
--- a/JavaNativeMethodImpl_OpenJDK6.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaNativeMethodImpl_OpenJDK6.st Thu Feb 14 16:15:31 2013 +0000
@@ -20637,6 +20637,10 @@
!JavaNativeMethodImpl_OpenJDK6 class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
--- a/JavaNativeMethodImpl_OpenJDK7.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaNativeMethodImpl_OpenJDK7.st Thu Feb 14 16:15:31 2013 +0000
@@ -551,6 +551,10 @@
!JavaNativeMethodImpl_OpenJDK7 class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
--- a/JavaNativeMethodImpl_SunJDK6.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaNativeMethodImpl_SunJDK6.st Thu Feb 14 16:15:31 2013 +0000
@@ -396,6 +396,10 @@
!JavaNativeMethodImpl_SunJDK6 class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
--- a/JavaNativeMethodImpl_SunJDK7.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaNativeMethodImpl_SunJDK7.st Thu Feb 14 16:15:31 2013 +0000
@@ -55,6 +55,10 @@
!JavaNativeMethodImpl_SunJDK7 class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
--- a/JavaNioSupport.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaNioSupport.st Thu Feb 14 16:15:31 2013 +0000
@@ -127,6 +127,10 @@
!JavaNioSupport class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -135,3 +139,4 @@
version_SVN
^ '§Id:: §'
! !
+
--- a/JavaObject.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaObject.st Thu Feb 14 16:15:31 2013 +0000
@@ -477,6 +477,10 @@
^ '$Header$'
!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -485,3 +489,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/JavaObjectDictionary.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaObjectDictionary.st Thu Feb 14 16:15:31 2013 +0000
@@ -112,6 +112,10 @@
!JavaObjectDictionary class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -120,3 +124,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/JavaPackage.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaPackage.st Thu Feb 14 16:15:31 2013 +0000
@@ -292,6 +292,10 @@
!JavaPackage class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -301,4 +305,5 @@
^ '§Id§'
! !
+
JavaPackage initialize!
--- a/JavaPopUpView.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaPopUpView.st Thu Feb 14 16:15:31 2013 +0000
@@ -150,6 +150,10 @@
^ '$Header$'
!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -158,3 +162,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/JavaProcess.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaProcess.st Thu Feb 14 16:15:31 2013 +0000
@@ -265,6 +265,10 @@
^ '$Header$'
!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -273,3 +277,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/JavaRef2.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaRef2.st Thu Feb 14 16:15:31 2013 +0000
@@ -290,6 +290,10 @@
!JavaRef2 class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -298,3 +302,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/JavaRefMock.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaRefMock.st Thu Feb 14 16:15:31 2013 +0000
@@ -100,6 +100,10 @@
!JavaRefMock class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -108,3 +112,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/JavaRefsAndConstantPoolTestCase.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaRefsAndConstantPoolTestCase.st Thu Feb 14 16:15:31 2013 +0000
@@ -396,6 +396,10 @@
!JavaRefsAndConstantPoolTestCase class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
--- a/JavaRelease.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaRelease.st Thu Feb 14 16:15:31 2013 +0000
@@ -1608,6 +1608,10 @@
!JavaRelease class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_SVN
^ '§Id:: §'
! !
--- a/JavaResolver.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaResolver.st Thu Feb 14 16:15:31 2013 +0000
@@ -619,6 +619,10 @@
!JavaResolver class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
--- a/JavaRuntimeConstantPoolTests.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaRuntimeConstantPoolTests.st Thu Feb 14 16:15:31 2013 +0000
@@ -126,6 +126,10 @@
!JavaRuntimeConstantPoolTests class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -134,3 +138,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/JavaShort.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaShort.st Thu Feb 14 16:15:31 2013 +0000
@@ -115,6 +115,10 @@
!JavaShort class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -123,3 +127,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/JavaSlotIndexCache.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaSlotIndexCache.st Thu Feb 14 16:15:31 2013 +0000
@@ -324,6 +324,10 @@
^ '$Header$'
!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -332,3 +336,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/JavaSocket.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaSocket.st Thu Feb 14 16:15:31 2013 +0000
@@ -96,6 +96,10 @@
!JavaSocket class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -105,4 +109,5 @@
^ '§Id§'
! !
+
JavaSocket initialize!
--- a/JavaSourceCodeCache.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaSourceCodeCache.st Thu Feb 14 16:15:31 2013 +0000
@@ -137,6 +137,10 @@
!JavaSourceCodeCache class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -145,3 +149,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/JavaSourceFileWriter.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaSourceFileWriter.st Thu Feb 14 16:15:31 2013 +0000
@@ -104,6 +104,10 @@
!JavaSourceFileWriter class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -112,3 +116,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/JavaStartup.st Wed Feb 13 20:31:46 2013 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,131 +0,0 @@
-"
- COPYRIGHT (c) 1996-2011 by Claus Gittinger
-
- New code and modifications done at SWING Research Group [1]:
-
- COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
- SWING Research Group, Czech Technical University in Prague
-
- This software is furnished under a license and may be used
- only in accordance with the terms of that license and with the
- inclusion of the above copyright notice. This software may not
- be provided or otherwise made available to, or used by, any
- other person. No title to or ownership of the software is
- hereby transferred.
-
- [1] Code written at SWING Research Group contains a signature
- of one of the above copright owners. For exact set of such code,
- see the differences between this version and version stx:libjava
- as of 1.9.2010
-"
-"{ Package: 'stx:libjava' }"
-
-StandaloneStartup subclass:#JavaStartup
- instanceVariableNames:''
- classVariableNames:'ClassPath'
- poolDictionaries:''
- category:'Languages-Java-Support'
-!
-
-!JavaStartup class methodsFor:'documentation'!
-
-copyright
-"
- COPYRIGHT (c) 1996-2011 by Claus Gittinger
-
- New code and modifications done at SWING Research Group [1]:
-
- COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
- SWING Research Group, Czech Technical University in Prague
-
- This software is furnished under a license and may be used
- only in accordance with the terms of that license and with the
- inclusion of the above copyright notice. This software may not
- be provided or otherwise made available to, or used by, any
- other person. No title to or ownership of the software is
- hereby transferred.
-
- [1] Code written at SWING Research Group contains a signature
- of one of the above copright owners. For exact set of such code,
- see the differences between this version and version stx:libjava
- as of 1.9.2010
-
-"
-! !
-
-!JavaStartup class methodsFor:'constants & defaults'!
-
-applicationRegistryPath
- "the key under which this application stores its process ID in the registry
- as a collection of path-components.
- i.e. if #('foo' 'bar' 'baz') is returned here, the current applications ID will be stored
- in HKEY_CURRENT_USER\Software\foo\bar\baz\CurrentID.
- (would also be used as a relative path for a temporary lock file under unix).
- Used to detect if another instance of this application is already running."
-
- ^ #('stx' 'java_x')
-
- "Created: / 07-02-2011 / 10:55:08 / Marcel Hlopko <hlopik@gmail.com>"
-!
-
-applicationUUID
- "answer an application-specific unique uuid.
- This is used as the name of some exclusive OS-resource, which is used to find out,
- if another instance of this application is already running.
- Under win32, a mutex is used; under unix, an exclusive file in the tempDir could be used."
-
- ^ 'ST_X_JAVA_X'.
-
- "Created: / 07-02-2011 / 10:52:50 / Marcel Hlopko <hlopik@gmail.com>"
-! !
-
-!JavaStartup class methodsFor:'startup'!
-
-main: argv
- "Currently only -c option for classpath setting working"
-
- | class arguments classAndArguments classpath classpathFromEnv |
-
- classpath := OrderedCollection new.
- classpathFromEnv := OperatingSystem getEnvironment: #CLASSPATH.
- classpathFromEnv isNil ifFalse: [
- (classpathFromEnv asArrayOfSubstringsSeparatedBy: $:) do: [
- :each |
- classpath add: each
- ]
- ].
- classAndArguments := OrderedCollection new.
- (GetOpt new)
- at: $c
- put: [
- :opt :arg |
- (arg asArrayOfSubstringsSeparatedBy: $:) do: [:each | classpath add: each ]
- ];
- at: $? put: [:arg | self error: 'not yet implemented' ];
- default: [:arg | classAndArguments add: arg ];
- parse: argv.
- class := classAndArguments at: 1.
- arguments := classAndArguments
- removeFirst;
- yourself.
- Java flushAllJavaResources.
- self breakPoint: #mh.
- Java initialize.
- JavaVM initializeVM.
- classpath do: [:each | Java addToClassPath: each ].
- (JavaVM classForName: class) main: arguments asArray.
-
- "Created: / 07-02-2011 / 10:55:41 / Marcel Hlopko <hlopik@gmail.com>"
- "Modified: / 08-02-2011 / 00:55:42 / Marcel Hlopko <hlopik@gmail.com>"
-! !
-
-!JavaStartup class methodsFor:'documentation'!
-
-version_HG
-
- ^ '$Changeset: <not expanded> $'
-!
-
-version_SVN
- ^ '§Id§'
-! !
--- a/JavaStringRef2.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaStringRef2.st Thu Feb 14 16:15:31 2013 +0000
@@ -156,6 +156,10 @@
!JavaStringRef2 class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -164,3 +168,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/JavaTestCaseProxy.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaTestCaseProxy.st Thu Feb 14 16:15:31 2013 +0000
@@ -200,6 +200,10 @@
!JavaTestCaseProxy class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
--- a/JavaTestsLoader.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaTestsLoader.st Thu Feb 14 16:15:31 2013 +0000
@@ -245,6 +245,10 @@
!JavaTestsLoader class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
--- a/JavaTestsResource.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaTestsResource.st Thu Feb 14 16:15:31 2013 +0000
@@ -155,6 +155,10 @@
!JavaTestsResource class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
--- a/JavaTopView.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaTopView.st Thu Feb 14 16:15:31 2013 +0000
@@ -141,6 +141,10 @@
^ '$Header$'
!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -149,3 +153,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/JavaUTF8Tests.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaUTF8Tests.st Thu Feb 14 16:15:31 2013 +0000
@@ -138,6 +138,10 @@
!JavaUTF8Tests class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -146,3 +150,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/JavaUnhandledExceptionError.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaUnhandledExceptionError.st Thu Feb 14 16:15:31 2013 +0000
@@ -55,6 +55,10 @@
!JavaUnhandledExceptionError class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -63,3 +67,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/JavaUnresolvedClassConstant.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaUnresolvedClassConstant.st Thu Feb 14 16:15:31 2013 +0000
@@ -349,6 +349,10 @@
^ '$Header$'
!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -357,3 +361,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/JavaUnresolvedConstant.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaUnresolvedConstant.st Thu Feb 14 16:15:31 2013 +0000
@@ -263,6 +263,10 @@
^ '$Header$'
!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -271,3 +275,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/JavaUnresolvedStringConstant.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaUnresolvedStringConstant.st Thu Feb 14 16:15:31 2013 +0000
@@ -104,6 +104,10 @@
^ '$Header$'
!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -112,3 +116,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/JavaUtilities.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaUtilities.st Thu Feb 14 16:15:31 2013 +0000
@@ -347,6 +347,10 @@
!JavaUtilities class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -355,3 +359,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/JavaVM.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaVM.st Thu Feb 14 16:15:31 2013 +0000
@@ -6628,7 +6628,7 @@
!
version_CVS
- ^ '§Header: /cvs/stx/stx/libjava/JavaVM.st,v 1.186 2011/08/22 14:49:28 vrany Exp §'
+ ^ '$Header$'
!
version_HG
--- a/JavaVMData.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaVMData.st Thu Feb 14 16:15:31 2013 +0000
@@ -84,6 +84,10 @@
!JavaVMData class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
--- a/JavaView.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaView.st Thu Feb 14 16:15:31 2013 +0000
@@ -263,6 +263,10 @@
^ '$Header$'
!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -271,3 +275,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/JavaZipSupport.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavaZipSupport.st Thu Feb 14 16:15:31 2013 +0000
@@ -41,23 +41,6 @@
privateIn:JavaZipSupport
!
-!JavaZipSupport primitiveDefinitions!
-%{
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <string.h>
-#include "zlib.h"
-
-#define MIN2(x, y) ((x) < (y) ? (x) : (y))
-
-#define DEF_MEM_LEVEL 8
-#define __zStreamVal(x) ((z_stream *)(__ExternalBytesInstPtr(x)->e_address))
-
-%}
-! !
-
!JavaZipSupport class methodsFor:'documentation'!
copyright
@@ -919,6 +902,10 @@
!JavaZipSupport class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -927,3 +914,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/JavadocDeclarationNode.st Wed Feb 13 20:31:46 2013 +0000
+++ b/JavadocDeclarationNode.st Thu Feb 14 16:15:31 2013 +0000
@@ -55,6 +55,10 @@
!JavadocDeclarationNode class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -63,3 +67,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/Make.proto Wed Feb 13 20:31:46 2013 +0000
+++ b/Make.proto Thu Feb 14 16:15:31 2013 +0000
@@ -132,13 +132,13 @@
postMake:: cleanjunk
prereq: $(REQUIRED_SUPPORT_DIRS)
- cd ../libdb/libodbc && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../libbasic && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../libcomp && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../libbasic2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../libdb && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../libview && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../libdb/libsqlite && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd ../libdb/libodbc && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../libboss && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../libview2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../libbasic3 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
--- a/PPJavaNode.st Wed Feb 13 20:31:46 2013 +0000
+++ b/PPJavaNode.st Thu Feb 14 16:15:31 2013 +0000
@@ -88,6 +88,10 @@
!PPJavaNode class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -96,3 +100,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/ProxyMethod.st Wed Feb 13 20:31:46 2013 +0000
+++ b/ProxyMethod.st Thu Feb 14 16:15:31 2013 +0000
@@ -307,6 +307,10 @@
!ProxyMethod class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
--- a/ProxyMethodAndNode.st Wed Feb 13 20:31:46 2013 +0000
+++ b/ProxyMethodAndNode.st Thu Feb 14 16:15:31 2013 +0000
@@ -115,6 +115,10 @@
!ProxyMethodAndNode class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -123,3 +127,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/ProxyMethodBlockInvocationNode.st Wed Feb 13 20:31:46 2013 +0000
+++ b/ProxyMethodBlockInvocationNode.st Thu Feb 14 16:15:31 2013 +0000
@@ -107,6 +107,10 @@
!ProxyMethodBlockInvocationNode class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -115,3 +119,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/ProxyMethodCompiler.st Wed Feb 13 20:31:46 2013 +0000
+++ b/ProxyMethodCompiler.st Thu Feb 14 16:15:31 2013 +0000
@@ -248,6 +248,10 @@
!ProxyMethodCompiler class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -256,3 +260,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/ProxyMethodConditionNode.st Wed Feb 13 20:31:46 2013 +0000
+++ b/ProxyMethodConditionNode.st Thu Feb 14 16:15:31 2013 +0000
@@ -82,6 +82,10 @@
!ProxyMethodConditionNode class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -90,3 +94,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/ProxyMethodGuardNode.st Wed Feb 13 20:31:46 2013 +0000
+++ b/ProxyMethodGuardNode.st Thu Feb 14 16:15:31 2013 +0000
@@ -149,6 +149,10 @@
!ProxyMethodGuardNode class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -157,3 +161,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/ProxyMethodInvocationNode.st Wed Feb 13 20:31:46 2013 +0000
+++ b/ProxyMethodInvocationNode.st Thu Feb 14 16:15:31 2013 +0000
@@ -73,6 +73,10 @@
!ProxyMethodInvocationNode class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -81,3 +85,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/ProxyMethodJavaFieldAccessor.st Wed Feb 13 20:31:46 2013 +0000
+++ b/ProxyMethodJavaFieldAccessor.st Thu Feb 14 16:15:31 2013 +0000
@@ -65,6 +65,10 @@
!ProxyMethodJavaFieldAccessor class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -73,3 +77,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/ProxyMethodJavaFieldGetter.st Wed Feb 13 20:31:46 2013 +0000
+++ b/ProxyMethodJavaFieldGetter.st Thu Feb 14 16:15:31 2013 +0000
@@ -75,6 +75,10 @@
!ProxyMethodJavaFieldGetter class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -83,3 +87,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/ProxyMethodJavaFieldSetter.st Wed Feb 13 20:31:46 2013 +0000
+++ b/ProxyMethodJavaFieldSetter.st Thu Feb 14 16:15:31 2013 +0000
@@ -74,6 +74,10 @@
!ProxyMethodJavaFieldSetter class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -82,3 +86,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/ProxyMethodJavaMethodInvocationNode.st Wed Feb 13 20:31:46 2013 +0000
+++ b/ProxyMethodJavaMethodInvocationNode.st Thu Feb 14 16:15:31 2013 +0000
@@ -291,6 +291,10 @@
!ProxyMethodJavaMethodInvocationNode class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -299,3 +303,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/ProxyMethodJavaTypeCheckNode.st Wed Feb 13 20:31:46 2013 +0000
+++ b/ProxyMethodJavaTypeCheckNode.st Thu Feb 14 16:15:31 2013 +0000
@@ -122,6 +122,10 @@
!ProxyMethodJavaTypeCheckNode class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -130,3 +134,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/ProxyMethodMethodInvocationNode.st Wed Feb 13 20:31:46 2013 +0000
+++ b/ProxyMethodMethodInvocationNode.st Thu Feb 14 16:15:31 2013 +0000
@@ -118,6 +118,10 @@
!ProxyMethodMethodInvocationNode class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -126,3 +130,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/ProxyMethodNode.st Wed Feb 13 20:31:46 2013 +0000
+++ b/ProxyMethodNode.st Thu Feb 14 16:15:31 2013 +0000
@@ -136,6 +136,10 @@
!ProxyMethodNode class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -144,3 +148,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/ProxyMethodTypeCheckNode.st Wed Feb 13 20:31:46 2013 +0000
+++ b/ProxyMethodTypeCheckNode.st Thu Feb 14 16:15:31 2013 +0000
@@ -133,6 +133,10 @@
!ProxyMethodTypeCheckNode class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -141,3 +145,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/SmalltalkAppletContext.st Wed Feb 13 20:31:46 2013 +0000
+++ b/SmalltalkAppletContext.st Thu Feb 14 16:15:31 2013 +0000
@@ -111,6 +111,10 @@
^ '$Header$'
!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -119,3 +123,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/SmalltalkAppletStub.st Wed Feb 13 20:31:46 2013 +0000
+++ b/SmalltalkAppletStub.st Thu Feb 14 16:15:31 2013 +0000
@@ -192,6 +192,10 @@
^ '$Header$'
!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -200,3 +204,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/TestletTestCaseProxy.st Wed Feb 13 20:31:46 2013 +0000
+++ b/TestletTestCaseProxy.st Thu Feb 14 16:15:31 2013 +0000
@@ -246,6 +246,10 @@
!TestletTestCaseProxy class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -254,3 +258,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/bc.mak Wed Feb 13 20:31:46 2013 +0000
+++ b/bc.mak Thu Feb 14 16:15:31 2013 +0000
@@ -50,13 +50,13 @@
# build all prerequisite packages for this package
prereq:
- pushd ..\libdb\libodbc & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\libbasic & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\libcomp & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\libbasic2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\libdb & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\libview & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\libdb\libsqlite & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\libdb\libodbc & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\libboss & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\libview2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\libbasic3 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
--- a/benchmarks/Ackerman.st Wed Feb 13 20:31:46 2013 +0000
+++ b/benchmarks/Ackerman.st Thu Feb 14 16:15:31 2013 +0000
@@ -16,6 +16,10 @@
!Ackerman class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
--- a/benchmarks/Ary.st Wed Feb 13 20:31:46 2013 +0000
+++ b/benchmarks/Ary.st Thu Feb 14 16:15:31 2013 +0000
@@ -31,6 +31,10 @@
!Ary class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
--- a/benchmarks/CrossLanguageInvocation.st Wed Feb 13 20:31:46 2013 +0000
+++ b/benchmarks/CrossLanguageInvocation.st Thu Feb 14 16:15:31 2013 +0000
@@ -41,6 +41,10 @@
!CrossLanguageInvocation class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
--- a/benchmarks/Groovy.st Wed Feb 13 20:31:46 2013 +0000
+++ b/benchmarks/Groovy.st Thu Feb 14 16:15:31 2013 +0000
@@ -18,6 +18,10 @@
!Groovy class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
--- a/benchmarks/Hash.st Wed Feb 13 20:31:46 2013 +0000
+++ b/benchmarks/Hash.st Thu Feb 14 16:15:31 2013 +0000
@@ -30,6 +30,10 @@
!Hash class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
--- a/benchmarks/Jasper.st Wed Feb 13 20:31:46 2013 +0000
+++ b/benchmarks/Jasper.st Thu Feb 14 16:15:31 2013 +0000
@@ -18,6 +18,10 @@
!Jasper class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
--- a/benchmarks/JavaBenchmark.st Wed Feb 13 20:31:46 2013 +0000
+++ b/benchmarks/JavaBenchmark.st Thu Feb 14 16:15:31 2013 +0000
@@ -205,6 +205,10 @@
!JavaBenchmark class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
--- a/benchmarks/JavaBenchmarkRunner.st Wed Feb 13 20:31:46 2013 +0000
+++ b/benchmarks/JavaBenchmarkRunner.st Thu Feb 14 16:15:31 2013 +0000
@@ -258,6 +258,10 @@
!JavaBenchmarkRunner class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
--- a/benchmarks/Make.proto Wed Feb 13 20:31:46 2013 +0000
+++ b/benchmarks/Make.proto Thu Feb 14 16:15:31 2013 +0000
@@ -122,13 +122,13 @@
postMake:: cleanjunk
prereq: $(REQUIRED_SUPPORT_DIRS)
- cd ../../libdb/libodbc && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../../libbasic && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../../libcomp && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../../libbasic2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../../libdb && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../../libview && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../../libdb/libsqlite && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd ../../libdb/libodbc && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../../libboss && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../../libview2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../../libbasic3 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
--- a/benchmarks/MethodInvocation.st Wed Feb 13 20:31:46 2013 +0000
+++ b/benchmarks/MethodInvocation.st Thu Feb 14 16:15:31 2013 +0000
@@ -91,6 +91,10 @@
!MethodInvocation class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
--- a/benchmarks/ObjectArguments.st Wed Feb 13 20:31:46 2013 +0000
+++ b/benchmarks/ObjectArguments.st Thu Feb 14 16:15:31 2013 +0000
@@ -44,6 +44,10 @@
!ObjectArguments class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
--- a/benchmarks/OverloadedMethods.st Wed Feb 13 20:31:46 2013 +0000
+++ b/benchmarks/OverloadedMethods.st Thu Feb 14 16:15:31 2013 +0000
@@ -57,6 +57,10 @@
!OverloadedMethods class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
--- a/benchmarks/OverloadedMethods2.st Wed Feb 13 20:31:46 2013 +0000
+++ b/benchmarks/OverloadedMethods2.st Thu Feb 14 16:15:31 2013 +0000
@@ -99,6 +99,10 @@
!OverloadedMethods2 class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
--- a/benchmarks/PrimitiveArguments.st Wed Feb 13 20:31:46 2013 +0000
+++ b/benchmarks/PrimitiveArguments.st Thu Feb 14 16:15:31 2013 +0000
@@ -44,6 +44,10 @@
!PrimitiveArguments class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
--- a/benchmarks/Saxon.st Wed Feb 13 20:31:46 2013 +0000
+++ b/benchmarks/Saxon.st Thu Feb 14 16:15:31 2013 +0000
@@ -18,6 +18,10 @@
!Saxon class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
--- a/benchmarks/Strcat.st Wed Feb 13 20:31:46 2013 +0000
+++ b/benchmarks/Strcat.st Thu Feb 14 16:15:31 2013 +0000
@@ -28,6 +28,10 @@
!Strcat class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
--- a/benchmarks/Threadring.st Wed Feb 13 20:31:46 2013 +0000
+++ b/benchmarks/Threadring.st Thu Feb 14 16:15:31 2013 +0000
@@ -84,6 +84,10 @@
!Threadring class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
--- a/benchmarks/WrappedArguments.st Wed Feb 13 20:31:46 2013 +0000
+++ b/benchmarks/WrappedArguments.st Thu Feb 14 16:15:31 2013 +0000
@@ -44,6 +44,10 @@
!WrappedArguments class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
--- a/benchmarks/bc.mak Wed Feb 13 20:31:46 2013 +0000
+++ b/benchmarks/bc.mak Thu Feb 14 16:15:31 2013 +0000
@@ -50,13 +50,13 @@
# build all prerequisite packages for this package
prereq:
- pushd ..\..\libdb\libodbc & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\..\libbasic & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\..\libcomp & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\..\libbasic2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\..\libdb & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\..\libview & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\..\libdb\libsqlite & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\..\libdb\libodbc & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\..\libboss & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\..\libview2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\..\libbasic3 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
--- a/benchmarks/benchmarks.rc Wed Feb 13 20:31:46 2013 +0000
+++ b/benchmarks/benchmarks.rc Thu Feb 14 16:15:31 2013 +0000
@@ -3,7 +3,7 @@
// automagically generated from the projectDefinition: stx_libjava_benchmarks.
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 6,2,32767,32767
+ FILEVERSION 6,2,564,564
PRODUCTVERSION 6,2,3,0
#if (__BORLANDC__)
FILEFLAGSMASK VS_FF_DEBUG | VS_FF_PRERELEASE
@@ -20,12 +20,12 @@
BEGIN
VALUE "CompanyName", "eXept Software AG\0"
VALUE "FileDescription", "Smalltalk/X Class library (LIB)\0"
- VALUE "FileVersion", "6.2.32767.32767\0"
+ VALUE "FileVersion", "6.2.564.564\0"
VALUE "InternalName", "stx:libjava/benchmarks\0"
VALUE "LegalCopyright", "Copyright Claus Gittinger 1988-2012\nCopyright eXept Software AG 1998-2012\0"
VALUE "ProductName", "Smalltalk/X\0"
VALUE "ProductVersion", "6.2.3.0\0"
- VALUE "ProductDate", "Thu, 31 Jan 2013 11:57:18 GMT\0"
+ VALUE "ProductDate", "Thu, 14 Feb 2013 16:12:27 GMT\0"
END
END
--- a/benchmarks/mingwmake.bat Wed Feb 13 20:31:46 2013 +0000
+++ b/benchmarks/mingwmake.bat Thu Feb 14 16:15:31 2013 +0000
@@ -7,6 +7,8 @@
@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 -DUSEMINGW=1 %DEFINES% %*
+
+@call ..\..\rules\find_mingw.bat
+make.exe -N -f bc.mak %USEMINGW_ARG% %*
--- a/benchmarks/stx_libjava_benchmarks.st Wed Feb 13 20:31:46 2013 +0000
+++ b/benchmarks/stx_libjava_benchmarks.st Thu Feb 14 16:15:31 2013 +0000
@@ -146,6 +146,10 @@
!stx_libjava_benchmarks class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
--- a/examples/CDDatabaseHandler1.st Wed Feb 13 20:31:46 2013 +0000
+++ b/examples/CDDatabaseHandler1.st Thu Feb 14 16:15:31 2013 +0000
@@ -125,8 +125,18 @@
!CDDatabaseHandler1 class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+!
+
version_SVN
^ '$Id:: $'
! !
+
CDDatabaseHandler1 initialize!
--- a/examples/CDDatabaseHandler2.st Wed Feb 13 20:31:46 2013 +0000
+++ b/examples/CDDatabaseHandler2.st Thu Feb 14 16:15:31 2013 +0000
@@ -126,8 +126,18 @@
!CDDatabaseHandler2 class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+!
+
version_SVN
^ '$Id:: $'
! !
+
CDDatabaseHandler2 initialize!
--- a/examples/HelloWorldExampleS.st Wed Feb 13 20:31:46 2013 +0000
+++ b/examples/HelloWorldExampleS.st Thu Feb 14 16:15:31 2013 +0000
@@ -10,6 +10,16 @@
!HelloWorldExampleS class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+!
+
version_SVN
^ '$Id:: $'
! !
+
--- a/examples/JavaExamples.st Wed Feb 13 20:31:46 2013 +0000
+++ b/examples/JavaExamples.st Thu Feb 14 16:15:31 2013 +0000
@@ -148,6 +148,16 @@
!JavaExamples class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+!
+
version_SVN
^ '$Id:: $'
! !
+
--- a/examples/Make.proto Wed Feb 13 20:31:46 2013 +0000
+++ b/examples/Make.proto Thu Feb 14 16:15:31 2013 +0000
@@ -34,7 +34,7 @@
# add the path(es) here:,
# ********** OPTIONAL: MODIFY the next lines ***
# LOCALINCLUDES=-Ifoo -Ibar
-LOCALINCLUDES= -I$(INCLUDE_TOP)/stx/libjava -I$(INCLUDE_TOP)/stx/libbasic
+LOCALINCLUDES= -I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/libjava
# if you need any additional defines for embedded C code,
@@ -68,7 +68,7 @@
-# Update SVN revision in stx_libbasic3.st
+# Update SVN revision in package definition class
ifneq (,$(findstring .svn,$(wildcard .svn)))
.svnversion: *.st
if [ -d .svn ]; then \
@@ -78,7 +78,7 @@
echo -n exported > .svnversion; \
fi
-stx_libjava_examples.o: stx_libjava_examples.st .svnversion
+stx_libjava_examples.o: stx_libjava_examples.st .svnversion
@if [ -d .svn ]; then \
rev2="$(shell printf "%-16s" $$(cat .svnversion))"; \
echo " [SV] Expanding svnRevisionNo in $1.st"; \
@@ -87,11 +87,27 @@
$(MAKE) CC="$(CLASSLIB_CC)" OPT="$(OPT)" SEPINITCODE="$(SEPINITCODE)" STC="$(STC)" STFILE=.stx_libjava_examples.svn $(C_RULE);
sed -i -e "s/\".stx_libjava_examples.svn.st\");/\"\stx_libjava_examples.st\");/g" .stx_libjava_examples.svn.c
$(MAKE) .stx_libjava_examples.svn.$(O)
- @mv .stx_libjava_examples.svn.$(O) stx_libjava_examples.$(O)
+ @mv .stx_libjava_examples.svn.$(O) stx_libjava_examples.$(O)
endif
+# Enforce recompilation of package definition class if Mercurial working
+# copy state changes. Together with --guessVersion it ensures that package
+# definition class always contains correct binary revision string.
+ifneq (**NOHG**, $(shell hg root 2> /dev/null || echo -n '**NOHG**'))
+stx_libjava_examples.$(O): $(shell hg root)/.hg/dirstate
+endif
+
+
+
+
+# run default testsuite for this package
+test: $(TOP)/goodies/builder/reports
+ $(MAKE) -C $(TOP)/goodies/builder/reports
+ $(TOP)/goodies/builder/reports/report-runner.sh -D . -r Builder::TestReport -p $(PACKAGE)
+
+
# add more install actions here
install::
@@ -107,23 +123,22 @@
prereq: $(REQUIRED_SUPPORT_DIRS)
cd ../../libbasic && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd ../../libdb/libodbc && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd ../../libcomp && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../../libbasic2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd ../../libcomp && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd ../../libdb && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../../libview && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd ../../libdb && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd ../../libdb/libsqlite && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd ../../libdb/libodbc && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd ../../libboss && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../../libview2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd ../../libboss && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd ../../libdb/libsqlite && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd ../../libbasic3 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../../goodies/sunit && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../../libui && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd ../../libbasic3 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../../libwidg && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd ../../libwidg2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../../libhtml && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd ../../libwidg2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../../libtool && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../ && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd ../../librun && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
--- a/examples/Make.spec Wed Feb 13 20:31:46 2013 +0000
+++ b/examples/Make.spec Thu Feb 14 16:15:31 2013 +0000
@@ -56,7 +56,7 @@
COMMON_OBJS= \
- $(OUTDIR)stx_libjava_examples.$(O) \
+ $(OUTDIR_SLASH)stx_libjava_examples.$(O) \
--- a/examples/Makefile Wed Feb 13 20:31:46 2013 +0000
+++ b/examples/Makefile Thu Feb 14 16:15:31 2013 +0000
@@ -15,5 +15,7 @@
#only needed for the definition of $(TOP)
include Make.proto
-makefile:
+makefile: mf
+
+mf:
$(TOP)/rules/stmkmf
--- a/examples/STComparator.st Wed Feb 13 20:31:46 2013 +0000
+++ b/examples/STComparator.st Thu Feb 14 16:15:31 2013 +0000
@@ -39,8 +39,18 @@
!STComparator class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+!
+
version_SVN
^ '$Id:: $'
! !
+
STComparator initialize!
--- a/examples/bc.mak Wed Feb 13 20:31:46 2013 +0000
+++ b/examples/bc.mak Thu Feb 14 16:15:31 2013 +0000
@@ -15,7 +15,7 @@
# bmake clobber - clean all
#
# Historic Note:
-# this used to contain only rules to make with borland
+# this used to contain only rules to make with borland
# (called via bmake, by "make.exe -f bc.mak")
# this has changed; it is now also possible to build using microsoft visual c
# (called via vcmake, by "make.exe -f bc.mak -DUSEVC")
@@ -34,7 +34,7 @@
-LOCALINCLUDES= -I$(INCLUDE_TOP)\stx\libjava -I$(INCLUDE_TOP)\stx\libbasic
+LOCALINCLUDES= -I$(INCLUDE_TOP)\stx\libbasic -I$(INCLUDE_TOP)\stx\libjava
LOCALDEFINES=
STCLOCALOPT=-package=$(PACKAGE) -I. $(LOCALINCLUDES) -headerDir=. $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES) -varPrefix=$(LIBNAME)
@@ -51,29 +51,42 @@
# build all prerequisite packages for this package
prereq:
pushd ..\..\libbasic & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\..\libdb\libodbc & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\..\libcomp & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\..\libbasic2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\..\libcomp & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\..\libdb & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\..\libview & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\..\libdb & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\..\libdb\libsqlite & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\..\libdb\libodbc & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\..\libboss & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\..\libview2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\..\libboss & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\..\libdb\libsqlite & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\..\libbasic3 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\..\goodies\sunit & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\..\libui & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\..\libbasic3 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\..\libwidg & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\..\libwidg2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\..\libhtml & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\..\libwidg2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\..\libtool & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd .. & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\..\librun & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+
+test: $(TOP)\goodies\builder\reports\NUL
+ pushd $(TOP)\goodies\builder\reports & $(MAKE_BAT)
+ $(TOP)\goodies\builder\reports\report-runner.bat -D . -r Builder::TestReport -p $(PACKAGE)
+
# BEGINMAKEDEPEND --- do not remove this line; make depend needs it
$(OUTDIR)stx_libjava_examples.$(O) stx_libjava_examples.$(H): stx_libjava_examples.st $(INCLUDE_TOP)\stx\libbasic\LibraryDefinition.$(H) $(INCLUDE_TOP)\stx\libbasic\ProjectDefinition.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
# ENDMAKEDEPEND --- do not remove this line
+
+# **Must be at end**
+
+# Enforce recompilation of package definition class if Mercurial working
+# copy state changes. Together with --guessVersion it ensures that package
+# definition class always contains correct binary revision string.
+!IFDEF HGROOT
+$(OUTDIR)stx_libjava_examples.$(O): $(HGROOT)\.hg\dirstate
+!ENDIF
--- a/examples/bmake.bat Wed Feb 13 20:31:46 2013 +0000
+++ b/examples/bmake.bat Thu Feb 14 16:15:31 2013 +0000
@@ -3,6 +3,10 @@
@REM type bmake, and wait...
@REM do not edit - automatically generated from ProjectDefinition
@REM -------
-make.exe -N -f bc.mak %*
+@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 %DEFINES% %*
--- a/examples/examples.rc Wed Feb 13 20:31:46 2013 +0000
+++ b/examples/examples.rc Thu Feb 14 16:15:31 2013 +0000
@@ -3,8 +3,8 @@
// automagically generated from the projectDefinition: stx_libjava_examples.
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 6,2,1991,1991
- PRODUCTVERSION 6,2,3,1
+ FILEVERSION 6,2,564,564
+ PRODUCTVERSION 6,2,3,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.1991.1991\0"
+ VALUE "FileVersion", "6.2.564.564\0"
VALUE "InternalName", "stx:libjava/examples\0"
VALUE "LegalCopyright", "Copyright Claus Gittinger 1988-2012\nCopyright eXept Software AG 1998-2012\0"
VALUE "ProductName", "Smalltalk/X\0"
- VALUE "ProductVersion", "6.2.3.1\0"
- VALUE "ProductDate", "Sun, 14 Oct 2012 20:17:04 GMT\0"
+ VALUE "ProductVersion", "6.2.3.0\0"
+ VALUE "ProductDate", "Thu, 14 Feb 2013 16:12:21 GMT\0"
END
END
--- a/examples/mingwmake.bat Wed Feb 13 20:31:46 2013 +0000
+++ b/examples/mingwmake.bat Thu Feb 14 16:15:31 2013 +0000
@@ -3,6 +3,12 @@
@REM type mingwmake, and wait...
@REM do not edit - automatically generated from ProjectDefinition
@REM -------
-make.exe -N -f bc.mak -DUSEMINGW=1 %*
+@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%"
+
+@call ..\..\rules\find_mingw.bat
+make.exe -N -f bc.mak %USEMINGW_ARG% %*
--- a/examples/stx_libjava_examples.st Wed Feb 13 20:31:46 2013 +0000
+++ b/examples/stx_libjava_examples.st Thu Feb 14 16:15:31 2013 +0000
@@ -147,6 +147,15 @@
!stx_libjava_examples class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
+version_HG
+ ^ '$Changeset: <not expanded> $'
+!
+
version_SVN
^ '$Id:: $'
! !
+
--- a/examples/tomcat6/ApacheTomcat6.st Wed Feb 13 20:31:46 2013 +0000
+++ b/examples/tomcat6/ApacheTomcat6.st Thu Feb 14 16:15:31 2013 +0000
@@ -208,7 +208,12 @@
!ApacheTomcat6 class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
! !
+
--- a/examples/tomcat6/Make.proto Wed Feb 13 20:31:46 2013 +0000
+++ b/examples/tomcat6/Make.proto Thu Feb 14 16:15:31 2013 +0000
@@ -19,7 +19,7 @@
NOAUTOLOAD=1
NOSUBAUTOLOAD=1
-LOCALINCLUDES=-I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/libview2 -I$(INCLUDE_TOP)/stx/libjava -I$(INCLUDE_TOP)/stx/libbasic2 -I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/libcomp
+LOCALINCLUDES=-I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/libview2 -I$(INCLUDE_TOP)/stx/libjava -I$(INCLUDE_TOP)/stx/libbasic2 -I$(INCLUDE_TOP)/stx/libcomp
LOCALDEFINES=
GLOBALDEFINES=
MAIN_DEFINES=-DIGNORE_IMAGE -DNO_DISPLAY
@@ -59,58 +59,58 @@
#
REQUIRED_LIBS= libstx_libbasic \
+ libstx_libcomp \
libstx_libbasic2 \
- libstx_libcomp \
- libstx_libview \
libstx_libdb \
- libstx_libview2 \
+ libstx_libview \
+ libstx_libdb_libsqlite \
+ libstx_libdb_libodbc \
libstx_libboss \
- libstx_libdb_libodbc \
- libstx_libdb_libsqlite \
+ libstx_libview2 \
+ libstx_libbasic3 \
libstx_goodies_sunit \
libstx_libui \
- libstx_libbasic3 \
libstx_libwidg \
+ libstx_libwidg2 \
libstx_libhtml \
- libstx_libwidg2 \
libstx_libtool \
libstx_libjava \
REQUIRED_LIBOBJS= ../../../libbasic/libstx_libbasic$(O_EXT) \
+ ../../../libcomp/libstx_libcomp$(O_EXT) \
../../../libbasic2/libstx_libbasic2$(O_EXT) \
- ../../../libcomp/libstx_libcomp$(O_EXT) \
- ../../../libview/libstx_libview$(O_EXT) \
../../../libdb/libstx_libdb$(O_EXT) \
- ../../../libview2/libstx_libview2$(O_EXT) \
+ ../../../libview/libstx_libview$(O_EXT) \
+ ../../../libdb/libsqlite/libstx_libdb_libsqlite$(O_EXT) \
+ ../../../libdb/libodbc/libstx_libdb_libodbc$(O_EXT) \
../../../libboss/libstx_libboss$(O_EXT) \
- ../../../libdb/libodbc/libstx_libdb_libodbc$(O_EXT) \
- ../../../libdb/libsqlite/libstx_libdb_libsqlite$(O_EXT) \
+ ../../../libview2/libstx_libview2$(O_EXT) \
+ ../../../libbasic3/libstx_libbasic3$(O_EXT) \
../../../goodies/sunit/libstx_goodies_sunit$(O_EXT) \
../../../libui/libstx_libui$(O_EXT) \
- ../../../libbasic3/libstx_libbasic3$(O_EXT) \
../../../libwidg/libstx_libwidg$(O_EXT) \
+ ../../../libwidg2/libstx_libwidg2$(O_EXT) \
../../../libhtml/libstx_libhtml$(O_EXT) \
- ../../../libwidg2/libstx_libwidg2$(O_EXT) \
../../../libtool/libstx_libtool$(O_EXT) \
../..//libstx_libjava$(O_EXT) \
REQUIRED_LINK_LIBOBJS= libstx_libbasic$(O_EXT) \
+ libstx_libcomp$(O_EXT) \
libstx_libbasic2$(O_EXT) \
- libstx_libcomp$(O_EXT) \
- libstx_libview$(O_EXT) \
libstx_libdb$(O_EXT) \
- libstx_libview2$(O_EXT) \
+ libstx_libview$(O_EXT) \
+ libstx_libdb_libsqlite$(O_EXT) \
+ libstx_libdb_libodbc$(O_EXT) \
libstx_libboss$(O_EXT) \
- libstx_libdb_libodbc$(O_EXT) \
- libstx_libdb_libsqlite$(O_EXT) \
+ libstx_libview2$(O_EXT) \
+ libstx_libbasic3$(O_EXT) \
libstx_goodies_sunit$(O_EXT) \
libstx_libui$(O_EXT) \
- libstx_libbasic3$(O_EXT) \
libstx_libwidg$(O_EXT) \
+ libstx_libwidg2$(O_EXT) \
libstx_libhtml$(O_EXT) \
- libstx_libwidg2$(O_EXT) \
libstx_libtool$(O_EXT) \
libstx_libjava$(O_EXT) \
@@ -120,6 +120,9 @@
exe: tomcat6 $(REQUIRED_SUPPORT_DIRS)
tomcat6: $(APP_DIRS_TO_MAKE) $(APP_LIBOBJS) $(OBJS)
+ $(MAKE) link_tomcat6
+
+link_tomcat6:
$(MAKE) NON_GUI_APPLICATION \
TARGET=tomcat6 \
APPLICATION_CLASSES="$(COMMON_CLASSES) $(UNIX_CLASSES)" \
@@ -134,23 +137,22 @@
# build all prerequisite packages for this package
prereq:
cd ../../../libbasic && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd ../../../libcomp && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../../../libbasic2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd ../../../libcomp && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd ../../../libview && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../../../libdb && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd ../../../libview2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd ../../../libview && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd ../../../libdb/libsqlite && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd ../../../libdb/libodbc && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../../../libboss && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd ../../../libdb/libodbc && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd ../../../libdb/libsqlite && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd ../../../libview2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd ../../../libbasic3 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../../../goodies/sunit && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../../../libui && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd ../../../libbasic3 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../../../libwidg && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd ../../../libwidg2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../../../libhtml && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd ../../../libwidg2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../../../libtool && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../../ && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd ../../../librun && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
@@ -172,11 +174,11 @@
stx_RESOURCES stx_STYLES stx_BITMAPS
-tomcat6_RESOURCES:
+tomcat6_RESOURCES:
mkdir -p resources/stx/libjava/examples/tomcat6
-cp ../resources/*.rs ../resources/*.style resources/stx/libjava/examples/tomcat6/..
-tomcat6_BITMAPS:
+tomcat6_BITMAPS:
mkdir -p resources/stx/libjava/examples/tomcat6/bitmaps
-cp *.ico *.gif *.png resources/stx/libjava/examples/tomcat6/bitmaps
@@ -200,7 +202,7 @@
display.rc: $(TOP)/projects/smalltalk/display.rc
cp $(TOP)/projects/smalltalk/display.rc .
-stx_STYLES:
+stx_STYLES:
mkdir -p resources/stx/libview
mkdir -p resources/stx/libview/styles
cp $(TOP)/libview/styles/*.common resources/stx/libview/styles
@@ -209,27 +211,27 @@
stx_BITMAPS: \
libwidg_BITMAPS
-libwidg_BITMAPS:
+libwidg_BITMAPS:
mkdir -p resources/stx/libwidg/bitmaps
-cp $(TOP)/libwidg/bitmaps/*.* resources/stx/libwidg/bitmaps
-libbasic_RESOURCES:
+libbasic_RESOURCES:
mkdir -p resources/stx/libbasic
-cp $(TOP)/libbasic/resources/*.* resources/stx/libbasic
-libtool_RESOURCES:
+libtool_RESOURCES:
mkdir -p resources/stx/libtool
-cp $(TOP)/libtool/resources/*.* resources/stx/libtool
-libtool2_RESOURCES:
+libtool2_RESOURCES:
mkdir -p resources/stx/libtool2
-cp $(TOP)/libtool2/resources/*.* resources/stx/libtool2
-libview_RESOURCES:
+libview_RESOURCES:
mkdir -p resources/stx/libview
-cp $(TOP)/libview/resources/*.* resources/stx/libview
-libview2_RESOURCES:
+libview2_RESOURCES:
mkdir -p resources/stx/libview2
-cp $(TOP)/libview2/resources/*.* resources/stx/libview2
@@ -247,23 +249,17 @@
../../../libbasic/libstx_libbasic.so:
cd ../../../libbasic && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-libstx_libbasic2.so: ../../../libbasic2/libstx_libbasic2.so
- cp ../../../libbasic2/libstx_libbasic2.so .
-
-../../../libbasic2/libstx_libbasic2.so:
- cd ../../../libbasic2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-
libstx_libcomp.so: ../../../libcomp/libstx_libcomp.so
cp ../../../libcomp/libstx_libcomp.so .
../../../libcomp/libstx_libcomp.so:
cd ../../../libcomp && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-libstx_libview.so: ../../../libview/libstx_libview.so
- cp ../../../libview/libstx_libview.so .
+libstx_libbasic2.so: ../../../libbasic2/libstx_libbasic2.so
+ cp ../../../libbasic2/libstx_libbasic2.so .
-../../../libview/libstx_libview.so:
- cd ../../../libview && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+../../../libbasic2/libstx_libbasic2.so:
+ cd ../../../libbasic2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
libstx_libdb.so: ../../../libdb/libstx_libdb.so
cp ../../../libdb/libstx_libdb.so .
@@ -271,11 +267,23 @@
../../../libdb/libstx_libdb.so:
cd ../../../libdb && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-libstx_libview2.so: ../../../libview2/libstx_libview2.so
- cp ../../../libview2/libstx_libview2.so .
+libstx_libview.so: ../../../libview/libstx_libview.so
+ cp ../../../libview/libstx_libview.so .
+
+../../../libview/libstx_libview.so:
+ cd ../../../libview && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+
+libstx_libdb_libsqlite.so: ../../../libdb/libsqlite/libstx_libdb_libsqlite.so
+ cp ../../../libdb/libsqlite/libstx_libdb_libsqlite.so .
-../../../libview2/libstx_libview2.so:
- cd ../../../libview2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+../../../libdb/libsqlite/libstx_libdb_libsqlite.so:
+ cd ../../../libdb/libsqlite && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+
+libstx_libdb_libodbc.so: ../../../libdb/libodbc/libstx_libdb_libodbc.so
+ cp ../../../libdb/libodbc/libstx_libdb_libodbc.so .
+
+../../../libdb/libodbc/libstx_libdb_libodbc.so:
+ cd ../../../libdb/libodbc && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
libstx_libboss.so: ../../../libboss/libstx_libboss.so
cp ../../../libboss/libstx_libboss.so .
@@ -283,17 +291,17 @@
../../../libboss/libstx_libboss.so:
cd ../../../libboss && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-libstx_libdb_libodbc.so: ../../../libdb/libodbc/libstx_libdb_libodbc.so
- cp ../../../libdb/libodbc/libstx_libdb_libodbc.so .
+libstx_libview2.so: ../../../libview2/libstx_libview2.so
+ cp ../../../libview2/libstx_libview2.so .
-../../../libdb/libodbc/libstx_libdb_libodbc.so:
- cd ../../../libdb/libodbc && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+../../../libview2/libstx_libview2.so:
+ cd ../../../libview2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-libstx_libdb_libsqlite.so: ../../../libdb/libsqlite/libstx_libdb_libsqlite.so
- cp ../../../libdb/libsqlite/libstx_libdb_libsqlite.so .
+libstx_libbasic3.so: ../../../libbasic3/libstx_libbasic3.so
+ cp ../../../libbasic3/libstx_libbasic3.so .
-../../../libdb/libsqlite/libstx_libdb_libsqlite.so:
- cd ../../../libdb/libsqlite && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+../../../libbasic3/libstx_libbasic3.so:
+ cd ../../../libbasic3 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
libstx_goodies_sunit.so: ../../../goodies/sunit/libstx_goodies_sunit.so
cp ../../../goodies/sunit/libstx_goodies_sunit.so .
@@ -307,30 +315,24 @@
../../../libui/libstx_libui.so:
cd ../../../libui && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-libstx_libbasic3.so: ../../../libbasic3/libstx_libbasic3.so
- cp ../../../libbasic3/libstx_libbasic3.so .
-
-../../../libbasic3/libstx_libbasic3.so:
- cd ../../../libbasic3 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-
libstx_libwidg.so: ../../../libwidg/libstx_libwidg.so
cp ../../../libwidg/libstx_libwidg.so .
../../../libwidg/libstx_libwidg.so:
cd ../../../libwidg && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+libstx_libwidg2.so: ../../../libwidg2/libstx_libwidg2.so
+ cp ../../../libwidg2/libstx_libwidg2.so .
+
+../../../libwidg2/libstx_libwidg2.so:
+ cd ../../../libwidg2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+
libstx_libhtml.so: ../../../libhtml/libstx_libhtml.so
cp ../../../libhtml/libstx_libhtml.so .
../../../libhtml/libstx_libhtml.so:
cd ../../../libhtml && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-libstx_libwidg2.so: ../../../libwidg2/libstx_libwidg2.so
- cp ../../../libwidg2/libstx_libwidg2.so .
-
-../../../libwidg2/libstx_libwidg2.so:
- cd ../../../libwidg2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-
libstx_libtool.so: ../../../libtool/libstx_libtool.so
cp ../../../libtool/libstx_libtool.so .
--- a/examples/tomcat6/Make.spec Wed Feb 13 20:31:46 2013 +0000
+++ b/examples/tomcat6/Make.spec Thu Feb 14 16:15:31 2013 +0000
@@ -57,8 +57,8 @@
COMMON_OBJS= \
- $(OUTDIR)stx_libjava_examples_tomcat6.$(O) \
- $(OUTDIR)ApacheTomcat6.$(O) \
+ $(OUTDIR_SLASH)stx_libjava_examples_tomcat6.$(O) \
+ $(OUTDIR_SLASH)ApacheTomcat6.$(O) \
--- a/examples/tomcat6/Makefile Wed Feb 13 20:31:46 2013 +0000
+++ b/examples/tomcat6/Makefile Thu Feb 14 16:15:31 2013 +0000
@@ -15,5 +15,7 @@
#only needed for the definition of $(TOP)
include Make.proto
-makefile:
+makefile: mf
+
+mf:
$(TOP)/rules/stmkmf
--- a/examples/tomcat6/bc.mak Wed Feb 13 20:31:46 2013 +0000
+++ b/examples/tomcat6/bc.mak Thu Feb 14 16:15:31 2013 +0000
@@ -1,19 +1,19 @@
# $Header$
#
-# DO NOT EDIT
+# DO NOT EDIT
# automagically generated from the projectDefinition: stx_libjava_examples_tomcat6.
#
# Warning: once you modify this file, do not rerun
# stmkmp or projectDefinition-build again - otherwise, your changes are lost.
#
# Historic Note:
-# this used to contain only rules to make with borland
+# this used to contain only rules to make with borland
# (called via bmake, by "make.exe -f bc.mak")
# this has changed; it is now also possible to build using microsoft visual c
# (called via vcmake, by "make.exe -f bc.mak -DUSEVC")
#
-TOP=..\..\..
+TOP=..\..\..
INCLUDE_TOP=$(TOP)\..
CFLAGS_LOCAL=$(CFLAGS_APPTYPE) \
@@ -33,7 +33,7 @@
#
LIBNAME=dummy
STCOPT="+optinline"
-LOCALINCLUDES= -I$(INCLUDE_TOP)\stx\libview2 -I$(INCLUDE_TOP)\stx\libjava -I$(INCLUDE_TOP)\stx\libbasic2 -I$(INCLUDE_TOP)\stx\libbasic -I$(INCLUDE_TOP)\stx\libcomp
+LOCALINCLUDES= -I$(INCLUDE_TOP)\stx\libbasic -I$(INCLUDE_TOP)\stx\libview2 -I$(INCLUDE_TOP)\stx\libjava -I$(INCLUDE_TOP)\stx\libbasic2 -I$(INCLUDE_TOP)\stx\libcomp
LOCALDEFINES=
GLOBALDEFINES=
@@ -58,20 +58,20 @@
REQUIRED_LIBS=librun.dll \
libstx_libbasic.dll \
+ libstx_libcomp.dll \
libstx_libbasic2.dll \
- libstx_libcomp.dll \
- libstx_libview.dll \
libstx_libdb.dll \
- libstx_libview2.dll \
+ libstx_libview.dll \
+ libstx_libdb_libsqlite.dll \
+ libstx_libdb_libodbc.dll \
libstx_libboss.dll \
- libstx_libdb_libodbc.dll \
- libstx_libdb_libsqlite.dll \
+ libstx_libview2.dll \
+ libstx_libbasic3.dll \
libstx_goodies_sunit.dll \
libstx_libui.dll \
- libstx_libbasic3.dll \
libstx_libwidg.dll \
+ libstx_libwidg2.dll \
libstx_libhtml.dll \
- libstx_libwidg2.dll \
libstx_libtool.dll \
libstx_libjava.dll \
@@ -80,12 +80,12 @@
REQUIRED_SUPPORT_DIRS=RESOURCEFILES
-target: ALL postBuildCleanup
+target: ALL postBuildCleanup
# the executable, all required files and a self-installing-installer-exe
-ALL:: prereq exe $(REQUIRED_SUPPORT_DIRS) ant postBuildCleanup setup
+ALL:: prereq exe $(REQUIRED_SUPPORT_DIRS) ant postBuildCleanup setup
-exe: newBuildDate consoleApp
+exe: newBuildDate consoleApp
# the executable only
# with console
@@ -109,28 +109,27 @@
CRT_STARTUP=" $(CRT_STARTUP_NOCONSOLE)" theExe
# the executable only (internal target; needs some defines)
-theExe: $(OUTDIR) $(OBJS) $(REQUIRED_FILES) show $(PROJECT)
+theExe: $(OUTDIR) $(OBJS) $(REQUIRED_FILES) show $(PROJECT)
# build all prerequisite packages for this package
prereq:
pushd ..\..\..\libbasic & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\..\..\libcomp & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\..\..\libbasic2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\..\..\libcomp & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\..\..\libview & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\..\..\libdb & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\..\..\libview2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\..\..\libview & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\..\..\libdb\libsqlite & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\..\..\libdb\libodbc & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\..\..\libboss & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\..\..\libdb\libodbc & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\..\..\libdb\libsqlite & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\..\..\libview2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\..\..\libbasic3 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\..\..\goodies\sunit & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\..\..\libui & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\..\..\libbasic3 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\..\..\libwidg & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\..\..\libwidg2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\..\..\libhtml & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\..\..\libwidg2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\..\..\libtool & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\.. & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\..\..\librun & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
# a nullsoft installable delivery
@@ -220,7 +219,7 @@
libtool2_RESOURCES: resources\stx\libtool2\NUL
-copy $(TOP)\libtool2\resources\*.rs resources\stx\libtool2\*.*
-libview_RESOURCES: resources\stx\libview\NUL
+libview_RESOURCES: resources\stx\libview\NUL
-copy $(TOP)\libview\resources\*.rs resources\stx\libview\*.*
libview2_RESOURCES: resources\stx\libview2\NUL
@@ -273,23 +272,17 @@
..\..\..\libbasic\$(OBJDIR)\libstx_libbasic.dll:
pushd ..\..\..\libbasic & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-libstx_libbasic2.dll: ..\..\..\libbasic2\$(OBJDIR)\libstx_libbasic2.dll
- copy ..\..\..\libbasic2\$(OBJDIR)\libstx_libbasic2.dll *.*
-
-..\..\..\libbasic2\$(OBJDIR)\libstx_libbasic2.dll:
- pushd ..\..\..\libbasic2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-
libstx_libcomp.dll: ..\..\..\libcomp\$(OBJDIR)\libstx_libcomp.dll
copy ..\..\..\libcomp\$(OBJDIR)\libstx_libcomp.dll *.*
..\..\..\libcomp\$(OBJDIR)\libstx_libcomp.dll:
pushd ..\..\..\libcomp & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-libstx_libview.dll: ..\..\..\libview\$(OBJDIR)\libstx_libview.dll
- copy ..\..\..\libview\$(OBJDIR)\libstx_libview.dll *.*
+libstx_libbasic2.dll: ..\..\..\libbasic2\$(OBJDIR)\libstx_libbasic2.dll
+ copy ..\..\..\libbasic2\$(OBJDIR)\libstx_libbasic2.dll *.*
-..\..\..\libview\$(OBJDIR)\libstx_libview.dll:
- pushd ..\..\..\libview & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+..\..\..\libbasic2\$(OBJDIR)\libstx_libbasic2.dll:
+ pushd ..\..\..\libbasic2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
libstx_libdb.dll: ..\..\..\libdb\$(OBJDIR)\libstx_libdb.dll
copy ..\..\..\libdb\$(OBJDIR)\libstx_libdb.dll *.*
@@ -297,11 +290,23 @@
..\..\..\libdb\$(OBJDIR)\libstx_libdb.dll:
pushd ..\..\..\libdb & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-libstx_libview2.dll: ..\..\..\libview2\$(OBJDIR)\libstx_libview2.dll
- copy ..\..\..\libview2\$(OBJDIR)\libstx_libview2.dll *.*
+libstx_libview.dll: ..\..\..\libview\$(OBJDIR)\libstx_libview.dll
+ copy ..\..\..\libview\$(OBJDIR)\libstx_libview.dll *.*
+
+..\..\..\libview\$(OBJDIR)\libstx_libview.dll:
+ pushd ..\..\..\libview & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+
+libstx_libdb_libsqlite.dll: ..\..\..\libdb\libsqlite\$(OBJDIR)\libstx_libdb_libsqlite.dll
+ copy ..\..\..\libdb\libsqlite\$(OBJDIR)\libstx_libdb_libsqlite.dll *.*
-..\..\..\libview2\$(OBJDIR)\libstx_libview2.dll:
- pushd ..\..\..\libview2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+..\..\..\libdb\libsqlite\$(OBJDIR)\libstx_libdb_libsqlite.dll:
+ pushd ..\..\..\libdb\libsqlite & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+
+libstx_libdb_libodbc.dll: ..\..\..\libdb\libodbc\$(OBJDIR)\libstx_libdb_libodbc.dll
+ copy ..\..\..\libdb\libodbc\$(OBJDIR)\libstx_libdb_libodbc.dll *.*
+
+..\..\..\libdb\libodbc\$(OBJDIR)\libstx_libdb_libodbc.dll:
+ pushd ..\..\..\libdb\libodbc & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
libstx_libboss.dll: ..\..\..\libboss\$(OBJDIR)\libstx_libboss.dll
copy ..\..\..\libboss\$(OBJDIR)\libstx_libboss.dll *.*
@@ -309,17 +314,17 @@
..\..\..\libboss\$(OBJDIR)\libstx_libboss.dll:
pushd ..\..\..\libboss & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-libstx_libdb_libodbc.dll: ..\..\..\libdb\libodbc\$(OBJDIR)\libstx_libdb_libodbc.dll
- copy ..\..\..\libdb\libodbc\$(OBJDIR)\libstx_libdb_libodbc.dll *.*
+libstx_libview2.dll: ..\..\..\libview2\$(OBJDIR)\libstx_libview2.dll
+ copy ..\..\..\libview2\$(OBJDIR)\libstx_libview2.dll *.*
-..\..\..\libdb\libodbc\$(OBJDIR)\libstx_libdb_libodbc.dll:
- pushd ..\..\..\libdb\libodbc & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+..\..\..\libview2\$(OBJDIR)\libstx_libview2.dll:
+ pushd ..\..\..\libview2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-libstx_libdb_libsqlite.dll: ..\..\..\libdb\libsqlite\$(OBJDIR)\libstx_libdb_libsqlite.dll
- copy ..\..\..\libdb\libsqlite\$(OBJDIR)\libstx_libdb_libsqlite.dll *.*
+libstx_libbasic3.dll: ..\..\..\libbasic3\$(OBJDIR)\libstx_libbasic3.dll
+ copy ..\..\..\libbasic3\$(OBJDIR)\libstx_libbasic3.dll *.*
-..\..\..\libdb\libsqlite\$(OBJDIR)\libstx_libdb_libsqlite.dll:
- pushd ..\..\..\libdb\libsqlite & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+..\..\..\libbasic3\$(OBJDIR)\libstx_libbasic3.dll:
+ pushd ..\..\..\libbasic3 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
libstx_goodies_sunit.dll: ..\..\..\goodies\sunit\$(OBJDIR)\libstx_goodies_sunit.dll
copy ..\..\..\goodies\sunit\$(OBJDIR)\libstx_goodies_sunit.dll *.*
@@ -333,30 +338,24 @@
..\..\..\libui\$(OBJDIR)\libstx_libui.dll:
pushd ..\..\..\libui & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-libstx_libbasic3.dll: ..\..\..\libbasic3\$(OBJDIR)\libstx_libbasic3.dll
- copy ..\..\..\libbasic3\$(OBJDIR)\libstx_libbasic3.dll *.*
-
-..\..\..\libbasic3\$(OBJDIR)\libstx_libbasic3.dll:
- pushd ..\..\..\libbasic3 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-
libstx_libwidg.dll: ..\..\..\libwidg\$(OBJDIR)\libstx_libwidg.dll
copy ..\..\..\libwidg\$(OBJDIR)\libstx_libwidg.dll *.*
..\..\..\libwidg\$(OBJDIR)\libstx_libwidg.dll:
pushd ..\..\..\libwidg & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+libstx_libwidg2.dll: ..\..\..\libwidg2\$(OBJDIR)\libstx_libwidg2.dll
+ copy ..\..\..\libwidg2\$(OBJDIR)\libstx_libwidg2.dll *.*
+
+..\..\..\libwidg2\$(OBJDIR)\libstx_libwidg2.dll:
+ pushd ..\..\..\libwidg2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+
libstx_libhtml.dll: ..\..\..\libhtml\$(OBJDIR)\libstx_libhtml.dll
copy ..\..\..\libhtml\$(OBJDIR)\libstx_libhtml.dll *.*
..\..\..\libhtml\$(OBJDIR)\libstx_libhtml.dll:
pushd ..\..\..\libhtml & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-libstx_libwidg2.dll: ..\..\..\libwidg2\$(OBJDIR)\libstx_libwidg2.dll
- copy ..\..\..\libwidg2\$(OBJDIR)\libstx_libwidg2.dll *.*
-
-..\..\..\libwidg2\$(OBJDIR)\libstx_libwidg2.dll:
- pushd ..\..\..\libwidg2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-
libstx_libtool.dll: ..\..\..\libtool\$(OBJDIR)\libstx_libtool.dll
copy ..\..\..\libtool\$(OBJDIR)\libstx_libtool.dll *.*
@@ -369,10 +368,10 @@
..\..\$(OBJDIR)\libstx_libjava.dll:
pushd ..\.. & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+
-
-sources\NUL:
+sources\NUL:
mkdir sources
show:
@@ -426,7 +425,7 @@
$(APP_LINKER) $(LFLAGS) $(LFLAGS_APPTYPE) $(CRT_STARTUP) $(ALLOBJ) -o "$(PROJECT_NOCONSOLE)" $(ALLLIB) $(RESFILES)
! else
-! ifdef USEMINGW
+! if defined(USEMINGW32) || defined(USEMINGW64)
$(PROJECT_CONSOLE): $(ALLOBJFILES) $(OBJS) $(RESFILES) $(DEFFILE) $(LIBFILES) show
$(APP_LINKER) $(LFLAGS) $(LFLAGS_APPTYPE) $(CRT_STARTUP) $(ALLOBJ) -o "$(PROJECT_CONSOLE)" $(ALLLIB) $(RESFILES)
--- a/examples/tomcat6/builder/baseline.rbspec Wed Feb 13 20:31:46 2013 +0000
+++ b/examples/tomcat6/builder/baseline.rbspec Thu Feb 14 16:15:31 2013 +0000
@@ -15,20 +15,20 @@
# --------
package "stx:libbasic"
+ package "stx:libcomp"
package "stx:libbasic2"
- package "stx:libcomp"
- package "stx:libview"
package "stx:libdb"
- package "stx:libview2"
+ package "stx:libview"
+ package "stx:libdb/libsqlite"
+ package "stx:libdb/libodbc"
package "stx:libboss"
- package "stx:libdb/libodbc"
- package "stx:libdb/libsqlite"
+ package "stx:libview2"
+ package "stx:libbasic3"
package "stx:goodies/sunit"
package "stx:libui"
- package "stx:libbasic3"
package "stx:libwidg"
+ package "stx:libwidg2"
package "stx:libhtml"
- package "stx:libwidg2"
package "stx:libtool"
package "stx:libjava"
--- a/examples/tomcat6/builder/package.deps.rake Wed Feb 13 20:31:46 2013 +0000
+++ b/examples/tomcat6/builder/package.deps.rake Thu Feb 14 16:15:31 2013 +0000
@@ -2,93 +2,93 @@
# Package dependencies.
# Automatically generated by project defintion.
-task "stx:libjava" => "stx:libview"
-task "stx:libjava" => "stx:libwidg"
-task "stx:libjava" => "stx:libview2"
-task "stx:libjava" => "stx:goodies/sunit"
-task "stx:libjava" => "stx:libbasic2"
-task "stx:libjava" => "stx:libwidg2"
-task "stx:libjava" => "stx:libbasic"
-task "stx:libjava" => "stx:libbasic3"
-task "stx:libjava" => "stx:libcomp"
-task "stx:libjava" => "stx:libtool"
-task "stx:libjava" => "stx:libhtml"
+task "stx:libtool" => "stx:libview2"
+task "stx:libtool" => "stx:libbasic"
+task "stx:libtool" => "stx:libbasic2"
+task "stx:libtool" => "stx:libboss"
+task "stx:libtool" => "stx:libhtml"
+task "stx:libtool" => "stx:libui"
+task "stx:libtool" => "stx:libbasic3"
+task "stx:libtool" => "stx:libview"
+task "stx:libtool" => "stx:libcomp"
+task "stx:libtool" => "stx:libwidg2"
+task "stx:libtool" => "stx:libwidg"
+task "stx:libtool" => "stx:goodies/sunit"
+
+task "stx:libcomp" => "stx:libbasic"
+task "stx:libbasic3" => "stx:libbasic2"
+task "stx:libbasic3" => "stx:libdb/libodbc"
+task "stx:libbasic3" => "stx:libdb/libsqlite"
+task "stx:libbasic3" => "stx:libbasic"
+task "stx:libwidg2" => "stx:libbasic"
+task "stx:libwidg2" => "stx:libview2"
+task "stx:libwidg2" => "stx:libwidg"
+task "stx:libwidg2" => "stx:libui"
+task "stx:libwidg2" => "stx:libbasic2"
+task "stx:libwidg2" => "stx:libview"
+
+task "stx:libdb/libsqlite" => "stx:libbasic"
+task "stx:libdb/libsqlite" => "stx:libbasic2"
+task "stx:libdb/libsqlite" => "stx:libdb"
+
+task "stx:libhtml" => "stx:libview"
+task "stx:libhtml" => "stx:libwidg"
+task "stx:libhtml" => "stx:libbasic"
+
+task "stx:libbasic2" => "stx:libbasic"
+
+task "stx:libdb/libodbc" => "stx:libcomp"
task "stx:libdb/libodbc" => "stx:libdb"
task "stx:libdb/libodbc" => "stx:libbasic2"
-task "stx:libdb/libodbc" => "stx:libcomp"
task "stx:libdb/libodbc" => "stx:libbasic"
-task "stx:libwidg" => "stx:libview2"
-task "stx:libwidg" => "stx:libview"
-task "stx:libwidg" => "stx:libbasic2"
-task "stx:libwidg" => "stx:libui"
-task "stx:libwidg" => "stx:libbasic"
+task "stx:libboss" => "stx:libview"
+task "stx:libboss" => "stx:libbasic2"
+task "stx:libboss" => "stx:libbasic"
-task "stx:goodies/sunit" => "stx:libview2"
-task "stx:goodies/sunit" => "stx:libview"
-task "stx:goodies/sunit" => "stx:libbasic"
task "stx:libview2" => "stx:libview"
task "stx:libview2" => "stx:libbasic2"
task "stx:libview2" => "stx:libbasic"
-task "stx:libbasic2" => "stx:libbasic"
-
task "stx:libdb" => "stx:libcomp"
task "stx:libdb" => "stx:libbasic"
+task "stx:goodies/sunit" => "stx:libview"
+task "stx:goodies/sunit" => "stx:libview2"
+task "stx:goodies/sunit" => "stx:libbasic"
+
+task "stx:libjava" => "stx:libbasic"
+task "stx:libjava" => "stx:libbasic3"
+task "stx:libjava" => "stx:libview2"
+task "stx:libjava" => "stx:libwidg"
+task "stx:libjava" => "stx:libhtml"
+task "stx:libjava" => "stx:libtool"
+task "stx:libjava" => "stx:libbasic2"
+task "stx:libjava" => "stx:goodies/sunit"
+task "stx:libjava" => "stx:libcomp"
+task "stx:libjava" => "stx:libview"
+task "stx:libjava" => "stx:libwidg2"
+
+task "stx:libwidg" => "stx:libview"
+task "stx:libwidg" => "stx:libbasic2"
+task "stx:libwidg" => "stx:libui"
+task "stx:libwidg" => "stx:libview2"
+task "stx:libwidg" => "stx:libbasic"
+
+task "stx:libui" => "stx:libview"
+task "stx:libui" => "stx:libview2"
+task "stx:libui" => "stx:libbasic"
+
task "stx:libview" => "stx:libbasic2"
task "stx:libview" => "stx:libbasic"
-task "stx:libhtml" => "stx:libwidg"
-task "stx:libhtml" => "stx:libview"
-task "stx:libhtml" => "stx:libbasic"
-
-task "stx:libtool" => "stx:libwidg2"
-task "stx:libtool" => "stx:libbasic3"
-task "stx:libtool" => "stx:libcomp"
-task "stx:libtool" => "stx:libbasic2"
-task "stx:libtool" => "stx:libui"
-task "stx:libtool" => "stx:goodies/sunit"
-task "stx:libtool" => "stx:libboss"
-task "stx:libtool" => "stx:libhtml"
-task "stx:libtool" => "stx:libview2"
-task "stx:libtool" => "stx:libbasic"
-task "stx:libtool" => "stx:libwidg"
-task "stx:libtool" => "stx:libview"
-
-task "stx:libcomp" => "stx:libbasic"
-
-task "stx:libboss" => "stx:libview"
-task "stx:libboss" => "stx:libbasic2"
-task "stx:libboss" => "stx:libbasic"
-
-task "stx:libwidg2" => "stx:libview"
-task "stx:libwidg2" => "stx:libui"
-task "stx:libwidg2" => "stx:libview2"
-task "stx:libwidg2" => "stx:libwidg"
-task "stx:libwidg2" => "stx:libbasic2"
-task "stx:libwidg2" => "stx:libbasic"
-
-task "stx:libbasic3" => "stx:libdb/libodbc"
-task "stx:libbasic3" => "stx:libbasic2"
-task "stx:libbasic3" => "stx:libdb/libsqlite"
-task "stx:libbasic3" => "stx:libbasic"
-
-task "stx:libui" => "stx:libview2"
-task "stx:libui" => "stx:libview"
-task "stx:libui" => "stx:libbasic"
-
-task "stx:libdb/libsqlite" => "stx:libdb"
-task "stx:libdb/libsqlite" => "stx:libbasic2"
-task "stx:libdb/libsqlite" => "stx:libbasic"
-
-task "stx:libjava/examples/tomcat6" => "stx:libjava"
+task "stx:libjava/examples/tomcat6" => "stx:libcomp"
task "stx:libjava/examples/tomcat6" => "stx:libview2"
task "stx:libjava/examples/tomcat6" => "stx:libbasic2"
-task "stx:libjava/examples/tomcat6" => "stx:libcomp"
+task "stx:libjava/examples/tomcat6" => "stx:libjava"
task "stx:libjava/examples/tomcat6" => "stx:libbasic"
--- a/examples/tomcat6/mingwmake.bat Wed Feb 13 20:31:46 2013 +0000
+++ b/examples/tomcat6/mingwmake.bat Thu Feb 14 16:15:31 2013 +0000
@@ -7,6 +7,8 @@
@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 -DUSEMINGW=1 %DEFINES% %*
+
+@call ..\..\..\rules\find_mingw.bat
+make.exe -N -f bc.mak %USEMINGW_ARG% %*
--- a/examples/tomcat6/modules.c Wed Feb 13 20:31:46 2013 +0000
+++ b/examples/tomcat6/modules.c Thu Feb 14 16:15:31 2013 +0000
@@ -1,6 +1,6 @@
/* $Header$
*
- * DO NOT EDIT
+ * DO NOT EDIT
* automagically generated from the projectDefinition: stx_libjava_examples_tomcat6.
*
* Warning: once you modify this file, do not rerun
--- a/examples/tomcat6/modules.stx Wed Feb 13 20:31:46 2013 +0000
+++ b/examples/tomcat6/modules.stx Thu Feb 14 16:15:31 2013 +0000
@@ -1,6 +1,6 @@
# $Header$
#
-# DO NOT EDIT
+# DO NOT EDIT
# automagically generated from the projectDefinition: stx_libjava_examples_tomcat6.
#
# Warning: once you modify this file, do not rerun
@@ -16,20 +16,20 @@
# Others might be autoloaded.
#
libstx_libbasic
+libstx_libcomp
libstx_libbasic2
-libstx_libcomp
-libstx_libview
libstx_libdb
-libstx_libview2
+libstx_libview
+libstx_libdb_libsqlite
+libstx_libdb_libodbc
libstx_libboss
-libstx_libdb_libodbc
-libstx_libdb_libsqlite
+libstx_libview2
+libstx_libbasic3
libstx_goodies_sunit
libstx_libui
-libstx_libbasic3
libstx_libwidg
+libstx_libwidg2
libstx_libhtml
-libstx_libwidg2
libstx_libtool
libstx_libjava
--- a/examples/tomcat6/stx_libjava_examples_tomcat6.st Wed Feb 13 20:31:46 2013 +0000
+++ b/examples/tomcat6/stx_libjava_examples_tomcat6.st Thu Feb 14 16:15:31 2013 +0000
@@ -178,7 +178,12 @@
!stx_libjava_examples_tomcat6 class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
! !
+
--- a/examples/tomcat6/tomcat6.nsi Wed Feb 13 20:31:46 2013 +0000
+++ b/examples/tomcat6/tomcat6.nsi Thu Feb 14 16:15:31 2013 +0000
@@ -86,7 +86,7 @@
File "symbols.stc"
File "*.stx"
File "*.rc"
- File /r "resources"
+ File /r /x CVS /x ".*" resources
@@ -111,7 +111,7 @@
;; SetOverwrite ifnewer
;; ; File /r /x CVS "${STX_ROOT}\stx\tomcat6\examples\*"
;; SectionEnd
-;;
+;;
;; Section "Apache Tomcat 6.x Controller Reports and Printing" Section4
;; SectionIn 1
;; SetOutPath "$INSTDIR\reportGenerator"
@@ -145,7 +145,7 @@
WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}"
SectionEnd
-LangString appOpen ${LANG_GERMAN} "Mit Apache Tomcat 6.x Controller ffnen"
+LangString appOpen ${LANG_GERMAN} "Mit Apache Tomcat 6.x Controller öffnen"
LangString appOpen ${LANG_ENGLISH} "Open with Apache Tomcat 6.x Controller"
LangString DESC_Section1 ${LANG_ENGLISH} "Program components of Apache Tomcat 6.x Controller"
@@ -179,7 +179,7 @@
Function un.onInit
!insertmacro MUI_UNGETLANGUAGE
- MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Mchten Sie Apache Tomcat 6.x Controller und alle seine Komponenten deinstallieren?" IDYES +2
+ MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Möchten Sie Apache Tomcat 6.x Controller und alle seine Komponenten deinstallieren?" IDYES +2
Abort
FunctionEnd
--- a/examples/tomcat6/tomcat6WinRC.rc Wed Feb 13 20:31:46 2013 +0000
+++ b/examples/tomcat6/tomcat6WinRC.rc Thu Feb 14 16:15:31 2013 +0000
@@ -1,5 +1,5 @@
//
-// DO NOT EDIT
+// DO NOT EDIT
// automagically generated from the projectDefinition: stx_libjava_examples_tomcat6.
//
#define IDR_MAINFRAME 128
@@ -38,7 +38,7 @@
VALUE "LegalCopyright", "Copyright Jan Vrany 2013\0"
VALUE "ProductName", "Apache Tomcat 6.x Controller\0"
VALUE "ProductVersion", "6.2.3.0\0"
- VALUE "ProductDate", "Fri, 11 Jan 2013 00:10:09 GMT\0"
+ VALUE "ProductDate", "Thu, 14 Feb 2013 16:12:24 GMT\0"
END
END
--- a/examples/vcmake.bat Wed Feb 13 20:31:46 2013 +0000
+++ b/examples/vcmake.bat Thu Feb 14 16:15:31 2013 +0000
@@ -7,6 +7,12 @@
@if not defined VSINSTALLDIR (
call ..\..\rules\vcsetup.bat
)
-make.exe -N -f bc.mak -DUSEVC %*
+@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/experiments/Benchmarks__JavaLookup.st Wed Feb 13 20:31:46 2013 +0000
+++ b/experiments/Benchmarks__JavaLookup.st Thu Feb 14 16:15:31 2013 +0000
@@ -201,6 +201,16 @@
!JavaLookup class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+!
+
version_SVN
^ '$Id$'
! !
+
--- a/experiments/ClassReloadingTests.st Wed Feb 13 20:31:46 2013 +0000
+++ b/experiments/ClassReloadingTests.st Thu Feb 14 16:15:31 2013 +0000
@@ -199,6 +199,10 @@
!ClassReloadingTests class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -207,3 +211,4 @@
version_SVN
^ '§Id:: §'
! !
+
--- a/experiments/JavaByteCodeInterpreter.st Wed Feb 13 20:31:46 2013 +0000
+++ b/experiments/JavaByteCodeInterpreter.st Thu Feb 14 16:15:31 2013 +0000
@@ -2986,6 +2986,10 @@
!JavaByteCodeInterpreter class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -2994,3 +2998,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/experiments/JavaByteCodeInterpreterTests.st Wed Feb 13 20:31:46 2013 +0000
+++ b/experiments/JavaByteCodeInterpreterTests.st Thu Feb 14 16:15:31 2013 +0000
@@ -1379,6 +1379,10 @@
!JavaByteCodeInterpreterTests class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -1387,3 +1391,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/experiments/JavaByteCodeSteppableInterpreter.st Wed Feb 13 20:31:46 2013 +0000
+++ b/experiments/JavaByteCodeSteppableInterpreter.st Thu Feb 14 16:15:31 2013 +0000
@@ -202,6 +202,10 @@
!JavaByteCodeSteppableInterpreter class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -210,3 +214,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/experiments/JavaCompiler.st Wed Feb 13 20:31:46 2013 +0000
+++ b/experiments/JavaCompiler.st Thu Feb 14 16:15:31 2013 +0000
@@ -540,6 +540,10 @@
!JavaCompiler class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -549,4 +553,5 @@
^ '§Id:: §'
! !
+
JavaCompiler initialize!
--- a/experiments/JavaCompilerTests.st Wed Feb 13 20:31:46 2013 +0000
+++ b/experiments/JavaCompilerTests.st Thu Feb 14 16:15:31 2013 +0000
@@ -70,16 +70,6 @@
"Created: #resources / 21-12-2012 / 18:24:51 / Marcel Hlopko <marcel.hlopko@fit.cvut.cz>"
! !
-!JavaCompilerTests class methodsFor:'resources'!
-
-resources
-
- ^ Array
- with: JavaInitializedResource.
-
- "Created: / 21-12-2012 / 18:24:51 / Marcel Hlopko <marcel.hlopko@fit.cvut.cz>"
-! !
-
!JavaCompilerTests class methodsFor:'accessing'!
resources
@@ -362,6 +352,10 @@
!JavaCompilerTests class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -370,3 +364,4 @@
version_SVN
^ '§Id:: §'
! !
+
--- a/experiments/JavaMethodWrapperCompiler.st Wed Feb 13 20:31:46 2013 +0000
+++ b/experiments/JavaMethodWrapperCompiler.st Thu Feb 14 16:15:31 2013 +0000
@@ -328,6 +328,10 @@
!JavaMethodWrapperCompiler class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -336,3 +340,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/experiments/Make.proto Wed Feb 13 20:31:46 2013 +0000
+++ b/experiments/Make.proto Thu Feb 14 16:15:31 2013 +0000
@@ -34,7 +34,7 @@
# add the path(es) here:,
# ********** OPTIONAL: MODIFY the next lines ***
# LOCALINCLUDES=-Ifoo -Ibar
-LOCALINCLUDES= -I$(INCLUDE_TOP)/stx/libview -I$(INCLUDE_TOP)/stx/libjava/tools -I$(INCLUDE_TOP)/stx/libjava -I$(INCLUDE_TOP)/stx/goodies/sunit -I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/libcomp -I$(INCLUDE_TOP)/stx/goodies/petitparser
+LOCALINCLUDES= -I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/goodies/petitparser -I$(INCLUDE_TOP)/stx/libjava -I$(INCLUDE_TOP)/stx/goodies/sunit -I$(INCLUDE_TOP)/stx/libcomp -I$(INCLUDE_TOP)/stx/libjava/tools -I$(INCLUDE_TOP)/stx/libview
# if you need any additional defines for embedded C code,
@@ -123,26 +123,25 @@
prereq: $(REQUIRED_SUPPORT_DIRS)
cd ../../libbasic && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd ../../libdb/libodbc && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd $(TOP)/../squeak/petitparser && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd ../../libcomp && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../../libbasic2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd ../../libcomp && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd ../../libdb && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../../libview && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd ../../libdb && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd ../../libdb/libsqlite && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd ../../libdb/libodbc && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd ../../libboss && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../../libview2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd ../../libboss && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd ../../libdb/libsqlite && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd ../../libbasic3 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../../goodies/sunit && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../../libui && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd ../../libbasic3 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../../goodies/petitparser && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd $(TOP)/../squeak/petitparser && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../../libwidg && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd ../../libwidg2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../../libhtml && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd ../../libwidg2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../../libtool && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../ && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../tools && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd ../../librun && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
--- a/experiments/Make.spec Wed Feb 13 20:31:46 2013 +0000
+++ b/experiments/Make.spec Thu Feb 14 16:15:31 2013 +0000
@@ -64,16 +64,16 @@
COMMON_OBJS= \
- $(OUTDIR)NoReflectionObject.$(O) \
- $(OUTDIR)stx_libjava_experiments.$(O) \
- $(OUTDIR)JavaMethodWrapperCompiler.$(O) \
- $(OUTDIR)PersonSample.$(O) \
- $(OUTDIR)SampleHandler.$(O) \
- $(OUTDIR)SetSample.$(O) \
- $(OUTDIR)JavaByteCodeInterpreter.$(O) \
- $(OUTDIR)JavaByteCodeSteppableInterpreter.$(O) \
- $(OUTDIR)JavaCompiler.$(O) \
- $(OUTDIR)extensions.$(O) \
+ $(OUTDIR_SLASH)NoReflectionObject.$(O) \
+ $(OUTDIR_SLASH)stx_libjava_experiments.$(O) \
+ $(OUTDIR_SLASH)JavaMethodWrapperCompiler.$(O) \
+ $(OUTDIR_SLASH)PersonSample.$(O) \
+ $(OUTDIR_SLASH)SampleHandler.$(O) \
+ $(OUTDIR_SLASH)SetSample.$(O) \
+ $(OUTDIR_SLASH)JavaByteCodeInterpreter.$(O) \
+ $(OUTDIR_SLASH)JavaByteCodeSteppableInterpreter.$(O) \
+ $(OUTDIR_SLASH)JavaCompiler.$(O) \
+ $(OUTDIR_SLASH)extensions.$(O) \
--- a/experiments/Makefile Wed Feb 13 20:31:46 2013 +0000
+++ b/experiments/Makefile Thu Feb 14 16:15:31 2013 +0000
@@ -15,5 +15,7 @@
#only needed for the definition of $(TOP)
include Make.proto
-makefile:
+makefile: mf
+
+mf:
$(TOP)/rules/stmkmf
--- a/experiments/NoReflectionObject.st Wed Feb 13 20:31:46 2013 +0000
+++ b/experiments/NoReflectionObject.st Thu Feb 14 16:15:31 2013 +0000
@@ -130,6 +130,10 @@
!NoReflectionObject class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -138,3 +142,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/experiments/PersonSample.st Wed Feb 13 20:31:46 2013 +0000
+++ b/experiments/PersonSample.st Thu Feb 14 16:15:31 2013 +0000
@@ -136,6 +136,10 @@
!PersonSample class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -144,3 +148,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/experiments/SampleHandler.st Wed Feb 13 20:31:46 2013 +0000
+++ b/experiments/SampleHandler.st Thu Feb 14 16:15:31 2013 +0000
@@ -111,6 +111,10 @@
!SampleHandler class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -119,3 +123,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/experiments/SetSample.st Wed Feb 13 20:31:46 2013 +0000
+++ b/experiments/SetSample.st Thu Feb 14 16:15:31 2013 +0000
@@ -80,6 +80,10 @@
!SetSample class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -88,3 +92,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/experiments/SingleClassReloadingTests.st Wed Feb 13 20:31:46 2013 +0000
+++ b/experiments/SingleClassReloadingTests.st Thu Feb 14 16:15:31 2013 +0000
@@ -439,6 +439,10 @@
!SingleClassReloadingTests class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -447,3 +451,4 @@
version_SVN
^ '§Id:: §'
! !
+
--- a/experiments/abbrev.stc Wed Feb 13 20:31:46 2013 +0000
+++ b/experiments/abbrev.stc Thu Feb 14 16:15:31 2013 +0000
@@ -9,7 +9,7 @@
SetSample SetSample stx:libjava/experiments 'Languages-Java-Experiments-Tests' 0
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' 0
+JavaByteCodeInterpreterTests JavaByteCodeInterpreterTests stx:libjava/experiments 'Languages-Java-Tests' 1
JavaByteCodeSteppableInterpreter JavaByteCodeSteppableInterpreter stx:libjava/experiments 'Languages-Java-Bytecode' 0
ClassReloadingTests ClassReloadingTests stx:libjava/experiments 'Languages-Java-Tests-ClassReloading' 1
JavaCompiler JavaCompiler stx:libjava/experiments 'Languages-Java-Support-Compiling' 0
--- a/experiments/bc.mak Wed Feb 13 20:31:46 2013 +0000
+++ b/experiments/bc.mak Thu Feb 14 16:15:31 2013 +0000
@@ -34,7 +34,7 @@
-LOCALINCLUDES= -I$(INCLUDE_TOP)\stx\libview -I$(INCLUDE_TOP)\stx\libjava\tools -I$(INCLUDE_TOP)\stx\libjava -I$(INCLUDE_TOP)\stx\goodies\sunit -I$(INCLUDE_TOP)\stx\libbasic -I$(INCLUDE_TOP)\stx\libcomp -I$(INCLUDE_TOP)\stx\goodies\petitparser
+LOCALINCLUDES= -I$(INCLUDE_TOP)\stx\libbasic -I$(INCLUDE_TOP)\stx\goodies\petitparser -I$(INCLUDE_TOP)\stx\libjava -I$(INCLUDE_TOP)\stx\goodies\sunit -I$(INCLUDE_TOP)\stx\libcomp -I$(INCLUDE_TOP)\stx\libjava\tools -I$(INCLUDE_TOP)\stx\libview
LOCALDEFINES=
STCLOCALOPT=-package=$(PACKAGE) -I. $(LOCALINCLUDES) -headerDir=. $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES) -varPrefix=$(LIBNAME)
@@ -51,26 +51,25 @@
# build all prerequisite packages for this package
prereq:
pushd ..\..\libbasic & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\..\libdb\libodbc & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\..\..\squeak\petitparser & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\..\libcomp & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\..\libbasic2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\..\libcomp & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\..\libdb & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\..\libview & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\..\libdb & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\..\libdb\libsqlite & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\..\libdb\libodbc & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\..\libboss & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\..\libview2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\..\libboss & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\..\libdb\libsqlite & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\..\libbasic3 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\..\goodies\sunit & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\..\libui & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\..\libbasic3 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\..\goodies\petitparser & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\..\..\squeak\petitparser & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\..\libwidg & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\..\libwidg2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\..\libhtml & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\..\libwidg2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\..\libtool & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd .. & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\tools & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\..\librun & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
--- a/experiments/experiments.rc Wed Feb 13 20:31:46 2013 +0000
+++ b/experiments/experiments.rc Thu Feb 14 16:15:31 2013 +0000
@@ -3,7 +3,7 @@
// automagically generated from the projectDefinition: stx_libjava_experiments.
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 6,2,32767,32767
+ FILEVERSION 6,2,564,564
PRODUCTVERSION 6,2,3,0
#if (__BORLANDC__)
FILEFLAGSMASK VS_FF_DEBUG | VS_FF_PRERELEASE
@@ -20,12 +20,12 @@
BEGIN
VALUE "CompanyName", "eXept Software AG\0"
VALUE "FileDescription", "Smalltalk/X Class library (LIB)\0"
- VALUE "FileVersion", "6.2.32767.32767\0"
+ VALUE "FileVersion", "6.2.564.564\0"
VALUE "InternalName", "stx:libjava/experiments\0"
VALUE "LegalCopyright", "Copyright Claus Gittinger 1988-2013\nCopyright eXept Software AG 1998-2013\0"
VALUE "ProductName", "Smalltalk/X\0"
VALUE "ProductVersion", "6.2.3.0\0"
- VALUE "ProductDate", "Tue, 15 Jan 2013 18:09:19 GMT\0"
+ VALUE "ProductDate", "Thu, 14 Feb 2013 16:12:11 GMT\0"
END
END
--- a/experiments/mingwmake.bat Wed Feb 13 20:31:46 2013 +0000
+++ b/experiments/mingwmake.bat Thu Feb 14 16:15:31 2013 +0000
@@ -7,6 +7,8 @@
@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 -DUSEMINGW=1 %DEFINES% %*
+
+@call ..\..\rules\find_mingw.bat
+make.exe -N -f bc.mak %USEMINGW_ARG% %*
--- a/experiments/stx_libjava_experiments.st Wed Feb 13 20:31:46 2013 +0000
+++ b/experiments/stx_libjava_experiments.st Thu Feb 14 16:15:31 2013 +0000
@@ -161,6 +161,10 @@
!stx_libjava_experiments class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -169,3 +173,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/libjava.rc Wed Feb 13 20:31:46 2013 +0000
+++ b/libjava.rc Thu Feb 14 16:15:31 2013 +0000
@@ -3,7 +3,7 @@
// automagically generated from the projectDefinition: stx_libjava.
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 6,2,32767,32767
+ FILEVERSION 6,2,564,564
PRODUCTVERSION 6,2,3,0
#if (__BORLANDC__)
FILEFLAGSMASK VS_FF_DEBUG | VS_FF_PRERELEASE
@@ -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.32767.32767\0"
+ VALUE "FileVersion", "6.2.564.564\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.3.0\0"
- VALUE "ProductDate", "Tue, 12 Feb 2013 20:01:34 GMT\0"
+ VALUE "ProductDate", "Thu, 14 Feb 2013 16:11:53 GMT\0"
END
END
--- a/libs/Make.proto Wed Feb 13 20:31:46 2013 +0000
+++ b/libs/Make.proto Thu Feb 14 16:15:31 2013 +0000
@@ -127,7 +127,6 @@
prereq: $(REQUIRED_SUPPORT_DIRS)
cd ../../libbasic && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd ../../librun && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
--- a/libs/Make.spec Wed Feb 13 20:31:46 2013 +0000
+++ b/libs/Make.spec Thu Feb 14 16:15:31 2013 +0000
@@ -56,7 +56,7 @@
COMMON_OBJS= \
- $(OUTDIR)stx_libjava_libs.$(O) \
+ $(OUTDIR_SLASH)stx_libjava_libs.$(O) \
--- a/libs/Makefile Wed Feb 13 20:31:46 2013 +0000
+++ b/libs/Makefile Thu Feb 14 16:15:31 2013 +0000
@@ -15,5 +15,7 @@
#only needed for the definition of $(TOP)
include Make.proto
-makefile:
+makefile: mf
+
+mf:
$(TOP)/rules/stmkmf
--- a/libs/bc.mak Wed Feb 13 20:31:46 2013 +0000
+++ b/libs/bc.mak Thu Feb 14 16:15:31 2013 +0000
@@ -51,7 +51,6 @@
# build all prerequisite packages for this package
prereq:
pushd ..\..\libbasic & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\..\librun & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
--- a/libs/libs.rc Wed Feb 13 20:31:46 2013 +0000
+++ b/libs/libs.rc Thu Feb 14 16:15:31 2013 +0000
@@ -3,7 +3,7 @@
// automagically generated from the projectDefinition: stx_libjava_libs.
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 6,2,32767,32767
+ FILEVERSION 6,2,564,564
PRODUCTVERSION 6,2,3,0
#if (__BORLANDC__)
FILEFLAGSMASK VS_FF_DEBUG | VS_FF_PRERELEASE
@@ -20,12 +20,12 @@
BEGIN
VALUE "CompanyName", "eXept Software AG & SWING Research Group\0"
VALUE "FileDescription", "Java support for Smalltalk/X - external java libraries (LIB)\0"
- VALUE "FileVersion", "6.2.32767.32767\0"
+ VALUE "FileVersion", "6.2.564.564\0"
VALUE "InternalName", "stx:libjava/libs\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.3.0\0"
- VALUE "ProductDate", "Wed, 16 Jan 2013 13:28:06 GMT\0"
+ VALUE "ProductDate", "Thu, 14 Feb 2013 16:12:36 GMT\0"
END
END
--- a/libs/mingwmake.bat Wed Feb 13 20:31:46 2013 +0000
+++ b/libs/mingwmake.bat Thu Feb 14 16:15:31 2013 +0000
@@ -7,6 +7,8 @@
@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 -DUSEMINGW=1 %DEFINES% %*
+
+@call ..\..\rules\find_mingw.bat
+make.exe -N -f bc.mak %USEMINGW_ARG% %*
--- a/libs/stx_libjava_libs.st Wed Feb 13 20:31:46 2013 +0000
+++ b/libs/stx_libjava_libs.st Thu Feb 14 16:15:31 2013 +0000
@@ -185,6 +185,10 @@
!stx_libjava_libs class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -193,3 +197,4 @@
version_SVN
^ '§Id:: §'
! !
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mauve/Make.proto Thu Feb 14 16:15:31 2013 +0000
@@ -0,0 +1,159 @@
+# $Header$
+#
+# DO NOT EDIT
+# automagically generated from the projectDefinition: stx_libjava_mauve.
+#
+# Warning: once you modify this file, do not rerun
+# stmkmp or projectDefinition-build again - otherwise, your changes are lost.
+#
+# The Makefile as generated by this Make.proto supports the following targets:
+# make - compile all st-files to a classLib
+# make clean - clean all temp files
+# make clobber - clean all
+#
+# This file contains definitions for Unix based platforms.
+# It shares common definitions with the win32-make in Make.spec.
+
+#
+# position (of this package) in directory hierarchy:
+# (must point to ST/X top directory, for tools and includes)
+TOP=../..
+INCLUDE_TOP=$(TOP)/..
+
+# subdirectories where targets are to be made:
+SUBDIRS=
+
+
+# subdirectories where Makefiles are to be made:
+# (only define if different from SUBDIRS)
+# ALLSUBDIRS=
+
+REQUIRED_SUPPORT_DIRS=
+
+# if your embedded C code requires any system includes,
+# add the path(es) here:,
+# ********** OPTIONAL: MODIFY the next lines ***
+# LOCALINCLUDES=-Ifoo -Ibar
+LOCALINCLUDES= -I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/libjava
+
+
+# if you need any additional defines for embedded C code,
+# add them here:,
+# ********** OPTIONAL: MODIFY the next lines ***
+# LOCALDEFINES=-Dfoo -Dbar -DDEBUG
+LOCALDEFINES=
+
+LIBNAME=libstx_libjava_mauve
+STCLOCALOPT='-package=$(PACKAGE)' -I. $(LOCALINCLUDES) $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES) -headerDir=. -varPrefix=$(LIBNAME)
+
+
+# ********** OPTIONAL: MODIFY the next line ***
+# additional C-libraries that should be pre-linked with the class-objects
+LD_OBJ_LIBS=
+LOCAL_SHARED_LIBS=
+
+
+# ********** OPTIONAL: MODIFY the next line ***
+# additional C targets or libraries should be added below
+LOCAL_EXTRA_TARGETS=
+
+OBJS= $(COMMON_OBJS) $(UNIX_OBJS)
+
+
+
+all:: preMake classLibRule postMake
+
+pre_objs::
+
+
+
+
+# Update SVN revision in package definition class
+ifneq (,$(findstring .svn,$(wildcard .svn)))
+.svnversion: *.st
+ if [ -d .svn ]; then \
+ rev=$(shell svnversion -n); \
+ echo -n $$rev > .svnversion; \
+ else \
+ echo -n exported > .svnversion; \
+ fi
+
+stx_libjava_mauve.o: stx_libjava_mauve.st .svnversion
+ @if [ -d .svn ]; then \
+ rev2="$(shell printf "%-16s" $$(cat .svnversion))"; \
+ echo " [SV] Expanding svnRevisionNo in $1.st"; \
+ sed -e "s/\"\$$SVN\-Revision:\".*\"\$$\"/\"\$$SVN-Revision:\"\'$$rev2\'\"\$$\"/g" $< > .stx_libjava_mauve.svn.st; \
+ fi
+ $(MAKE) CC="$(CLASSLIB_CC)" OPT="$(OPT)" SEPINITCODE="$(SEPINITCODE)" STC="$(STC)" STFILE=.stx_libjava_mauve.svn $(C_RULE);
+ sed -i -e "s/\".stx_libjava_mauve.svn.st\");/\"\stx_libjava_mauve.st\");/g" .stx_libjava_mauve.svn.c
+ $(MAKE) .stx_libjava_mauve.svn.$(O)
+ @mv .stx_libjava_mauve.svn.$(O) stx_libjava_mauve.$(O)
+endif
+
+
+
+# Enforce recompilation of package definition class if Mercurial working
+# copy state changes. Together with --guessVersion it ensures that package
+# definition class always contains correct binary revision string.
+ifneq (**NOHG**, $(shell hg root 2> /dev/null || echo -n '**NOHG**'))
+stx_libjava_mauve.$(O): $(shell hg root)/.hg/dirstate
+endif
+
+
+
+
+# run default testsuite for this package
+test: $(TOP)/goodies/builder/reports
+ $(MAKE) -C $(TOP)/goodies/builder/reports
+ $(TOP)/goodies/builder/reports/report-runner.sh -D . -r Builder::TestReport -p $(PACKAGE)
+
+
+
+# add more install actions here
+install::
+
+# add more install actions for aux-files (resources) here
+installAux::
+
+# add more preMake actions here
+preMake::
+
+# add more postMake actions here
+postMake:: cleanjunk
+
+prereq: $(REQUIRED_SUPPORT_DIRS)
+ cd ../../libbasic && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd ../../libcomp && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd ../../libbasic2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd ../../libdb && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd ../../libview && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd ../../libdb/libsqlite && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd ../../libdb/libodbc && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd ../../libboss && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd ../../libview2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd ../../libbasic3 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd ../../goodies/sunit && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd ../../libui && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd ../../libwidg && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd ../../libwidg2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd ../../libhtml && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd ../../libtool && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd ../ && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+
+
+
+cleanjunk::
+ -rm -f *.s *.s2
+
+clean::
+ -rm -f *.o *.H
+
+clobber:: clean
+ -rm -f *.so *.dll
+
+
+# BEGINMAKEDEPEND --- do not remove this line; make depend needs it
+$(OUTDIR)stx_libjava_mauve.$(O) stx_libjava_mauve.$(H): stx_libjava_mauve.st $(INCLUDE_TOP)/stx/libbasic/LibraryDefinition.$(H) $(INCLUDE_TOP)/stx/libbasic/ProjectDefinition.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+
+# ENDMAKEDEPEND --- do not remove this line
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mauve/Make.spec Thu Feb 14 16:15:31 2013 +0000
@@ -0,0 +1,62 @@
+# $Header$
+#
+# DO NOT EDIT
+# automagically generated from the projectDefinition: stx_libjava_mauve.
+#
+# Warning: once you modify this file, do not rerun
+# stmkmp or projectDefinition-build again - otherwise, your changes are lost.
+#
+# This file contains specifications which are common to all platforms.
+#
+
+# Do NOT CHANGE THESE DEFINITIONS
+# (otherwise, ST/X will have a hard time to find out the packages location from its packageID,
+# to find the source code of a class and to find the library for a package)
+MODULE=stx
+MODULE_DIR=libjava/mauve
+PACKAGE=$(MODULE):$(MODULE_DIR)
+
+
+# Argument(s) to the stc compiler (stc --usage).
+# -headerDir=. : create header files locally
+# (if removed, they will be created as common
+# -Pxxx : defines the package
+# -Zxxx : a prefix for variables within the classLib
+# -Dxxx : defines passed to to CC for inline C-code
+# -Ixxx : include path passed to CC for inline C-code
+# +optspace : optimized for space
+# +optspace2 : optimized more for space
+# +optspace3 : optimized even more for space
+# +optinline : generate inline code for some ST constructs
+# +inlineNew : additionally inline new
+# +inlineMath : additionally inline some floatPnt math stuff
+#
+# ********** OPTIONAL: MODIFY the next line(s) ***
+# STCLOCALOPTIMIZATIONS=+optinline +inlineNew
+# STCLOCALOPTIMIZATIONS=+optspace3
+STCLOCALOPTIMIZATIONS=+optspace3
+
+
+# Argument(s) to the stc compiler (stc --usage).
+# -warn : no warnings
+# -warnNonStandard : no warnings about ST/X extensions
+# -warnEOLComments : no warnings about EOL comment extension
+# -warnPrivacy : no warnings about privateClass extension
+#
+# ********** OPTIONAL: MODIFY the next line(s) ***
+# STCWARNINGS=-warn
+# STCWARNINGS=-warnNonStandard
+# STCWARNINGS=-warnEOLComments
+STCWARNINGS=-warnNonStandard
+
+COMMON_CLASSES= \
+ stx_libjava_mauve \
+
+
+
+
+COMMON_OBJS= \
+ $(OUTDIR_SLASH)stx_libjava_mauve.$(O) \
+
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mauve/Makefile Thu Feb 14 16:15:31 2013 +0000
@@ -0,0 +1,21 @@
+#
+# DO NOT EDIT
+#
+# make uses this file (Makefile) only, if there is no
+# file named "makefile" (lower-case m) in the same directory.
+# My only task is to generate the real makefile and call make again.
+# Thereafter, I am no longer used and needed.
+#
+
+.PHONY: run
+
+run: makefile
+ $(MAKE) -f makefile
+
+#only needed for the definition of $(TOP)
+include Make.proto
+
+makefile: mf
+
+mf:
+ $(TOP)/rules/stmkmf
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mauve/abbrev.stc Thu Feb 14 16:15:31 2013 +0000
@@ -0,0 +1,4 @@
+# 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.
+stx_libjava_mauve stx_libjava_mauve stx:libjava/mauve '* Projects & Packages *' 3
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mauve/bc.mak Thu Feb 14 16:15:31 2013 +0000
@@ -0,0 +1,92 @@
+# $Header$
+#
+# DO NOT EDIT
+# automagically generated from the projectDefinition: stx_libjava_mauve.
+#
+# Warning: once you modify this file, do not rerun
+# stmkmp or projectDefinition-build again - otherwise, your changes are lost.
+#
+# Notice, that the name bc.mak is historical (from times, when only borland c was supported).
+# This file contains make rules for the win32 platform using either borland-bcc or visual-c.
+# It shares common definitions with the unix-make in Make.spec.
+# The bc.mak supports the following targets:
+# bmake - compile all st-files to a classLib (dll)
+# bmake clean - clean all temp files
+# bmake clobber - clean all
+#
+# Historic Note:
+# this used to contain only rules to make with borland
+# (called via bmake, by "make.exe -f bc.mak")
+# this has changed; it is now also possible to build using microsoft visual c
+# (called via vcmake, by "make.exe -f bc.mak -DUSEVC")
+#
+TOP=..\..
+INCLUDE_TOP=$(TOP)\..
+
+
+
+!INCLUDE $(TOP)\rules\stdHeader_bc
+
+!INCLUDE Make.spec
+
+LIBNAME=libstx_libjava_mauve
+RESFILES=mauve.res
+
+
+
+LOCALINCLUDES= -I$(INCLUDE_TOP)\stx\libbasic -I$(INCLUDE_TOP)\stx\libjava
+LOCALDEFINES=
+
+STCLOCALOPT=-package=$(PACKAGE) -I. $(LOCALINCLUDES) -headerDir=. $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES) -varPrefix=$(LIBNAME)
+LOCALLIBS=
+
+OBJS= $(COMMON_OBJS) $(WIN32_OBJS)
+
+ALL:: classLibRule
+
+classLibRule: $(OUTDIR) $(OUTDIR)$(LIBNAME).dll
+
+!INCLUDE $(TOP)\rules\stdRules_bc
+
+# build all prerequisite packages for this package
+prereq:
+ pushd ..\..\libbasic & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\..\libcomp & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\..\libbasic2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\..\libdb & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\..\libview & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\..\libdb\libsqlite & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\..\libdb\libodbc & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\..\libboss & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\..\libview2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\..\libbasic3 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\..\goodies\sunit & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\..\libui & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\..\libwidg & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\..\libwidg2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\..\libhtml & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\..\libtool & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd .. & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+
+
+
+
+
+
+test: $(TOP)\goodies\builder\reports\NUL
+ pushd $(TOP)\goodies\builder\reports & $(MAKE_BAT)
+ $(TOP)\goodies\builder\reports\report-runner.bat -D . -r Builder::TestReport -p $(PACKAGE)
+
+# BEGINMAKEDEPEND --- do not remove this line; make depend needs it
+$(OUTDIR)stx_libjava_mauve.$(O) stx_libjava_mauve.$(H): stx_libjava_mauve.st $(INCLUDE_TOP)\stx\libbasic\LibraryDefinition.$(H) $(INCLUDE_TOP)\stx\libbasic\ProjectDefinition.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+
+# ENDMAKEDEPEND --- do not remove this line
+
+# **Must be at end**
+
+# Enforce recompilation of package definition class if Mercurial working
+# copy state changes. Together with --guessVersion it ensures that package
+# definition class always contains correct binary revision string.
+!IFDEF HGROOT
+$(OUTDIR)stx_libjava_mauve.$(O): $(HGROOT)\.hg\dirstate
+!ENDIF
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mauve/bmake.bat Thu Feb 14 16:15:31 2013 +0000
@@ -0,0 +1,12 @@
+@REM -------
+@REM make using Borland bcc32
+@REM type bmake, and wait...
+@REM do not edit - automatically generated from ProjectDefinition
+@REM -------
+@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 %DEFINES% %*
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mauve/lccmake.bat Thu Feb 14 16:15:31 2013 +0000
@@ -0,0 +1,8 @@
+@REM -------
+@REM make using lcc compiler
+@REM type lccmake, and wait...
+@REM do not edit - automatically generated from ProjectDefinition
+@REM -------
+make.exe -N -f bc.mak -DUSELCC=1 %*
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mauve/libInit.cc Thu Feb 14 16:15:31 2013 +0000
@@ -0,0 +1,34 @@
+/*
+ * $Header$
+ *
+ * DO NOT EDIT
+ * automagically generated from the projectDefinition: stx_libjava_mauve.
+ */
+#define __INDIRECTVMINITCALLS__
+#include <stc.h>
+
+#ifdef WIN32
+# pragma codeseg INITCODE "INITCODE"
+#endif
+
+#if defined(INIT_TEXT_SECTION) || defined(DLL_EXPORT)
+DLL_EXPORT void _libstx_libjava_mauve_Init() INIT_TEXT_SECTION;
+// DLL_EXPORT void _libstx_libjava_mauve_InitDefinition() INIT_TEXT_SECTION;
+#endif
+
+// void _libstx_libjava_mauve_InitDefinition(pass, __pRT__, snd)
+// OBJ snd; struct __vmData__ *__pRT__; {
+// __BEGIN_PACKAGE2__("libstx_libjava_mauve__DFN", _libstx_libjava_mauve_InitDefinition, "stx:libjava/mauve");
+// _stx_137libjava_137mauve_Init(pass,__pRT__,snd);
+
+// __END_PACKAGE__();
+// }
+
+void _libstx_libjava_mauve_Init(pass, __pRT__, snd)
+OBJ snd; struct __vmData__ *__pRT__; {
+__BEGIN_PACKAGE2__("libstx_libjava_mauve", _libstx_libjava_mauve_Init, "stx:libjava/mauve");
+_stx_137libjava_137mauve_Init(pass,__pRT__,snd);
+
+
+__END_PACKAGE__();
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mauve/mauve.rc Thu Feb 14 16:15:31 2013 +0000
@@ -0,0 +1,37 @@
+//
+// DO NOT EDIT
+// automagically generated from the projectDefinition: stx_libjava_mauve.
+//
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 6,2,32767,32767
+ PRODUCTVERSION 6,2,3,0
+#if (__BORLANDC__)
+ FILEFLAGSMASK VS_FF_DEBUG | VS_FF_PRERELEASE
+ FILEFLAGS VS_FF_PRERELEASE | VS_FF_SPECIALBUILD
+ FILEOS VOS_NT_WINDOWS32
+ FILETYPE VFT_DLL
+ FILESUBTYPE VS_USER_DEFINED
+#endif
+
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "040904E4"
+ BEGIN
+ VALUE "CompanyName", "SWING Research Group, Czech Technical University in Prague\0"
+ VALUE "FileDescription", "Mauve test suite (LIB)\0"
+ VALUE "FileVersion", "6.2.32767.32767\0"
+ VALUE "InternalName", "stx:libjava/mauve\0"
+ VALUE "LegalCopyright", "Copyright 2011-2012 Marcel Hlopko, Jan Kurs and Jan Vrany\0"
+ VALUE "ProductName", "Mauve test suite for libjava\0"
+ VALUE "ProductVersion", "6.2.3.0\0"
+ VALUE "ProductDate", "Thu, 14 Feb 2013 16:12:38 GMT\0"
+ END
+
+ END
+
+ BLOCK "VarFileInfo"
+ BEGIN // Language | Translation
+ VALUE "Translation", 0x409, 0x4E4 // U.S. English, Windows Multilingual
+ END
+END
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mauve/mingwmake.bat Thu Feb 14 16:15:31 2013 +0000
@@ -0,0 +1,14 @@
+@REM -------
+@REM make using mingw gnu compiler
+@REM type mingwmake, and wait...
+@REM do not edit - automatically generated from ProjectDefinition
+@REM -------
+@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%"
+
+@call ..\..\rules\find_mingw.bat
+make.exe -N -f bc.mak %USEMINGW_ARG% %*
+
+
--- a/mauve/stx_libjava_mauve.st Wed Feb 13 20:31:46 2013 +0000
+++ b/mauve/stx_libjava_mauve.st Thu Feb 14 16:15:31 2013 +0000
@@ -136,6 +136,16 @@
!stx_libjava_mauve class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+!
+
version_SVN
^ '$Id$'
! !
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mauve/vcmake.bat Thu Feb 14 16:15:31 2013 +0000
@@ -0,0 +1,18 @@
+@REM -------
+@REM make using Microsoft Visual C compiler
+@REM type vcmake, and wait...
+@REM do not edit - automatically generated from ProjectDefinition
+@REM -------
+
+@if not defined VSINSTALLDIR (
+ call ..\..\rules\vcsetup.bat
+)
+@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/startup/JavaStartup.st Wed Feb 13 20:31:46 2013 +0000
+++ b/startup/JavaStartup.st Thu Feb 14 16:15:31 2013 +0000
@@ -1,3 +1,23 @@
+"
+ COPYRIGHT (c) 1996-2011 by Claus Gittinger
+
+ New code and modifications done at SWING Research Group [1]:
+
+ COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
+ SWING Research Group, Czech Technical University in Prague
+
+ This software is furnished under a license and may be used
+ only in accordance with the terms of that license and with the
+ inclusion of the above copyright notice. This software may not
+ be provided or otherwise made available to, or used by, any
+ other person. No title to or ownership of the software is
+ hereby transferred.
+
+ [1] Code written at SWING Research Group contains a signature
+ of one of the above copright owners. For exact set of such code,
+ see the differences between this version and version stx:libjava
+ as of 1.9.2010
+"
"{ Package: 'stx:libjava/startup' }"
StandaloneStartup subclass:#JavaStartup
@@ -7,6 +27,31 @@
category:'Languages-Java-Support'
!
+!JavaStartup class methodsFor:'documentation'!
+
+copyright
+"
+ COPYRIGHT (c) 1996-2011 by Claus Gittinger
+
+ New code and modifications done at SWING Research Group [1]:
+
+ COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
+ SWING Research Group, Czech Technical University in Prague
+
+ This software is furnished under a license and may be used
+ only in accordance with the terms of that license and with the
+ inclusion of the above copyright notice. This software may not
+ be provided or otherwise made available to, or used by, any
+ other person. No title to or ownership of the software is
+ hereby transferred.
+
+ [1] Code written at SWING Research Group contains a signature
+ of one of the above copright owners. For exact set of such code,
+ see the differences between this version and version stx:libjava
+ as of 1.9.2010
+
+"
+! !
!JavaStartup class methodsFor:'constants & defaults'!
@@ -36,37 +81,39 @@
!JavaStartup class methodsFor:'startup'!
-main:argv
+main: argv
"Currently only -c option for classpath setting working"
- |class arguments classAndArguments classpath classpathFromEnv|
+ | class arguments classAndArguments classpath classpathFromEnv |
classpath := OrderedCollection new.
- classpathFromEnv := OperatingSystem getEnvironment:#CLASSPATH.
- classpathFromEnv isNil ifFalse:[
- (classpathFromEnv asArrayOfSubstringsSeparatedBy:$:) do:[:each |
- classpath add:each
+ classpathFromEnv := OperatingSystem getEnvironment: #CLASSPATH.
+ classpathFromEnv isNil ifFalse: [
+ (classpathFromEnv asArrayOfSubstringsSeparatedBy: $:) do: [
+ :each |
+ classpath add: each
]
].
classAndArguments := OrderedCollection new.
(GetOpt new)
- at:$c
- put:[:opt :arg | (arg asArrayOfSubstringsSeparatedBy:$:) do: [:each | classpath add: each]];
- at:$? put:[:arg | self error:'not yet implemented'];
- default:[:arg | classAndArguments add:arg];
- parse:argv.
- class := classAndArguments at:1.
+ at: $c
+ put: [
+ :opt :arg |
+ (arg asArrayOfSubstringsSeparatedBy: $:) do: [:each | classpath add: each ]
+ ];
+ at: $? put: [:arg | self error: 'not yet implemented' ];
+ default: [:arg | classAndArguments add: arg ];
+ parse: argv.
+ class := classAndArguments at: 1.
arguments := classAndArguments
removeFirst;
yourself.
Java flushAllJavaResources.
- self breakPoint:#mh.
+ self breakPoint: #mh.
Java initialize.
JavaVM initializeVM.
- classpath do:[:each |
- Java addToClassPath:each
- ].
- (Java classForName:class) main:arguments asArray.
+ classpath do: [:each | Java addToClassPath: each ].
+ (JavaVM classForName: class) main: arguments asArray.
"Created: / 07-02-2011 / 10:55:41 / Marcel Hlopko <hlopik@gmail.com>"
"Modified: / 08-02-2011 / 00:55:42 / Marcel Hlopko <hlopik@gmail.com>"
@@ -74,6 +121,16 @@
!JavaStartup class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+!
+
version_SVN
- ^ '$Id$'
+ ^ '§Id§'
! !
+
--- a/startup/Make.proto Wed Feb 13 20:31:46 2013 +0000
+++ b/startup/Make.proto Thu Feb 14 16:15:31 2013 +0000
@@ -0,0 +1,398 @@
+# $Header$
+#
+# automagically generated from the projectDefinition: stx_libjava_startup.
+#
+# -------------- no need to change anything below ----------
+#
+# This makefile generates some standalone demo applications
+#
+# make
+# generates startup
+#
+
+TOP=../..
+INCLUDE_TOP=$(TOP)/..
+
+PACKAGE=stx:libjava/startup
+SUBDIRS=
+SUPPRESS_LOCAL_ABBREVS="yes"
+NOAUTOLOAD=1
+NOSUBAUTOLOAD=1
+
+LOCALINCLUDES=-I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/libjava -I$(INCLUDE_TOP)/stx/libcomp
+LOCALDEFINES=
+GLOBALDEFINES=
+MAIN_DEFINES=-DIGNORE_IMAGE -DNO_DISPLAY
+
+RCSSOURCES=Make.proto *.st
+LINKSOURCES=Make.proto *.st
+
+DELIVERBINARIES=
+
+target: ALL
+
+all:: prereq exe
+
+LIBNAME=libstx_libjava_startup
+STCLOCALOPT='-package=$(PACKAGE)' -I. -headerDir=. $(LOCALINCLUDES) $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES) -headerDir=. -varPrefix=$(LIBNAME)
+
+
+# ********** OPTIONAL: MODIFY the next line ***
+# additional C-libraries that should be pre-linked with the class-objects
+LD_OBJ_LIBS=
+LOCAL_SHARED_LIBS=
+
+
+# ********** OPTIONAL: MODIFY the next line ***
+# additional C targets or libraries should be added below
+LOCAL_EXTRA_TARGETS=
+
+OBJS= $(COMMON_OBJS) $(UNIX_OBJS)
+
+
+
+
+
+LIBLIST = $(REQUIRED_LIBS)
+
+# required libs:
+#
+
+REQUIRED_LIBS= libstx_libbasic \
+ libstx_libcomp \
+ libstx_libbasic2 \
+ libstx_libdb \
+ libstx_libview \
+ libstx_libdb_libsqlite \
+ libstx_libdb_libodbc \
+ libstx_libboss \
+ libstx_libview2 \
+ libstx_libbasic3 \
+ libstx_goodies_sunit \
+ libstx_libui \
+ libstx_libwidg \
+ libstx_libwidg2 \
+ libstx_libhtml \
+ libstx_libtool \
+ libstx_libjava \
+
+
+REQUIRED_LIBOBJS= ../../libbasic/libstx_libbasic$(O_EXT) \
+ ../../libcomp/libstx_libcomp$(O_EXT) \
+ ../../libbasic2/libstx_libbasic2$(O_EXT) \
+ ../../libdb/libstx_libdb$(O_EXT) \
+ ../../libview/libstx_libview$(O_EXT) \
+ ../../libdb/libsqlite/libstx_libdb_libsqlite$(O_EXT) \
+ ../../libdb/libodbc/libstx_libdb_libodbc$(O_EXT) \
+ ../../libboss/libstx_libboss$(O_EXT) \
+ ../../libview2/libstx_libview2$(O_EXT) \
+ ../../libbasic3/libstx_libbasic3$(O_EXT) \
+ ../../goodies/sunit/libstx_goodies_sunit$(O_EXT) \
+ ../../libui/libstx_libui$(O_EXT) \
+ ../../libwidg/libstx_libwidg$(O_EXT) \
+ ../../libwidg2/libstx_libwidg2$(O_EXT) \
+ ../../libhtml/libstx_libhtml$(O_EXT) \
+ ../../libtool/libstx_libtool$(O_EXT) \
+ ..//libstx_libjava$(O_EXT) \
+
+
+REQUIRED_LINK_LIBOBJS= libstx_libbasic$(O_EXT) \
+ libstx_libcomp$(O_EXT) \
+ libstx_libbasic2$(O_EXT) \
+ libstx_libdb$(O_EXT) \
+ libstx_libview$(O_EXT) \
+ libstx_libdb_libsqlite$(O_EXT) \
+ libstx_libdb_libodbc$(O_EXT) \
+ libstx_libboss$(O_EXT) \
+ libstx_libview2$(O_EXT) \
+ libstx_libbasic3$(O_EXT) \
+ libstx_goodies_sunit$(O_EXT) \
+ libstx_libui$(O_EXT) \
+ libstx_libwidg$(O_EXT) \
+ libstx_libwidg2$(O_EXT) \
+ libstx_libhtml$(O_EXT) \
+ libstx_libtool$(O_EXT) \
+ libstx_libjava$(O_EXT) \
+
+
+REQUIRED_SUPPORT_DIRS=RESOURCEFILES
+
+exe: startup $(REQUIRED_SUPPORT_DIRS)
+
+startup: $(APP_DIRS_TO_MAKE) $(APP_LIBOBJS) $(OBJS)
+ $(MAKE) link_startup
+
+link_startup:
+ $(MAKE) NON_GUI_APPLICATION \
+ TARGET=startup \
+ APPLICATION_CLASSES="$(COMMON_CLASSES) $(UNIX_CLASSES)" \
+ APPLICATION_OBJS="$(OBJS)" \
+ APPLICATION_LIBLIST="$(REQUIRED_LIBS)" \
+ APPLICATION_LIBOBJS="$(REQUIRED_LIBOBJS)" \
+ APPLICATION_LINK_LIBOBJS="$(REQUIRED_LINK_LIBOBJS)" \
+ STARTUP_CLASS="JavaStartup" \
+ STARTUP_SELECTOR="start" \
+ MAIN_DEFINES="-DIGNORE_IMAGE -DNO_DISPLAY"
+
+# build all prerequisite packages for this package
+prereq:
+ cd ../../libbasic && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd ../../libcomp && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd ../../libbasic2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd ../../libdb && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd ../../libview && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd ../../libdb/libsqlite && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd ../../libdb/libodbc && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd ../../libboss && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd ../../libview2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd ../../libbasic3 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd ../../goodies/sunit && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd ../../libui && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd ../../libwidg && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd ../../libwidg2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd ../../libhtml && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd ../../libtool && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd ../ && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+
+
+
+setup:
+ @if test -d autoPackage; then \
+ makepackage; \
+ else \
+ echo "Error: make setup not yet available in linux/unix"; \
+ exit 1; \
+ fi
+
+SOURCEFILES: startup_SOURCES \
+ stx_SOURCES
+
+
+
+
+RESOURCEFILES: startup_RESOURCES startup_BITMAPS \
+ stx_RESOURCES stx_STYLES stx_BITMAPS
+
+
+startup_RESOURCES:
+ mkdir -p resources/stx/libjava/startup
+ -cp ../resources/*.rs ../resources/*.style resources/stx/libjava/startup/..
+
+startup_BITMAPS:
+ mkdir -p resources/stx/libjava/startup/bitmaps
+ -cp *.ico *.gif *.png resources/stx/libjava/startup/bitmaps
+
+
+
+stx_RESOURCES: \
+ keyboard.rc \
+ keyboardMacros.rc \
+ display.rc \
+ libbasic_RESOURCES \
+ libview_RESOURCES \
+ libtool_RESOURCES \
+ libtool2_RESOURCES
+
+keyboard.rc: $(TOP)/projects/smalltalk/keyboard.rc
+ cp $(TOP)/projects/smalltalk/keyboard.rc .
+
+keyboardMacros.rc: $(TOP)/projects/smalltalk/keyboardMacros.rc
+ cp $(TOP)/projects/smalltalk/keyboardMacros.rc .
+
+display.rc: $(TOP)/projects/smalltalk/display.rc
+ cp $(TOP)/projects/smalltalk/display.rc .
+
+stx_STYLES:
+ mkdir -p resources/stx/libview
+ mkdir -p resources/stx/libview/styles
+ cp $(TOP)/libview/styles/*.common resources/stx/libview/styles
+ cp $(TOP)/libview/styles/*.style resources/stx/libview/styles
+
+stx_BITMAPS: \
+ libwidg_BITMAPS
+
+libwidg_BITMAPS:
+ mkdir -p resources/stx/libwidg/bitmaps
+ -cp $(TOP)/libwidg/bitmaps/*.* resources/stx/libwidg/bitmaps
+
+libbasic_RESOURCES:
+ mkdir -p resources/stx/libbasic
+ -cp $(TOP)/libbasic/resources/*.* resources/stx/libbasic
+
+libtool_RESOURCES:
+ mkdir -p resources/stx/libtool
+ -cp $(TOP)/libtool/resources/*.* resources/stx/libtool
+
+libtool2_RESOURCES:
+ mkdir -p resources/stx/libtool2
+ -cp $(TOP)/libtool2/resources/*.* resources/stx/libtool2
+
+libview_RESOURCES:
+ mkdir -p resources/stx/libview
+ -cp $(TOP)/libview/resources/*.* resources/stx/libview
+
+libview2_RESOURCES:
+ mkdir -p resources/stx/libview2
+ -cp $(TOP)/libview2/resources/*.* resources/stx/libview2
+
+bitmaps:
+ mkdir -p bitmaps
+
+doc:
+ mkdir -p doc
+
+
+
+libstx_libbasic.so: ../../libbasic/libstx_libbasic.so
+ cp ../../libbasic/libstx_libbasic.so .
+
+../../libbasic/libstx_libbasic.so:
+ cd ../../libbasic && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+
+libstx_libcomp.so: ../../libcomp/libstx_libcomp.so
+ cp ../../libcomp/libstx_libcomp.so .
+
+../../libcomp/libstx_libcomp.so:
+ cd ../../libcomp && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+
+libstx_libbasic2.so: ../../libbasic2/libstx_libbasic2.so
+ cp ../../libbasic2/libstx_libbasic2.so .
+
+../../libbasic2/libstx_libbasic2.so:
+ cd ../../libbasic2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+
+libstx_libdb.so: ../../libdb/libstx_libdb.so
+ cp ../../libdb/libstx_libdb.so .
+
+../../libdb/libstx_libdb.so:
+ cd ../../libdb && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+
+libstx_libview.so: ../../libview/libstx_libview.so
+ cp ../../libview/libstx_libview.so .
+
+../../libview/libstx_libview.so:
+ cd ../../libview && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+
+libstx_libdb_libsqlite.so: ../../libdb/libsqlite/libstx_libdb_libsqlite.so
+ cp ../../libdb/libsqlite/libstx_libdb_libsqlite.so .
+
+../../libdb/libsqlite/libstx_libdb_libsqlite.so:
+ cd ../../libdb/libsqlite && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+
+libstx_libdb_libodbc.so: ../../libdb/libodbc/libstx_libdb_libodbc.so
+ cp ../../libdb/libodbc/libstx_libdb_libodbc.so .
+
+../../libdb/libodbc/libstx_libdb_libodbc.so:
+ cd ../../libdb/libodbc && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+
+libstx_libboss.so: ../../libboss/libstx_libboss.so
+ cp ../../libboss/libstx_libboss.so .
+
+../../libboss/libstx_libboss.so:
+ cd ../../libboss && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+
+libstx_libview2.so: ../../libview2/libstx_libview2.so
+ cp ../../libview2/libstx_libview2.so .
+
+../../libview2/libstx_libview2.so:
+ cd ../../libview2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+
+libstx_libbasic3.so: ../../libbasic3/libstx_libbasic3.so
+ cp ../../libbasic3/libstx_libbasic3.so .
+
+../../libbasic3/libstx_libbasic3.so:
+ cd ../../libbasic3 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+
+libstx_goodies_sunit.so: ../../goodies/sunit/libstx_goodies_sunit.so
+ cp ../../goodies/sunit/libstx_goodies_sunit.so .
+
+../../goodies/sunit/libstx_goodies_sunit.so:
+ cd ../../goodies/sunit && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+
+libstx_libui.so: ../../libui/libstx_libui.so
+ cp ../../libui/libstx_libui.so .
+
+../../libui/libstx_libui.so:
+ cd ../../libui && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+
+libstx_libwidg.so: ../../libwidg/libstx_libwidg.so
+ cp ../../libwidg/libstx_libwidg.so .
+
+../../libwidg/libstx_libwidg.so:
+ cd ../../libwidg && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+
+libstx_libwidg2.so: ../../libwidg2/libstx_libwidg2.so
+ cp ../../libwidg2/libstx_libwidg2.so .
+
+../../libwidg2/libstx_libwidg2.so:
+ cd ../../libwidg2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+
+libstx_libhtml.so: ../../libhtml/libstx_libhtml.so
+ cp ../../libhtml/libstx_libhtml.so .
+
+../../libhtml/libstx_libhtml.so:
+ cd ../../libhtml && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+
+libstx_libtool.so: ../../libtool/libstx_libtool.so
+ cp ../../libtool/libstx_libtool.so .
+
+../../libtool/libstx_libtool.so:
+ cd ../../libtool && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+
+libstx_libjava.so: ..//libstx_libjava.so
+ cp ..//libstx_libjava.so .
+
+..//libstx_libjava.so:
+ cd ../ && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+
+
+
+
+
+
+
+# Update SVN revision in package definition class
+ifneq (,$(findstring .svn,$(wildcard .svn)))
+.svnversion: *.st
+ if [ -d .svn ]; then \
+ rev=$(shell svnversion -n); \
+ echo -n $$rev > .svnversion; \
+ else \
+ echo -n exported > .svnversion; \
+ fi
+
+stx_libjava_startup.o: stx_libjava_startup.st .svnversion
+ @if [ -d .svn ]; then \
+ rev2="$(shell printf "%-16s" $$(cat .svnversion))"; \
+ echo " [SV] Expanding svnRevisionNo in $1.st"; \
+ sed -e "s/\"\$$SVN\-Revision:\".*\"\$$\"/\"\$$SVN-Revision:\"\'$$rev2\'\"\$$\"/g" $< > .stx_libjava_startup.svn.st; \
+ fi
+ $(MAKE) CC="$(CLASSLIB_CC)" OPT="$(OPT)" SEPINITCODE="$(SEPINITCODE)" STC="$(STC)" STFILE=.stx_libjava_startup.svn $(C_RULE);
+ sed -i -e "s/\".stx_libjava_startup.svn.st\");/\"\stx_libjava_startup.st\");/g" .stx_libjava_startup.svn.c
+ $(MAKE) .stx_libjava_startup.svn.$(O)
+ @mv .stx_libjava_startup.svn.$(O) stx_libjava_startup.$(O)
+endif
+
+
+
+# Enforce recompilation of package definition class if Mercurial working
+# copy state changes. Together with --guessVersion it ensures that package
+# definition class always contains correct binary revision string.
+ifneq (**NOHG**, $(shell hg root 2> /dev/null || echo -n '**NOHG**'))
+stx_libjava_startup.$(O): $(shell hg root)/.hg/dirstate
+endif
+
+
+
+
+clean::
+ -rm -f *.so startup.$(O)
+
+clobber:: clean
+ -rm -f startup *.img *.sav
+
+# BEGINMAKEDEPEND --- do not remove this line; make depend needs it
+$(OUTDIR)JavaStartup.$(O) JavaStartup.$(H): JavaStartup.st $(INCLUDE_TOP)/stx/libbasic/StandaloneStartup.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)stx_libjava_startup.$(O) stx_libjava_startup.$(H): stx_libjava_startup.st $(INCLUDE_TOP)/stx/libbasic/ApplicationDefinition.$(H) $(INCLUDE_TOP)/stx/libbasic/ProjectDefinition.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+
+# ENDMAKEDEPEND --- do not remove this line
--- a/startup/Make.spec Wed Feb 13 20:31:46 2013 +0000
+++ b/startup/Make.spec Thu Feb 14 16:15:31 2013 +0000
@@ -1,6 +1,6 @@
# $Header$
#
-# DO NOT EDIT
+# DO NOT EDIT
# automagically generated from the projectDefinition: stx_libjava_startup.
#
# Warning: once you modify this file, do not rerun
@@ -18,7 +18,7 @@
# Argument(s) to the stc compiler (stc --usage).
-# -H. : create header files locally
+# -headerDir=. : create header files locally
# (if removed, they will be created as common
# -Pxxx : defines the package
# -Zxxx : a prefix for variables within the classLib
@@ -57,8 +57,8 @@
COMMON_OBJS= \
- $(OUTDIR)JavaStartup.$(O) \
- $(OUTDIR)stx_libjava_startup.$(O) \
+ $(OUTDIR_SLASH)JavaStartup.$(O) \
+ $(OUTDIR_SLASH)stx_libjava_startup.$(O) \
--- a/startup/Makefile Wed Feb 13 20:31:46 2013 +0000
+++ b/startup/Makefile Thu Feb 14 16:15:31 2013 +0000
@@ -1,7 +1,7 @@
#
-# DO NOT EDIT
+# DO NOT EDIT
#
-# make uses this file (Makefile) only, if there is no
+# make uses this file (Makefile) only, if there is no
# file named "makefile" (lower-case m) in the same directory.
# My only task is to generate the real makefile and call make again.
# Thereafter, I am no longer used and needed.
@@ -15,5 +15,7 @@
#only needed for the definition of $(TOP)
include Make.proto
-makefile:
- $(TOP)/rules/stmkmf
+makefile: mf
+
+mf:
+ $(TOP)/rules/stmkmf
--- a/startup/abbrev.stc Wed Feb 13 20:31:46 2013 +0000
+++ b/startup/abbrev.stc Thu Feb 14 16:15:31 2013 +0000
@@ -1,2 +1,5 @@
+# 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.
JavaStartup JavaStartup stx:libjava/startup 'Languages-Java-Support' 1
-stx_libjava_startup stx_libjava_startup stx:libjava/startup '* Projects & Packages *' 4
+stx_libjava_startup stx_libjava_startup stx:libjava/startup '* Projects & Packages *' 3
--- a/startup/autopackage/default.apspec Wed Feb 13 20:31:46 2013 +0000
+++ b/startup/autopackage/default.apspec Thu Feb 14 16:15:31 2013 +0000
@@ -1,7 +1,7 @@
# -*- shell-script -*-
[Meta]
ShortName: startup
-SoftwareVersion: 6.1.2.1
+SoftwareVersion: 6.2.3.0
DisplayName: Smalltalk/X Java Launcher
RootName: @exept.de/expecco:$SOFTWAREVERSION
Summary: Smalltalk/X Java Launcher
@@ -11,7 +11,7 @@
CPUArchitectures: x86
AutopackageTarget: 1.0
Type: Application
-License: Commercial
+License: Commercial
[Description]
Smalltalk/X Java Launcher
--- a/startup/bc.mak Wed Feb 13 20:31:46 2013 +0000
+++ b/startup/bc.mak Thu Feb 14 16:15:31 2013 +0000
@@ -6,20 +6,16 @@
# Warning: once you modify this file, do not rerun
# stmkmp or projectDefinition-build again - otherwise, your changes are lost.
#
+# Historic Note:
+# this used to contain only rules to make with borland
+# (called via bmake, by "make.exe -f bc.mak")
+# this has changed; it is now also possible to build using microsoft visual c
+# (called via vcmake, by "make.exe -f bc.mak -DUSEVC")
+#
TOP=..\..
INCLUDE_TOP=$(TOP)\..
-# CFLAGS1= -WD -w-pro -w-ccc -w-rch -w-aus -w-par -x- -r- -k -y -v -vi- -c -tWDR
-CFLAGS1= -w-pro -w-ccc -w-rch -w-aus -w-par -x- -r- -k -y -v -vi- -c
-
-CFLAGS_CONSOLE=-tWC -tWR -D_NO_VCL;WIN32
-CFLAGS_NOCONSOLE=-tWR -D_NO_VCL;WIN32GUI;WIN32
-LFLAGS_CONSOLE=-ap
-LFLAGS_NOCONSOLE=-aa
-CRT_STARTUP_CONSOLE=c0x32.obj
-CRT_STARTUP_NOCONSOLE=c0w32.obj
-
CFLAGS_LOCAL=$(CFLAGS_APPTYPE) \
-DSTARTUP_CLASS="\"JavaStartup\"" \
-DSTARTUP_SELECTOR="\"start\"" \
@@ -37,45 +33,45 @@
#
LIBNAME=dummy
STCOPT="+optinline"
-LOCALINCLUDES= -I$(INCLUDE_TOP)\stx\libjava -I$(INCLUDE_TOP)\stx\libbasic -I$(INCLUDE_TOP)\stx\libcomp
+LOCALINCLUDES= -I$(INCLUDE_TOP)\stx\libbasic -I$(INCLUDE_TOP)\stx\libjava -I$(INCLUDE_TOP)\stx\libcomp
LOCALDEFINES=
GLOBALDEFINES=
STCLOCALOPT='-package=$(PACKAGE)' $(LOCALDEFINES) $(LOCALINCLUDES) $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES) $(COMMONSYMFLAG) -varPrefix=$(LIBNAME)
-LINKER = ilink32
-
-# LFLAGS = -L$(TOP)\libbc;$(BCB)\lib;$(DEBUGLIBPATH) -H:0x400000 -Hc:0x100000 -S:0x40000 -Sc:0x10000 -ap -Tpe -x -Gn -v -Ao:0x10000
-LFLAGS = -L$(TOP)\libbc;$(BCB)\lib -S:0x40000 -Sc:0x10000 $(LFLAGS_APPTYPE) -Tpe -x -Gn -v -Ao:0x10000
+LFLAGS=$(APP_LFLAGS)
-PROJECT_NOCONSOLE = startup.exe
-PROJECT_CONSOLE = startup.com
-ALLOBJFILES = main.obj
-RESFILES = startupWinRC.res
-ALLOBJ = $(CRT_STARTUP) $(ALLOBJFILES) $(OBJS)
+PROJECT_NOCONSOLE= startup.exe
+PROJECT_CONSOLE= startup.com
+ALLOBJFILES= main.$(O)
+!ifdef USETCC
+RESFILES=
+!else
+RESFILES= startupWinRC.res
+!endif
+
+ALLOBJ= $(ALLOBJFILES) $(OBJS)
DEFFILE=$(TOP)\rules\bc_exe.def
-LIBFILES=$(TOP)\libbc\librun.lib
-ALLLIB=$(LIBFILES) import32.lib $(RT_LIB)
+LIBFILES=$(LIBDIR_LIBRUN)\librun.lib
+ALLLIB=$(LIBFILES) $(APP_IMPORTLIBS) $(APP_RT_LIB)
REQUIRED_LIBS=librun.dll \
libstx_libbasic.dll \
- libstx_goodies_refactoryBrowser_helpers.dll \
- libstx_goodies_refactoryBrowser_parser.dll \
+ libstx_libcomp.dll \
libstx_libbasic2.dll \
- libstx_libcomp.dll \
+ libstx_libdb.dll \
libstx_libview.dll \
- libstx_libbasic3.dll \
+ libstx_libdb_libsqlite.dll \
+ libstx_libdb_libodbc.dll \
+ libstx_libboss.dll \
libstx_libview2.dll \
- libstx_libboss.dll \
- libstx_goodies_refactoryBrowser_changes.dll \
+ libstx_libbasic3.dll \
libstx_goodies_sunit.dll \
libstx_libui.dll \
- libsqueak_petitparser.dll \
libstx_libwidg.dll \
+ libstx_libwidg2.dll \
libstx_libhtml.dll \
- libstx_libwidg2.dll \
- libstx_goodies_smaCC.dll \
libstx_libtool.dll \
libstx_libjava.dll \
@@ -87,30 +83,30 @@
target: ALL postBuildCleanup
# the executable, all required files and a self-installing-installer-exe
-ALL:: prereq exe postBuildCleanup setup
+ALL:: prereq exe $(REQUIRED_SUPPORT_DIRS) postBuildCleanup setup
-exe: newBuildDate consoleApp $(REQUIRED_SUPPORT_DIRS)
+exe: newBuildDate consoleApp
# the executable only
# with console
-consoleApp:
- -del main.obj
- $(MAKE) -N -f bc.mak \
+consoleApp: $(REQUIRED_LIBS)
+ -del main.$(O)
+ $(MAKE) -N -f bc.mak $(USE_ARG) \
MAKE_BAT=$(MAKE_BAT) \
PROJECT=$(PROJECT_CONSOLE) \
- CFLAGS_APPTYPE="$(CFLAGS_CONSOLE)" \
- LFLAGS_APPTYPE="$(LFLAGS_CONSOLE)" \
- CRT_STARTUP="$(CRT_STARTUP_CONSOLE)" theExe
+ CFLAGS_APPTYPE=" -DWIN32GUI $(CFLAGS_CONSOLE)" \
+ LFLAGS_APPTYPE=" $(LFLAGS_CONSOLE)" \
+ CRT_STARTUP=" $(CRT_STARTUP_CONSOLE)" theExe
# without console
-noConsoleApp:
- -del main.obj
- $(MAKE) -N -f bc.mak \
+noConsoleApp: $(REQUIRED_LIBS)
+ -del main.$(O)
+ $(MAKE) -N -f bc.mak $(USE_ARG) \
MAKE_BAT=$(MAKE_BAT) \
PROJECT=$(PROJECT_NOCONSOLE) \
- CFLAGS_APPTYPE="$(CFLAGS_NOCONSOLE) -DWIN_LOGFILE="\\"\"startup.log\\"\""" \
- LFLAGS_APPTYPE="$(LFLAGS_NOCONSOLE)" \
- CRT_STARTUP="$(CRT_STARTUP_NOCONSOLE)" theExe
+ CFLAGS_APPTYPE=" -DWIN32GUI $(CFLAGS_NOCONSOLE) -DWIN_LOGFILE="\\"\"startup.log\\"\""" \
+ LFLAGS_APPTYPE=" $(LFLAGS_NOCONSOLE)" \
+ CRT_STARTUP=" $(CRT_STARTUP_NOCONSOLE)" theExe
# the executable only (internal target; needs some defines)
theExe: $(OUTDIR) $(OBJS) $(REQUIRED_FILES) show $(PROJECT)
@@ -118,37 +114,31 @@
# build all prerequisite packages for this package
prereq:
pushd ..\..\libbasic & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\..\goodies\refactoryBrowser\helpers & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\..\goodies\refactoryBrowser\parser & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\..\libcomp & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\..\libbasic2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\..\libcomp & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\..\libdb & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\..\libview & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\..\libbasic3 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\..\libdb\libsqlite & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\..\libdb\libodbc & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\..\libboss & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\..\libview2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\..\libboss & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\..\goodies\refactoryBrowser\changes & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\..\libbasic3 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\..\goodies\sunit & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\..\libui & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\..\..\squeak\petitparser & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\..\libwidg & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\..\libwidg2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\..\libhtml & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\..\libwidg2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\..\goodies\smaCC & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\..\libtool & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd .. & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\..\librun & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
# a nullsoft installable delivery
-setup: install_startup.exe
+# This uses the Nullsoft Installer Package and works in Windows only
+setup: $(PROJECT) postBuildCleanup startup.nsi
+ $(MAKENSIS) startup.nsi
newBuildDate:
- del buildDate.h
-
-# This uses the Nullsoft Installer Package and works in Windows only
-
-install_startup.exe: $(PROJECT) postBuildCleanup startup.nsi
- $(MAKENSIS) startup.nsi
+ del buildDate.h
new:
$(MAKE_BAT) clean
@@ -279,17 +269,11 @@
..\..\libbasic\$(OBJDIR)\libstx_libbasic.dll:
pushd ..\..\libbasic & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-libstx_goodies_refactoryBrowser_helpers.dll: ..\..\goodies\refactoryBrowser\helpers\$(OBJDIR)\libstx_goodies_refactoryBrowser_helpers.dll
- copy ..\..\goodies\refactoryBrowser\helpers\$(OBJDIR)\libstx_goodies_refactoryBrowser_helpers.dll *.*
-
-..\..\goodies\refactoryBrowser\helpers\$(OBJDIR)\libstx_goodies_refactoryBrowser_helpers.dll:
- pushd ..\..\goodies\refactoryBrowser\helpers & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+libstx_libcomp.dll: ..\..\libcomp\$(OBJDIR)\libstx_libcomp.dll
+ copy ..\..\libcomp\$(OBJDIR)\libstx_libcomp.dll *.*
-libstx_goodies_refactoryBrowser_parser.dll: ..\..\goodies\refactoryBrowser\parser\$(OBJDIR)\libstx_goodies_refactoryBrowser_parser.dll
- copy ..\..\goodies\refactoryBrowser\parser\$(OBJDIR)\libstx_goodies_refactoryBrowser_parser.dll *.*
-
-..\..\goodies\refactoryBrowser\parser\$(OBJDIR)\libstx_goodies_refactoryBrowser_parser.dll:
- pushd ..\..\goodies\refactoryBrowser\parser & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+..\..\libcomp\$(OBJDIR)\libstx_libcomp.dll:
+ pushd ..\..\libcomp & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
libstx_libbasic2.dll: ..\..\libbasic2\$(OBJDIR)\libstx_libbasic2.dll
copy ..\..\libbasic2\$(OBJDIR)\libstx_libbasic2.dll *.*
@@ -297,11 +281,11 @@
..\..\libbasic2\$(OBJDIR)\libstx_libbasic2.dll:
pushd ..\..\libbasic2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-libstx_libcomp.dll: ..\..\libcomp\$(OBJDIR)\libstx_libcomp.dll
- copy ..\..\libcomp\$(OBJDIR)\libstx_libcomp.dll *.*
+libstx_libdb.dll: ..\..\libdb\$(OBJDIR)\libstx_libdb.dll
+ copy ..\..\libdb\$(OBJDIR)\libstx_libdb.dll *.*
-..\..\libcomp\$(OBJDIR)\libstx_libcomp.dll:
- pushd ..\..\libcomp & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+..\..\libdb\$(OBJDIR)\libstx_libdb.dll:
+ pushd ..\..\libdb & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
libstx_libview.dll: ..\..\libview\$(OBJDIR)\libstx_libview.dll
copy ..\..\libview\$(OBJDIR)\libstx_libview.dll *.*
@@ -309,11 +293,23 @@
..\..\libview\$(OBJDIR)\libstx_libview.dll:
pushd ..\..\libview & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-libstx_libbasic3.dll: ..\..\libbasic3\$(OBJDIR)\libstx_libbasic3.dll
- copy ..\..\libbasic3\$(OBJDIR)\libstx_libbasic3.dll *.*
+libstx_libdb_libsqlite.dll: ..\..\libdb\libsqlite\$(OBJDIR)\libstx_libdb_libsqlite.dll
+ copy ..\..\libdb\libsqlite\$(OBJDIR)\libstx_libdb_libsqlite.dll *.*
+
+..\..\libdb\libsqlite\$(OBJDIR)\libstx_libdb_libsqlite.dll:
+ pushd ..\..\libdb\libsqlite & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+
+libstx_libdb_libodbc.dll: ..\..\libdb\libodbc\$(OBJDIR)\libstx_libdb_libodbc.dll
+ copy ..\..\libdb\libodbc\$(OBJDIR)\libstx_libdb_libodbc.dll *.*
-..\..\libbasic3\$(OBJDIR)\libstx_libbasic3.dll:
- pushd ..\..\libbasic3 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+..\..\libdb\libodbc\$(OBJDIR)\libstx_libdb_libodbc.dll:
+ pushd ..\..\libdb\libodbc & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+
+libstx_libboss.dll: ..\..\libboss\$(OBJDIR)\libstx_libboss.dll
+ copy ..\..\libboss\$(OBJDIR)\libstx_libboss.dll *.*
+
+..\..\libboss\$(OBJDIR)\libstx_libboss.dll:
+ pushd ..\..\libboss & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
libstx_libview2.dll: ..\..\libview2\$(OBJDIR)\libstx_libview2.dll
copy ..\..\libview2\$(OBJDIR)\libstx_libview2.dll *.*
@@ -321,17 +317,11 @@
..\..\libview2\$(OBJDIR)\libstx_libview2.dll:
pushd ..\..\libview2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-libstx_libboss.dll: ..\..\libboss\$(OBJDIR)\libstx_libboss.dll
- copy ..\..\libboss\$(OBJDIR)\libstx_libboss.dll *.*
-
-..\..\libboss\$(OBJDIR)\libstx_libboss.dll:
- pushd ..\..\libboss & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+libstx_libbasic3.dll: ..\..\libbasic3\$(OBJDIR)\libstx_libbasic3.dll
+ copy ..\..\libbasic3\$(OBJDIR)\libstx_libbasic3.dll *.*
-libstx_goodies_refactoryBrowser_changes.dll: ..\..\goodies\refactoryBrowser\changes\$(OBJDIR)\libstx_goodies_refactoryBrowser_changes.dll
- copy ..\..\goodies\refactoryBrowser\changes\$(OBJDIR)\libstx_goodies_refactoryBrowser_changes.dll *.*
-
-..\..\goodies\refactoryBrowser\changes\$(OBJDIR)\libstx_goodies_refactoryBrowser_changes.dll:
- pushd ..\..\goodies\refactoryBrowser\changes & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+..\..\libbasic3\$(OBJDIR)\libstx_libbasic3.dll:
+ pushd ..\..\libbasic3 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
libstx_goodies_sunit.dll: ..\..\goodies\sunit\$(OBJDIR)\libstx_goodies_sunit.dll
copy ..\..\goodies\sunit\$(OBJDIR)\libstx_goodies_sunit.dll *.*
@@ -345,35 +335,23 @@
..\..\libui\$(OBJDIR)\libstx_libui.dll:
pushd ..\..\libui & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-libsqueak_petitparser.dll: ..\..\..\squeak\petitparser\$(OBJDIR)\libsqueak_petitparser.dll
- copy ..\..\..\squeak\petitparser\$(OBJDIR)\libsqueak_petitparser.dll *.*
-
-..\..\..\squeak\petitparser\$(OBJDIR)\libsqueak_petitparser.dll:
- pushd ..\..\..\squeak\petitparser & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-
libstx_libwidg.dll: ..\..\libwidg\$(OBJDIR)\libstx_libwidg.dll
copy ..\..\libwidg\$(OBJDIR)\libstx_libwidg.dll *.*
..\..\libwidg\$(OBJDIR)\libstx_libwidg.dll:
pushd ..\..\libwidg & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-libstx_libhtml.dll: ..\..\libhtml\$(OBJDIR)\libstx_libhtml.dll
- copy ..\..\libhtml\$(OBJDIR)\libstx_libhtml.dll *.*
-
-..\..\libhtml\$(OBJDIR)\libstx_libhtml.dll:
- pushd ..\..\libhtml & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-
libstx_libwidg2.dll: ..\..\libwidg2\$(OBJDIR)\libstx_libwidg2.dll
copy ..\..\libwidg2\$(OBJDIR)\libstx_libwidg2.dll *.*
..\..\libwidg2\$(OBJDIR)\libstx_libwidg2.dll:
pushd ..\..\libwidg2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-libstx_goodies_smaCC.dll: ..\..\goodies\smaCC\$(OBJDIR)\libstx_goodies_smaCC.dll
- copy ..\..\goodies\smaCC\$(OBJDIR)\libstx_goodies_smaCC.dll *.*
+libstx_libhtml.dll: ..\..\libhtml\$(OBJDIR)\libstx_libhtml.dll
+ copy ..\..\libhtml\$(OBJDIR)\libstx_libhtml.dll *.*
-..\..\goodies\smaCC\$(OBJDIR)\libstx_goodies_smaCC.dll:
- pushd ..\..\goodies\smaCC & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+..\..\libhtml\$(OBJDIR)\libstx_libhtml.dll:
+ pushd ..\..\libhtml & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
libstx_libtool.dll: ..\..\libtool\$(OBJDIR)\libstx_libtool.dll
copy ..\..\libtool\$(OBJDIR)\libstx_libtool.dll *.*
@@ -397,26 +375,68 @@
@echo LFLAGS= $(LFLAGS)
@echo ALLOBJ= $(ALLOBJ)
@echo PROJECT= $(PROJECT)
+ @echo APP_IMPORTLIBS= $(APP_IMPORTLIBS)
@echo ALLLIB= $(ALLLIB)
@echo DEFFILE= $(DEFFILE)
@echo ALLRES= $(ALLRES)
-$(PROJECT_CONSOLE): $(ALLOBJFILES) $(OBJS) $(RESFILES) $(DEFFILE)
- $(BCB)\BIN\$(LINKER) $(LFLAGS) $(ALLOBJ), $(PROJECT_CONSOLE),, $(ALLLIB), $(DEFFILE), $(RESFILES)
+!ifdef USEBC
+
+$(PROJECT_CONSOLE): $(ALLOBJFILES) $(OBJS) $(RESFILES) $(DEFFILE) $(LIBFILES)
+ $(APP_LINKER) $(LFLAGS) $(LFLAGS_APPTYPE) $(CRT_STARTUP) $(ALLOBJ), $(PROJECT_CONSOLE),, $(ALLLIB), $(DEFFILE), $(RESFILES)
+
+$(PROJECT_NOCONSOLE): $(ALLOBJFILES) $(OBJS) $(RESFILES) $(DEFFILE) $(LIBFILES)
+ $(APP_LINKER) $(LFLAGS) $(LFLAGS_APPTYPE) $(CRT_STARTUP) $(ALLOBJ), $(PROJECT_NOCONSOLE),, $(ALLLIB), $(DEFFILE), $(RESFILES)
+
+!else
+! ifdef USEVC
-$(PROJECT_NOCONSOLE): $(ALLOBJFILES) $(OBJS) $(RESFILES) $(DEFFILE)
- $(BCB)\BIN\$(LINKER) $(LFLAGS) $(ALLOBJ), $(PROJECT_NOCONSOLE),, $(ALLLIB), $(DEFFILE), $(RESFILES)
+$(PROJECT_CONSOLE): $(ALLOBJFILES) $(OBJS) $(RESFILES) $(DEFFILE) $(LIBFILES)
+ $(APP_LINKER) $(LFLAGS) $(LFLAGS_APPTYPE) $(CRT_STARTUP) $(ALLOBJ) /OUT:"$(PROJECT_CONSOLE)" \
+ /MANIFEST /MANIFESTFILE:"$(PROJECT_CONSOLE).manifest" \
+ /PDB:"$(PROJECT_CONSOLE).pdb" \
+ /SUBSYSTEM:CONSOLE $(ALLLIB) $(RESFILES)
+
+$(PROJECT_NOCONSOLE): $(ALLOBJFILES) $(OBJS) $(RESFILES) $(DEFFILE) $(LIBFILES)
+ $(APP_LINKER) $(LFLAGS) $(LFLAGS_APPTYPE) $(CRT_STARTUP) $(ALLOBJ) /OUT:"$(PROJECT_NOCONSOLE)" \
+ /MANIFEST /MANIFESTFILE:"$(PROJECT_NOCONSOLE).manifest" \
+ /PDB:"$(PROJECT_NOCONSOLE).pdb" \
+ /SUBSYSTEM:WINDOWS $(ALLLIB) $(RESFILES)
+
+! else
+! ifdef USELCC
+
+$(PROJECT_CONSOLE): $(ALLOBJFILES) $(OBJS) $(RESFILES) $(DEFFILE) $(LIBFILES)
+ $(APP_LINKER) -subsystem console $(LFLAGS) $(LFLAGS_APPTYPE) $(CRT_STARTUP) $(ALLOBJ) -o "$(PROJECT_CONSOLE)" $(ALLLIB) $(RESFILES)
-#$(PROJECT): $(ALLOBJFILES) $(RESFILES) $(DEFFILE)
-# $(BCB)\BIN\$(LINKER) @&&!
-# $(LFLAGS) +
-# $(ALLOBJ), +
-# $(PROJECT),, +
-# $(ALLLIB), +
-# $(DEFFILE), +
-# $(RESFILES)
-#!
+$(PROJECT_NOCONSOLE): $(ALLOBJFILES) $(OBJS) $(RESFILES) $(DEFFILE) $(LIBFILES)
+ $(APP_LINKER) -subsystem windows $(LFLAGS) $(LFLAGS_APPTYPE) $(CRT_STARTUP) $(ALLOBJ) -o "$(PROJECT_NOCONSOLE)" $(ALLLIB) $(RESFILES)
+
+! else
+! ifdef USETCC
+
+$(PROJECT_CONSOLE): $(ALLOBJFILES) $(OBJS) $(RESFILES) $(DEFFILE) $(LIBFILES)
+ $(APP_LINKER) $(LFLAGS) $(LFLAGS_APPTYPE) $(CRT_STARTUP) $(ALLOBJ) -o "$(PROJECT_CONSOLE)" $(ALLLIB) $(RESFILES)
+
+$(PROJECT_NOCONSOLE): $(ALLOBJFILES) $(OBJS) $(RESFILES) $(DEFFILE) $(LIBFILES)
+ $(APP_LINKER) $(LFLAGS) $(LFLAGS_APPTYPE) $(CRT_STARTUP) $(ALLOBJ) -o "$(PROJECT_NOCONSOLE)" $(ALLLIB) $(RESFILES)
+! else
+! if defined(USEMINGW32) || defined(USEMINGW64)
+
+$(PROJECT_CONSOLE): $(ALLOBJFILES) $(OBJS) $(RESFILES) $(DEFFILE) $(LIBFILES) show
+ $(APP_LINKER) $(LFLAGS) $(LFLAGS_APPTYPE) $(CRT_STARTUP) $(ALLOBJ) -o "$(PROJECT_CONSOLE)" $(ALLLIB) $(RESFILES)
+
+$(PROJECT_NOCONSOLE): $(ALLOBJFILES) $(OBJS) $(RESFILES) $(DEFFILE) $(LIBFILES) show
+ $(APP_LINKER) $(LFLAGS) $(LFLAGS_APPTYPE) $(CRT_STARTUP) $(ALLOBJ) -o "$(PROJECT_NOCONSOLE)" $(ALLLIB) $(APP_IMPORTLIBS) $(RESFILES)
+
+! else
+error error error
+! endif
+! endif
+! endif
+! endif
+!endif
!INCLUDE $(TOP)\rules\stdRules_bc
@@ -425,16 +445,17 @@
#
startupWin.res: startupWin.rc startup.ico
-main.obj: buildDate.h main.c bc.mak
+main.$(O): buildDate.h main.c bc.mak
main.c: $(TOP)\librun\main.c
copy $(TOP)\librun\main.c main.c
-buildDate.h: $(TOP)\librun\genDate.exe
- $(TOP)\librun\genDate.exe
+# now in stdRules.
+#buildDate.h: $(GENDATE_UTILITIY)
+# $(GENDATE_UTILITIY)
-librun.dll: $(TOP)\librun\librun.dll
- copy $(TOP)\librun\librun.dll librun.dll
+librun.dll: $(TOP)\librun\$(OBJDIR_LIBRUN)\librun.dll
+ copy $(TOP)\librun\$(OBJDIR_LIBRUN)\librun.dll librun.dll
cs3245.dll: $(TOP)\support\win32\borland\cs3245.dll
copy $(TOP)\support\win32\borland\cs3245.dll cs3245.dll
@@ -451,8 +472,9 @@
+
clean::
- -del genDate.exe
+ -del genDate.exe genDate.com
-del c0x32.dll
-del c0x32.lib
-del buildDate.h
@@ -466,17 +488,26 @@
-del *.log
-del *.res
-rmdir /S /Q resources
- -rmdir /S /Q objbc
+ -rmdir /S /Q $(OBJDIR)
clobber:: clean
-del *.dll *.exe *.com
-# stupid win-make does not allow empty - therefore delete something which is not there...
+# stupid win-make does not allow empty - therefore echo something
postBuildCleanup::
- -del xxxxx.xxxxx
+ @-echo "postbuild cleanup"
# BEGINMAKEDEPEND --- do not remove this line; make depend needs it
$(OUTDIR)JavaStartup.$(O) JavaStartup.$(H): JavaStartup.st $(INCLUDE_TOP)\stx\libbasic\StandaloneStartup.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)stx_libjava_startup.$(O) stx_libjava_startup.$(H): stx_libjava_startup.st $(INCLUDE_TOP)\stx\libbasic\ApplicationDefinition.$(H) $(INCLUDE_TOP)\stx\libbasic\ProjectDefinition.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
# ENDMAKEDEPEND --- do not remove this line
+
+# **Must be at end**
+
+# Enforce recompilation of package definition class if Mercurial working
+# copy state changes. Together with --guessVersion it ensures that package
+# definition class always contains correct binary revision string.
+!IFDEF HGROOT
+$(OUTDIR)stx_libjava_startup.$(O): $(HGROOT)\.hg\dirstate
+!ENDIF
--- a/startup/bmake.bat Wed Feb 13 20:31:46 2013 +0000
+++ b/startup/bmake.bat Thu Feb 14 16:15:31 2013 +0000
@@ -1,8 +1,12 @@
@REM -------
-@REM make using borland bcc
+@REM make using Borland bcc32
@REM type bmake, and wait...
@REM do not edit - automatically generated from ProjectDefinition
@REM -------
-make.exe -N -f bc.mak %1 %2
+@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 %DEFINES% %*
--- a/startup/builder/baseline.rbspec Wed Feb 13 20:31:46 2013 +0000
+++ b/startup/builder/baseline.rbspec Thu Feb 14 16:15:31 2013 +0000
@@ -15,22 +15,20 @@
# --------
package "stx:libbasic"
- package "stx:goodies/refactoryBrowser/helpers"
- package "stx:goodies/refactoryBrowser/parser"
+ package "stx:libcomp"
package "stx:libbasic2"
- package "stx:libcomp"
+ package "stx:libdb"
package "stx:libview"
- package "stx:libbasic3"
+ package "stx:libdb/libsqlite"
+ package "stx:libdb/libodbc"
+ package "stx:libboss"
package "stx:libview2"
- package "stx:libboss"
- package "stx:goodies/refactoryBrowser/changes"
+ package "stx:libbasic3"
package "stx:goodies/sunit"
package "stx:libui"
- package "squeak:petitparser"
package "stx:libwidg"
+ package "stx:libwidg2"
package "stx:libhtml"
- package "stx:libwidg2"
- package "stx:goodies/smaCC"
package "stx:libtool"
package "stx:libjava"
--- a/startup/builder/package.deps.rake Wed Feb 13 20:31:46 2013 +0000
+++ b/startup/builder/package.deps.rake Thu Feb 14 16:15:31 2013 +0000
@@ -2,98 +2,91 @@
# Package dependencies.
# Automatically generated by project defintion.
-task "stx:libjava" => "stx:libwidg2"
-task "stx:libjava" => "squeak:petitparser"
-task "stx:libjava" => "stx:libbasic3"
-task "stx:libjava" => "stx:libcomp"
-task "stx:libjava" => "stx:libbasic2"
-task "stx:libjava" => "stx:libview2"
-task "stx:libjava" => "stx:libhtml"
-task "stx:libjava" => "stx:libwidg"
-task "stx:libjava" => "stx:libbasic"
-task "stx:libjava" => "stx:goodies/smaCC"
-task "stx:libjava" => "stx:libview"
-task "stx:libjava" => "stx:libtool"
+task "stx:libtool" => "stx:libview2"
+task "stx:libtool" => "stx:libbasic"
+task "stx:libtool" => "stx:libbasic2"
+task "stx:libtool" => "stx:libboss"
+task "stx:libtool" => "stx:libhtml"
+task "stx:libtool" => "stx:libui"
+task "stx:libtool" => "stx:libbasic3"
+task "stx:libtool" => "stx:libview"
+task "stx:libtool" => "stx:libcomp"
+task "stx:libtool" => "stx:libwidg2"
+task "stx:libtool" => "stx:libwidg"
+task "stx:libtool" => "stx:goodies/sunit"
-task "stx:goodies/refactoryBrowser/helpers" => "stx:libbasic"
+task "stx:libcomp" => "stx:libbasic"
-
-task "stx:goodies/refactoryBrowser/parser" => "stx:libbasic"
+task "stx:libbasic3" => "stx:libbasic2"
+task "stx:libbasic3" => "stx:libdb/libodbc"
+task "stx:libbasic3" => "stx:libdb/libsqlite"
+task "stx:libbasic3" => "stx:libbasic"
-task "stx:goodies/smaCC" => "stx:goodies/refactoryBrowser/parser"
-task "stx:goodies/smaCC" => "stx:libhtml"
-task "stx:goodies/smaCC" => "stx:libview2"
-task "stx:goodies/smaCC" => "stx:goodies/refactoryBrowser/changes"
-task "stx:goodies/smaCC" => "stx:goodies/sunit"
-task "stx:goodies/smaCC" => "stx:libbasic2"
-task "stx:goodies/smaCC" => "stx:libwidg2"
-task "stx:goodies/smaCC" => "stx:libbasic"
-task "stx:goodies/smaCC" => "stx:goodies/refactoryBrowser/helpers"
+task "stx:libwidg2" => "stx:libbasic"
+task "stx:libwidg2" => "stx:libview2"
+task "stx:libwidg2" => "stx:libwidg"
+task "stx:libwidg2" => "stx:libui"
+task "stx:libwidg2" => "stx:libbasic2"
+task "stx:libwidg2" => "stx:libview"
+
+task "stx:libdb/libsqlite" => "stx:libbasic"
+task "stx:libdb/libsqlite" => "stx:libbasic2"
+task "stx:libdb/libsqlite" => "stx:libdb"
-task "stx:libwidg" => "stx:libview2"
-task "stx:libwidg" => "stx:libview"
-task "stx:libwidg" => "stx:libbasic2"
-task "stx:libwidg" => "stx:libui"
-task "stx:libwidg" => "stx:libbasic"
+task "stx:libhtml" => "stx:libview"
+task "stx:libhtml" => "stx:libwidg"
+task "stx:libhtml" => "stx:libbasic"
+
+task "stx:libbasic2" => "stx:libbasic"
-task "stx:goodies/sunit" => "stx:libview2"
-task "stx:goodies/sunit" => "stx:libview"
-task "stx:goodies/sunit" => "stx:libbasic"
+task "stx:libdb/libodbc" => "stx:libcomp"
+task "stx:libdb/libodbc" => "stx:libdb"
+task "stx:libdb/libodbc" => "stx:libbasic2"
+task "stx:libdb/libodbc" => "stx:libbasic"
-task "squeak:petitparser" => "stx:goodies/sunit"
-task "squeak:petitparser" => "stx:libbasic2"
-task "squeak:petitparser" => "stx:libbasic"
+task "stx:libboss" => "stx:libview"
+task "stx:libboss" => "stx:libbasic2"
+task "stx:libboss" => "stx:libbasic"
+
task "stx:libview2" => "stx:libview"
task "stx:libview2" => "stx:libbasic2"
task "stx:libview2" => "stx:libbasic"
-task "stx:libbasic2" => "stx:libbasic"
+task "stx:libdb" => "stx:libcomp"
+task "stx:libdb" => "stx:libbasic"
+
+task "stx:goodies/sunit" => "stx:libview"
+task "stx:goodies/sunit" => "stx:libview2"
+task "stx:goodies/sunit" => "stx:libbasic"
+
+task "stx:libjava" => "stx:libbasic"
+task "stx:libjava" => "stx:libbasic3"
+task "stx:libjava" => "stx:libview2"
+task "stx:libjava" => "stx:libwidg"
+task "stx:libjava" => "stx:libhtml"
+task "stx:libjava" => "stx:libtool"
+task "stx:libjava" => "stx:libbasic2"
+task "stx:libjava" => "stx:goodies/sunit"
+task "stx:libjava" => "stx:libcomp"
+task "stx:libjava" => "stx:libview"
+task "stx:libjava" => "stx:libwidg2"
+
+task "stx:libwidg" => "stx:libview"
+task "stx:libwidg" => "stx:libbasic2"
+task "stx:libwidg" => "stx:libui"
+task "stx:libwidg" => "stx:libview2"
+task "stx:libwidg" => "stx:libbasic"
+
+task "stx:libui" => "stx:libview"
+task "stx:libui" => "stx:libview2"
+task "stx:libui" => "stx:libbasic"
task "stx:libview" => "stx:libbasic2"
task "stx:libview" => "stx:libbasic"
-task "stx:libhtml" => "stx:libwidg"
-task "stx:libhtml" => "stx:libview"
-task "stx:libhtml" => "stx:libbasic"
-
-task "stx:libtool" => "stx:goodies/refactoryBrowser/parser"
-task "stx:libtool" => "stx:libui"
-task "stx:libtool" => "stx:libview"
-task "stx:libtool" => "stx:libview2"
-task "stx:libtool" => "stx:libwidg"
-task "stx:libtool" => "stx:libbasic2"
-task "stx:libtool" => "stx:libwidg2"
-task "stx:libtool" => "stx:libbasic"
-task "stx:libtool" => "stx:libbasic3"
-task "stx:libtool" => "stx:libboss"
-task "stx:libtool" => "stx:libcomp"
-
-task "stx:libcomp" => "stx:libbasic"
-
-task "stx:goodies/refactoryBrowser/changes" => "stx:goodies/refactoryBrowser/helpers"
-task "stx:goodies/refactoryBrowser/changes" => "stx:goodies/refactoryBrowser/parser"
-task "stx:goodies/refactoryBrowser/changes" => "stx:libbasic3"
-task "stx:goodies/refactoryBrowser/changes" => "stx:libbasic"
-
-task "stx:libboss" => "stx:libbasic"
-
-task "stx:libwidg2" => "stx:libview"
-task "stx:libwidg2" => "stx:libui"
-task "stx:libwidg2" => "stx:libview2"
-task "stx:libwidg2" => "stx:libwidg"
-task "stx:libwidg2" => "stx:libbasic2"
-task "stx:libwidg2" => "stx:libbasic"
-
-task "stx:libbasic3" => "stx:libbasic2"
-task "stx:libbasic3" => "stx:libbasic"
-
-task "stx:libui" => "stx:libview2"
-task "stx:libui" => "stx:libview"
-task "stx:libui" => "stx:libbasic"
-
+task "stx:libjava/startup" => "stx:libcomp"
task "stx:libjava/startup" => "stx:libjava"
-task "stx:libjava/startup" => "stx:libcomp"
task "stx:libjava/startup" => "stx:libbasic"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/startup/lccmake.bat Thu Feb 14 16:15:31 2013 +0000
@@ -0,0 +1,8 @@
+@REM -------
+@REM make using lcc compiler
+@REM type lccmake, and wait...
+@REM do not edit - automatically generated from ProjectDefinition
+@REM -------
+make.exe -N -f bc.mak -DUSELCC=1 %*
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/startup/mingwmake.bat Thu Feb 14 16:15:31 2013 +0000
@@ -0,0 +1,14 @@
+@REM -------
+@REM make using mingw gnu compiler
+@REM type mingwmake, and wait...
+@REM do not edit - automatically generated from ProjectDefinition
+@REM -------
+@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%"
+
+@call ..\..\rules\find_mingw.bat
+make.exe -N -f bc.mak %USEMINGW_ARG% %*
+
+
--- a/startup/modules.stx Wed Feb 13 20:31:46 2013 +0000
+++ b/startup/modules.stx Thu Feb 14 16:15:31 2013 +0000
@@ -16,22 +16,20 @@
# Others might be autoloaded.
#
libstx_libbasic
-libstx_goodies_refactoryBrowser_helpers
-libstx_goodies_refactoryBrowser_parser
+libstx_libcomp
libstx_libbasic2
-libstx_libcomp
+libstx_libdb
libstx_libview
-libstx_libbasic3
+libstx_libdb_libsqlite
+libstx_libdb_libodbc
+libstx_libboss
libstx_libview2
-libstx_libboss
-libstx_goodies_refactoryBrowser_changes
+libstx_libbasic3
libstx_goodies_sunit
libstx_libui
-libsqueak_petitparser
libstx_libwidg
+libstx_libwidg2
libstx_libhtml
-libstx_libwidg2
-libstx_goodies_smaCC
libstx_libtool
libstx_libjava
--- a/startup/startup.nsi Wed Feb 13 20:31:46 2013 +0000
+++ b/startup/startup.nsi Thu Feb 14 16:15:31 2013 +0000
@@ -3,7 +3,7 @@
!define PRODUCT_NAME "Smalltalk/X JVM"
!define PRODUCT_FILENAME "Smalltalk_X JVM"
-!define PRODUCT_VERSION "6.1.2.1"
+!define PRODUCT_VERSION "6.2.3.0"
!define PRODUCT_PUBLISHER "eXept Software AG"
!define PRODUCT_WEB_SITE "http://www.exept.de"
!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_FILENAME}"
@@ -14,6 +14,7 @@
SetCompressor /solid lzma
!include "MUI2.nsh"
+!include "x64.nsh"
; MUI Settings
@@ -58,7 +59,7 @@
VIProductVersion "${PRODUCT_VERSION}.0"
VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "${PRODUCT_NAME}"
VIAddVersionKey /LANG=${LANG_ENGLISH} "CompanyName" "${PRODUCT_PUBLISHER}"
-VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "6.1.0.1"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "6.2.32767.32767"
VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "${PRODUCT_NAME} Installer"
VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion" "${PRODUCT_VERSION}"
VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "Copyright 2010-2011 Jan Vrany, Jan Kurs, Marcel Hlopko\nCopyright 1988-2011Claus Gittinger \nCopyright 1998-2011 eXept Software AG"
@@ -85,7 +86,8 @@
File "symbols.stc"
File "*.stx"
File "*.rc"
- File /r "resources"
+ File /r /x CVS /x ".*" resources
+
@@ -143,7 +145,7 @@
WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}"
SectionEnd
-LangString appOpen ${LANG_GERMAN} "Mit Smalltalk/X JVM ffnen"
+LangString appOpen ${LANG_GERMAN} "Mit Smalltalk/X JVM öffnen"
LangString appOpen ${LANG_ENGLISH} "Open with Smalltalk/X JVM"
LangString DESC_Section1 ${LANG_ENGLISH} "Program components of Smalltalk/X JVM"
@@ -177,7 +179,7 @@
Function un.onInit
!insertmacro MUI_UNGETLANGUAGE
- MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Mchten Sie Smalltalk/X JVM und alle seine Komponenten deinstallieren?" IDYES +2
+ MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Möchten Sie Smalltalk/X JVM und alle seine Komponenten deinstallieren?" IDYES +2
Abort
FunctionEnd
@@ -199,5 +201,6 @@
DeleteRegKey HKCR "Stx.Smalltalk_X JVM.1"
+
SetAutoClose true
SectionEnd
--- a/startup/startupWinRC.rc Wed Feb 13 20:31:46 2013 +0000
+++ b/startup/startupWinRC.rc Thu Feb 14 16:15:31 2013 +0000
@@ -5,20 +5,26 @@
#define IDR_MAINFRAME 128
#define IDR_SPLASH 129
+#if (__BORLANDC__)
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#endif
+
#pragma code_page(1252)
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 6,1,0,1
- PRODUCTVERSION 6,1,2,1
-// FILEFLAGSMASK 0x3fL
+ FILEVERSION 6,2,32767,32767
+ PRODUCTVERSION 6,2,3,0
+#if (__BORLANDC__)
FILEFLAGSMASK VS_FF_DEBUG | VS_FF_PRERELEASE
FILEFLAGS VS_FF_PRERELEASE | VS_FF_SPECIALBUILD
FILEOS VOS_NT_WINDOWS32
FILETYPE VFT_DLL
FILESUBTYPE VS_USER_DEFINED
+#else
+ FILEFLAGSMASK 0x3fL
+#endif
BEGIN
BLOCK "StringFileInfo"
@@ -27,12 +33,12 @@
BEGIN
VALUE "CompanyName", "SWING Research Group & eXept Software AG\0"
VALUE "FileDescription", "Smalltalk/X Java Launcher\0"
- VALUE "FileVersion", "6.1.0.1\0"
+ VALUE "FileVersion", "6.2.32767.32767\0"
VALUE "InternalName", "stx:libjava/startup\0"
VALUE "LegalCopyright", "Copyright 2010-2011 Jan Vrany, Jan Kurs, Marcel Hlopko\nCopyright 1988-2011Claus Gittinger \nCopyright 1998-2011 eXept Software AG\0"
VALUE "ProductName", "Smalltalk/X JVM\0"
- VALUE "ProductVersion", "6.1.2.1\0"
- VALUE "ProductDate", "Thu, 07 Apr 2011 18:25:04 GMT\0"
+ VALUE "ProductVersion", "6.2.3.0\0"
+ VALUE "ProductDate", "Thu, 14 Feb 2013 16:12:32 GMT\0"
END
END
--- a/startup/stx_libjava_startup.st Wed Feb 13 20:31:46 2013 +0000
+++ b/startup/stx_libjava_startup.st Thu Feb 14 16:15:31 2013 +0000
@@ -141,6 +141,16 @@
!stx_libjava_startup class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+!
+
version_SVN
^ '$Id$'
! !
+
--- a/startup/vcmake.bat Wed Feb 13 20:31:46 2013 +0000
+++ b/startup/vcmake.bat Thu Feb 14 16:15:31 2013 +0000
@@ -1,8 +1,18 @@
@REM -------
-@REM make using microsoft visual c
+@REM make using Microsoft Visual C compiler
@REM type vcmake, and wait...
@REM do not edit - automatically generated from ProjectDefinition
@REM -------
-make.exe -N -f bc.mak -DUSEVC %1 %2
+
+@if not defined VSINSTALLDIR (
+ call ..\..\rules\vcsetup.bat
+)
+@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/stx_libjava.st Wed Feb 13 20:31:46 2013 +0000
+++ b/stx_libjava.st Thu Feb 14 16:15:31 2013 +0000
@@ -687,6 +687,10 @@
!stx_libjava class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
--- a/tools/JavaArrayTypeNode.st Wed Feb 13 20:31:46 2013 +0000
+++ b/tools/JavaArrayTypeNode.st Thu Feb 14 16:15:31 2013 +0000
@@ -63,6 +63,10 @@
!JavaArrayTypeNode class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -71,3 +75,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/tools/JavaBooleanTypeNode.st Wed Feb 13 20:31:46 2013 +0000
+++ b/tools/JavaBooleanTypeNode.st Thu Feb 14 16:15:31 2013 +0000
@@ -63,6 +63,10 @@
!JavaBooleanTypeNode class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -71,3 +75,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/tools/JavaCharTypeNode.st Wed Feb 13 20:31:46 2013 +0000
+++ b/tools/JavaCharTypeNode.st Thu Feb 14 16:15:31 2013 +0000
@@ -63,6 +63,10 @@
!JavaCharTypeNode class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -71,3 +75,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/tools/JavaClassOrInterfaceTypeNode.st Wed Feb 13 20:31:46 2013 +0000
+++ b/tools/JavaClassOrInterfaceTypeNode.st Thu Feb 14 16:15:31 2013 +0000
@@ -63,6 +63,10 @@
!JavaClassOrInterfaceTypeNode class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -71,3 +75,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/tools/JavaCodeBundleEditor.st Wed Feb 13 20:31:46 2013 +0000
+++ b/tools/JavaCodeBundleEditor.st Thu Feb 14 16:15:31 2013 +0000
@@ -458,6 +458,10 @@
!JavaCodeBundleEditor class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
--- a/tools/JavaCodeLibraryEditor.st Wed Feb 13 20:31:46 2013 +0000
+++ b/tools/JavaCodeLibraryEditor.st Thu Feb 14 16:15:31 2013 +0000
@@ -27,6 +27,10 @@
!JavaCodeLibraryEditor class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
--- a/tools/JavaCommentNode.st Wed Feb 13 20:31:46 2013 +0000
+++ b/tools/JavaCommentNode.st Thu Feb 14 16:15:31 2013 +0000
@@ -65,6 +65,10 @@
!JavaCommentNode class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -73,3 +77,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/tools/JavaDocNode.st Wed Feb 13 20:31:46 2013 +0000
+++ b/tools/JavaDocNode.st Thu Feb 14 16:15:31 2013 +0000
@@ -55,6 +55,10 @@
!JavaDocNode class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -63,3 +67,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/tools/JavaDoubleTypeNode.st Wed Feb 13 20:31:46 2013 +0000
+++ b/tools/JavaDoubleTypeNode.st Thu Feb 14 16:15:31 2013 +0000
@@ -63,6 +63,10 @@
!JavaDoubleTypeNode class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -71,3 +75,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/tools/JavaFloatTypeNode.st Wed Feb 13 20:31:46 2013 +0000
+++ b/tools/JavaFloatTypeNode.st Thu Feb 14 16:15:31 2013 +0000
@@ -63,6 +63,10 @@
!JavaFloatTypeNode class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -71,3 +75,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/tools/JavaFormalParameterNode.st Wed Feb 13 20:31:46 2013 +0000
+++ b/tools/JavaFormalParameterNode.st Thu Feb 14 16:15:31 2013 +0000
@@ -71,6 +71,10 @@
!JavaFormalParameterNode class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -79,3 +83,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/tools/JavaIntTypeNode.st Wed Feb 13 20:31:46 2013 +0000
+++ b/tools/JavaIntTypeNode.st Thu Feb 14 16:15:31 2013 +0000
@@ -63,6 +63,10 @@
!JavaIntTypeNode class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -71,3 +75,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/tools/JavaListInspectorView.st Wed Feb 13 20:31:46 2013 +0000
+++ b/tools/JavaListInspectorView.st Thu Feb 14 16:15:31 2013 +0000
@@ -83,6 +83,10 @@
!JavaListInspectorView class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -91,3 +95,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/tools/JavaLongTypeNode.st Wed Feb 13 20:31:46 2013 +0000
+++ b/tools/JavaLongTypeNode.st Thu Feb 14 16:15:31 2013 +0000
@@ -63,6 +63,10 @@
!JavaLongTypeNode class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -71,3 +75,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/tools/JavaMapInspectorView.st Wed Feb 13 20:31:46 2013 +0000
+++ b/tools/JavaMapInspectorView.st Thu Feb 14 16:15:31 2013 +0000
@@ -129,6 +129,10 @@
!JavaMapInspectorView class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -137,3 +141,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/tools/JavaMethodDeclaratorNode.st Wed Feb 13 20:31:46 2013 +0000
+++ b/tools/JavaMethodDeclaratorNode.st Thu Feb 14 16:15:31 2013 +0000
@@ -85,6 +85,10 @@
!JavaMethodDeclaratorNode class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -93,3 +97,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/tools/JavaMethodNode.st Wed Feb 13 20:31:46 2013 +0000
+++ b/tools/JavaMethodNode.st Thu Feb 14 16:15:31 2013 +0000
@@ -139,6 +139,10 @@
!JavaMethodNode class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -147,3 +151,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/tools/JavaParseNode.st Wed Feb 13 20:31:46 2013 +0000
+++ b/tools/JavaParseNode.st Thu Feb 14 16:15:31 2013 +0000
@@ -82,6 +82,10 @@
!JavaParseNode class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -90,3 +94,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/tools/JavaParseNodeBuilder.st Wed Feb 13 20:31:46 2013 +0000
+++ b/tools/JavaParseNodeBuilder.st Thu Feb 14 16:15:31 2013 +0000
@@ -82,6 +82,10 @@
!JavaParseNodeBuilder class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -90,3 +94,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/tools/JavaParser.st Wed Feb 13 20:31:46 2013 +0000
+++ b/tools/JavaParser.st Thu Feb 14 16:15:31 2013 +0000
@@ -41,6 +41,10 @@
!JavaParser class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -49,3 +53,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/tools/JavaParserI.st Wed Feb 13 20:31:46 2013 +0000
+++ b/tools/JavaParserI.st Thu Feb 14 16:15:31 2013 +0000
@@ -928,6 +928,10 @@
!JavaParserI class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -937,4 +941,5 @@
^ '§Id§'
! !
+
JavaParserI initialize!
--- a/tools/JavaParserII.st Wed Feb 13 20:31:46 2013 +0000
+++ b/tools/JavaParserII.st Thu Feb 14 16:15:31 2013 +0000
@@ -1156,6 +1156,10 @@
!JavaParserII class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -1164,3 +1168,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/tools/JavaParserIITests.st Wed Feb 13 20:31:46 2013 +0000
+++ b/tools/JavaParserIITests.st Thu Feb 14 16:15:31 2013 +0000
@@ -7436,6 +7436,10 @@
!JavaParserIITests class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -7444,3 +7448,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/tools/JavaParserITests.st Wed Feb 13 20:31:46 2013 +0000
+++ b/tools/JavaParserITests.st Thu Feb 14 16:15:31 2013 +0000
@@ -677,6 +677,10 @@
!JavaParserITests class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -685,3 +689,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/tools/JavaParser_Eclipse.st Wed Feb 13 20:31:46 2013 +0000
+++ b/tools/JavaParser_Eclipse.st Thu Feb 14 16:15:31 2013 +0000
@@ -127,6 +127,10 @@
!JavaParser_Eclipse class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -136,4 +140,5 @@
^ '§Id§'
! !
+
JavaParser_Eclipse initialize!
--- a/tools/JavaScanner.st Wed Feb 13 20:31:46 2013 +0000
+++ b/tools/JavaScanner.st Thu Feb 14 16:15:31 2013 +0000
@@ -1097,6 +1097,10 @@
!JavaScanner class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -1105,3 +1109,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/tools/JavaScannerBase.st Wed Feb 13 20:31:46 2013 +0000
+++ b/tools/JavaScannerBase.st Thu Feb 14 16:15:31 2013 +0000
@@ -794,6 +794,10 @@
!JavaScannerBase class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -803,4 +807,5 @@
^ '§Id§'
! !
+
JavaScannerBase initialize!
--- a/tools/JavaSetInspectorView.st Wed Feb 13 20:31:46 2013 +0000
+++ b/tools/JavaSetInspectorView.st Thu Feb 14 16:15:31 2013 +0000
@@ -44,6 +44,10 @@
!JavaSetInspectorView class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -52,3 +56,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/tools/JavaSettingsApplication.st Wed Feb 13 20:31:46 2013 +0000
+++ b/tools/JavaSettingsApplication.st Thu Feb 14 16:15:31 2013 +0000
@@ -764,6 +764,10 @@
!JavaSettingsApplication class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
--- a/tools/JavaSourcePartitioner.st Wed Feb 13 20:31:46 2013 +0000
+++ b/tools/JavaSourcePartitioner.st Thu Feb 14 16:15:31 2013 +0000
@@ -41,6 +41,10 @@
!JavaSourcePartitioner class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -49,3 +53,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/tools/JavaSourcePartitionerTests.st Wed Feb 13 20:31:46 2013 +0000
+++ b/tools/JavaSourcePartitionerTests.st Thu Feb 14 16:15:31 2013 +0000
@@ -50,7 +50,12 @@
!JavaSourcePartitionerTests class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
! !
+
--- a/tools/JavaSourceReference.st Wed Feb 13 20:31:46 2013 +0000
+++ b/tools/JavaSourceReference.st Thu Feb 14 16:15:31 2013 +0000
@@ -36,7 +36,12 @@
!JavaSourceReference class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
! !
+
--- a/tools/JavaSyntaxHighlighter.st Wed Feb 13 20:31:46 2013 +0000
+++ b/tools/JavaSyntaxHighlighter.st Thu Feb 14 16:15:31 2013 +0000
@@ -734,6 +734,10 @@
!JavaSyntaxHighlighter class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -742,3 +746,4 @@
version_SVN
^ 'Id'
! !
+
--- a/tools/JavaSyntaxHighlighter_Eclipse.st Wed Feb 13 20:31:46 2013 +0000
+++ b/tools/JavaSyntaxHighlighter_Eclipse.st Thu Feb 14 16:15:31 2013 +0000
@@ -285,6 +285,10 @@
!JavaSyntaxHighlighter_Eclipse class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -293,3 +297,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/tools/JavaSyntaxHighlighter_Old.st Wed Feb 13 20:31:46 2013 +0000
+++ b/tools/JavaSyntaxHighlighter_Old.st Thu Feb 14 16:15:31 2013 +0000
@@ -476,6 +476,10 @@
!JavaSyntaxHighlighter_Old class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -484,3 +488,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/tools/JavaTypeNode.st Wed Feb 13 20:31:46 2013 +0000
+++ b/tools/JavaTypeNode.st Thu Feb 14 16:15:31 2013 +0000
@@ -71,6 +71,10 @@
!JavaTypeNode class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -79,3 +83,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/tools/JavaVoidTypeNode.st Wed Feb 13 20:31:46 2013 +0000
+++ b/tools/JavaVoidTypeNode.st Thu Feb 14 16:15:31 2013 +0000
@@ -63,6 +63,10 @@
!JavaVoidTypeNode class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
@@ -71,3 +75,4 @@
version_SVN
^ '§Id§'
! !
+
--- a/tools/Make.proto Wed Feb 13 20:31:46 2013 +0000
+++ b/tools/Make.proto Thu Feb 14 16:15:31 2013 +0000
@@ -122,20 +122,20 @@
postMake:: cleanjunk
prereq: $(REQUIRED_SUPPORT_DIRS)
- cd $(TOP)/../squeak/petitparser && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd ../../libdb/libodbc && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../../libbasic && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../../libcomp && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../../libbasic2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../../libdb && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../../libview && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../../libdb/libsqlite && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd ../../libdb/libodbc && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../../libboss && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../../libview2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../../libbasic3 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../../goodies/sunit && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../../libui && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../../goodies/petitparser && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
+ cd $(TOP)/../squeak/petitparser && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../../libwidg && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../../libwidg2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
cd ../../libhtml && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
@@ -186,7 +186,7 @@
$(OUTDIR)JavaLongTypeNode.$(O) JavaLongTypeNode.$(H): JavaLongTypeNode.st $(INCLUDE_TOP)/stx/libjava/tools/JavaTypeNode.$(H) $(INCLUDE_TOP)/stx/libjava/tools/JavaParseNode.$(H) $(INCLUDE_TOP)/stx/libcomp/ParseNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)JavaParser.$(O) JavaParser.$(H): JavaParser.st $(INCLUDE_TOP)/stx/libjava/tools/JavaParserII.$(H) $(INCLUDE_TOP)/stx/libjava/tools/JavaParserI.$(H) $(INCLUDE_TOP)/stx/goodies/petitparser/PPCompositeParser.$(H) $(INCLUDE_TOP)/stx/goodies/petitparser/PPDelegateParser.$(H) $(INCLUDE_TOP)/stx/goodies/petitparser/PPParser.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)JavaVoidTypeNode.$(O) JavaVoidTypeNode.$(H): JavaVoidTypeNode.st $(INCLUDE_TOP)/stx/libjava/tools/JavaTypeNode.$(H) $(INCLUDE_TOP)/stx/libjava/tools/JavaParseNode.$(H) $(INCLUDE_TOP)/stx/libcomp/ParseNode.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)JavaSyntaxHighlighter.$(O) JavaSyntaxHighlighter.$(H): JavaSyntaxHighlighter.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libjava/tools/JavaParseNodeBuilder.$(H) $(INCLUDE_TOP)/stx/libjava/tools/JavaParser.$(H) $(INCLUDE_TOP)/stx/libjava/tools/JavaParserII.$(H) $(INCLUDE_TOP)/stx/libjava/tools/JavaParserI.$(H) $(INCLUDE_TOP)/stx/goodies/petitparser/PPCompositeParser.$(H) $(INCLUDE_TOP)/stx/goodies/petitparser/PPDelegateParser.$(H) $(INCLUDE_TOP)/stx/goodies/petitparser/PPParser.$(H) $(INCLUDE_TOP)/stx/libjava/tools/JavaScanner.$(H) $(INCLUDE_TOP)/stx/libjava/tools/JavaScannerBase.$(H) $(STCHDR)
+$(OUTDIR)JavaSyntaxHighlighter.$(O) JavaSyntaxHighlighter.$(H): JavaSyntaxHighlighter.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libjava/tools/JavaParser.$(H) $(INCLUDE_TOP)/stx/libjava/tools/JavaParserII.$(H) $(INCLUDE_TOP)/stx/libjava/tools/JavaParserI.$(H) $(INCLUDE_TOP)/stx/goodies/petitparser/PPCompositeParser.$(H) $(INCLUDE_TOP)/stx/goodies/petitparser/PPDelegateParser.$(H) $(INCLUDE_TOP)/stx/goodies/petitparser/PPParser.$(H) $(INCLUDE_TOP)/stx/libjava/tools/JavaParseNodeBuilder.$(H) $(INCLUDE_TOP)/stx/libjava/tools/JavaScanner.$(H) $(INCLUDE_TOP)/stx/libjava/tools/JavaScannerBase.$(H) $(STCHDR)
$(OUTDIR)extensions.$(O): extensions.st $(INCLUDE_TOP)/stx/libjava/JavaClass.$(H) $(INCLUDE_TOP)/stx/libjava/JavaBehavior.$(H) $(INCLUDE_TOP)/stx/libbasic/Class.$(H) $(INCLUDE_TOP)/stx/libbasic/ClassDescription.$(H) $(INCLUDE_TOP)/stx/libbasic/Behavior.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libjava/JavaObject.$(H) $(INCLUDE_TOP)/stx/libtool/Tools__NewSystemBrowser.$(H) $(INCLUDE_TOP)/stx/libtool/SystemBrowser.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/ConfigurableFeatures.$(H) $(INCLUDE_TOP)/stx/libwidg/GenericToolbarIconLibrary.$(H) $(STCHDR)
# ENDMAKEDEPEND --- do not remove this line
--- a/tools/abbrev.stc Wed Feb 13 20:31:46 2013 +0000
+++ b/tools/abbrev.stc Thu Feb 14 16:15:31 2013 +0000
@@ -5,8 +5,8 @@
JavaMapInspectorView JavaMapInspectorView stx:libjava/tools 'Languages-Java-Tools-Inspectors' 2
JavaParseNode JavaParseNode stx:libjava/tools 'Languages-Java-Parser-AST' 0
JavaParseNodeBuilder JavaParseNodeBuilder stx:libjava/tools 'Languages-Java-Parser-AST' 0
-JavaParserIITests JavaParserIITests stx:libjava/tools 'Languages-Java-Tests-Parser' 0
-JavaParserITests JavaParserITests stx:libjava/tools 'Languages-Java-Tests-Parser' 0
+JavaParserIITests JavaParserIITests stx:libjava/tools 'Languages-Java-Tests-Parser' 1
+JavaParserITests JavaParserITests stx:libjava/tools 'Languages-Java-Tests-Parser' 1
JavaParser_Eclipse JavaParser_Eclipse stx:libjava/tools 'Languages-Java-Tools' 0
JavaSetInspectorView JavaSetInspectorView stx:libjava/tools 'Languages-Java-Tools-Inspectors' 2
JavaSyntaxHighlighter_Eclipse JavaSyntaxHighlighter_Eclipse stx:libjava/tools 'Languages-Java-Tools-Eclipse' 0
@@ -36,6 +36,6 @@
JavaSourcePartitioner JavaSourcePartitioner stx:libjava/tools 'Languages-Java-Parser-Utils' 0
JavaSettingsApplication JavaSettingsApplication stx:libjava/tools 'Languages-Java-Tools' 1
JavaSourceReference JavaSourceReference stx:libjava/tools 'Languages-Java-Parser-Utils' 0
-JavaSourcePartitionerTests JavaSourcePartitionerTests stx:libjava/tools 'Languages-Java-Tests-Parser' 0
+JavaSourcePartitionerTests JavaSourcePartitionerTests stx:libjava/tools 'Languages-Java-Tests-Parser' 1
JavaCodeBundleEditor JavaCodeBundleEditor stx:libjava/tools 'Languages-Java-Tools' 1
JavaCodeLibraryEditor JavaCodeLibraryEditor stx:libjava/tools 'Languages-Java-Tools' 1
--- a/tools/bc.mak Wed Feb 13 20:31:46 2013 +0000
+++ b/tools/bc.mak Thu Feb 14 16:15:31 2013 +0000
@@ -50,20 +50,20 @@
# build all prerequisite packages for this package
prereq:
- pushd ..\..\..\squeak\petitparser & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\..\libdb\libodbc & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\..\libbasic & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\..\libcomp & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\..\libbasic2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\..\libdb & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\..\libview & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\..\libdb\libsqlite & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\..\libdb\libodbc & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\..\libboss & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\..\libview2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\..\libbasic3 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\..\goodies\sunit & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\..\libui & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\..\goodies\petitparser & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
+ pushd ..\..\..\squeak\petitparser & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\..\libwidg & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\..\libwidg2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
pushd ..\..\libhtml & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
@@ -111,7 +111,7 @@
$(OUTDIR)JavaLongTypeNode.$(O) JavaLongTypeNode.$(H): JavaLongTypeNode.st $(INCLUDE_TOP)\stx\libjava\tools\JavaTypeNode.$(H) $(INCLUDE_TOP)\stx\libjava\tools\JavaParseNode.$(H) $(INCLUDE_TOP)\stx\libcomp\ParseNode.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)JavaParser.$(O) JavaParser.$(H): JavaParser.st $(INCLUDE_TOP)\stx\libjava\tools\JavaParserII.$(H) $(INCLUDE_TOP)\stx\libjava\tools\JavaParserI.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\PPCompositeParser.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\PPDelegateParser.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\PPParser.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)JavaVoidTypeNode.$(O) JavaVoidTypeNode.$(H): JavaVoidTypeNode.st $(INCLUDE_TOP)\stx\libjava\tools\JavaTypeNode.$(H) $(INCLUDE_TOP)\stx\libjava\tools\JavaParseNode.$(H) $(INCLUDE_TOP)\stx\libcomp\ParseNode.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)JavaSyntaxHighlighter.$(O) JavaSyntaxHighlighter.$(H): JavaSyntaxHighlighter.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libjava\tools\JavaParseNodeBuilder.$(H) $(INCLUDE_TOP)\stx\libjava\tools\JavaParser.$(H) $(INCLUDE_TOP)\stx\libjava\tools\JavaParserII.$(H) $(INCLUDE_TOP)\stx\libjava\tools\JavaParserI.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\PPCompositeParser.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\PPDelegateParser.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\PPParser.$(H) $(INCLUDE_TOP)\stx\libjava\tools\JavaScanner.$(H) $(INCLUDE_TOP)\stx\libjava\tools\JavaScannerBase.$(H) $(STCHDR)
+$(OUTDIR)JavaSyntaxHighlighter.$(O) JavaSyntaxHighlighter.$(H): JavaSyntaxHighlighter.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libjava\tools\JavaParser.$(H) $(INCLUDE_TOP)\stx\libjava\tools\JavaParserII.$(H) $(INCLUDE_TOP)\stx\libjava\tools\JavaParserI.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\PPCompositeParser.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\PPDelegateParser.$(H) $(INCLUDE_TOP)\stx\goodies\petitparser\PPParser.$(H) $(INCLUDE_TOP)\stx\libjava\tools\JavaParseNodeBuilder.$(H) $(INCLUDE_TOP)\stx\libjava\tools\JavaScanner.$(H) $(INCLUDE_TOP)\stx\libjava\tools\JavaScannerBase.$(H) $(STCHDR)
$(OUTDIR)extensions.$(O): extensions.st $(INCLUDE_TOP)\stx\libjava\JavaClass.$(H) $(INCLUDE_TOP)\stx\libjava\JavaBehavior.$(H) $(INCLUDE_TOP)\stx\libbasic\Class.$(H) $(INCLUDE_TOP)\stx\libbasic\ClassDescription.$(H) $(INCLUDE_TOP)\stx\libbasic\Behavior.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libjava\JavaObject.$(H) $(INCLUDE_TOP)\stx\libtool\Tools__NewSystemBrowser.$(H) $(INCLUDE_TOP)\stx\libtool\SystemBrowser.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(INCLUDE_TOP)\stx\libbasic\ConfigurableFeatures.$(H) $(INCLUDE_TOP)\stx\libwidg\GenericToolbarIconLibrary.$(H) $(STCHDR)
# ENDMAKEDEPEND --- do not remove this line
--- a/tools/mingwmake.bat Wed Feb 13 20:31:46 2013 +0000
+++ b/tools/mingwmake.bat Thu Feb 14 16:15:31 2013 +0000
@@ -7,6 +7,8 @@
@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 -DUSEMINGW=1 %DEFINES% %*
+
+@call ..\..\rules\find_mingw.bat
+make.exe -N -f bc.mak %USEMINGW_ARG% %*
--- a/tools/stx_libjava_tools.st Wed Feb 13 20:31:46 2013 +0000
+++ b/tools/stx_libjava_tools.st Thu Feb 14 16:15:31 2013 +0000
@@ -192,6 +192,10 @@
!stx_libjava_tools class methodsFor:'documentation'!
+version_CVS
+ ^ '$Header$'
+!
+
version_HG
^ '$Changeset: <not expanded> $'
--- a/tools/tools.rc Wed Feb 13 20:31:46 2013 +0000
+++ b/tools/tools.rc Thu Feb 14 16:15:31 2013 +0000
@@ -3,7 +3,7 @@
// automagically generated from the projectDefinition: stx_libjava_tools.
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 6,2,32767,32767
+ FILEVERSION 6,2,564,564
PRODUCTVERSION 6,2,3,0
#if (__BORLANDC__)
FILEFLAGSMASK VS_FF_DEBUG | VS_FF_PRERELEASE
@@ -20,12 +20,12 @@
BEGIN
VALUE "CompanyName", "eXept Software AG\0"
VALUE "FileDescription", "Smalltalk/X Class library (LIB)\0"
- VALUE "FileVersion", "6.2.32767.32767\0"
+ VALUE "FileVersion", "6.2.564.564\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.3.0\0"
- VALUE "ProductDate", "Mon, 28 Jan 2013 21:14:12 GMT\0"
+ VALUE "ProductDate", "Thu, 14 Feb 2013 16:12:15 GMT\0"
END
END