Fixes in ChangeSet::ClassSourceWriter.
Fixes test RegressionTests::ChangeSetTests>>test_ClassSourceWriter_01
--- a/ChangeSet.st Tue Apr 30 10:50:53 2013 +0100
+++ b/ChangeSet.st Wed May 01 09:34:36 2013 +0100
@@ -20,8 +20,9 @@
Object subclass:#ChangeFileReader
instanceVariableNames:'inputStream parseTree changeAction changeSet selector receiver
- arguments receiverSelector receiverReceiver lineNumber position
- className methodSelector nameSpaceOverride chunk timestamp classIsJava'
+ arguments receiverSelector receiverReceiver lineNumber position
+ className methodSelector nameSpaceOverride chunk timestamp
+ classIsJava'
classVariableNames:''
poolDictionaries:''
privateIn:ChangeSet
@@ -104,7 +105,6 @@
"
! !
-
!ChangeSet class methodsFor:'instance creation'!
forExistingClass:aClass
@@ -650,7 +650,6 @@
"
! !
-
!ChangeSet class methodsFor:'Compatibility-ST80'!
patches
@@ -677,7 +676,6 @@
! !
-
!ChangeSet class methodsFor:'instance creation-private'!
changesFromStream:aStream do:aBlock
@@ -832,7 +830,6 @@
"Modified: / 30-01-2013 / 10:30:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!ChangeSet class methodsFor:'queries'!
current
@@ -850,7 +847,6 @@
"
! !
-
!ChangeSet class methodsFor:'utilities'!
decodedStreamFor:aStream
@@ -858,7 +854,6 @@
^ EncodedStream decodedStreamFor:aStream
! !
-
!ChangeSet methodsFor:'Compatibility-ST80'!
changeClass:aClass
@@ -950,7 +945,6 @@
"Created: / 6.2.2000 / 20:45:10 / cg"
! !
-
!ChangeSet methodsFor:'accessing'!
name
@@ -963,7 +957,6 @@
"Modified (format): / 28-07-2012 / 09:34:52 / cg"
! !
-
!ChangeSet methodsFor:'change & update'!
changed:anAspectSymbol with:aParameter
@@ -976,7 +969,6 @@
super changed:anAspectSymbol with:aParameter
! !
-
!ChangeSet methodsFor:'changes management'!
addClassCommentChangeFor:aClass
@@ -1219,7 +1211,6 @@
"Modified: / 14.11.2001 / 13:36:06 / cg"
! !
-
!ChangeSet methodsFor:'fileOut'!
fileOutAs: aStringOrFilename
@@ -1291,8 +1282,6 @@
].
!
-
-
removeAll:aCollection
aCollection notEmpty ifTrue:[
super removeAll:aCollection.
@@ -1305,7 +1294,6 @@
changedClasses := nil
! !
-
!ChangeSet methodsFor:'queries'!
changedPackages
@@ -1593,7 +1581,6 @@
"Created: / 08-09-2011 / 04:38:32 / cg"
! !
-
!ChangeSet methodsFor:'utilities'!
apply
@@ -2207,7 +2194,6 @@
"Modified (comment): / 31-07-2012 / 13:38:29 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!ChangeSet::ChangeFileReader methodsFor:'accessing'!
changeAction:aBlock
@@ -2224,7 +2210,6 @@
inputStream := aStream.
! !
-
!ChangeSet::ChangeFileReader methodsFor:'helpers'!
addChange:change
@@ -2362,7 +2347,6 @@
^ receiver name
! !
-
!ChangeSet::ChangeFileReader methodsFor:'reading'!
changesFromParseTree:aTree lineNumber:initialLineNumberOrNil position:initialPositionOrNil
@@ -2403,7 +2387,6 @@
"Created: / 24-01-2012 / 17:28:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!ChangeSet::ChangeFileReader methodsFor:'reading-private'!
handleCategoriesForChange
@@ -3207,7 +3190,6 @@
"Created: / 02-04-2012 / 19:08:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!ChangeSet::ClassSourceWriter methodsFor:'private'!
analyze
@@ -3348,7 +3330,6 @@
"Created: / 15-03-2012 / 19:45:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!ChangeSet::ClassSourceWriter methodsFor:'source writing'!
fileOut:aChangeSet on:outStreamArg withTimeStamp:stampIt withInitialize:initIt withDefinition:withDefinition methodFilter:methodFilter encoder:encoderOrNil
@@ -3450,7 +3431,6 @@
"/ ].
self fileOutCategory:'documentation' of:meta except:versionMethods only:nil methodFilter:methodFilter on:outStream.
- outStream cr.
].
"/
@@ -3458,7 +3438,6 @@
"/
(collectionOfCategories includes:'initialization') ifTrue:[
self fileOutCategory:'initialization' of:meta methodFilter:methodFilter on:outStream.
- outStream cr.
].
"/
@@ -3466,14 +3445,12 @@
"/
(collectionOfCategories includes:'instance creation') ifTrue:[
self fileOutCategory:'instance creation' of:meta methodFilter:methodFilter on:outStream.
- outStream cr.
].
collectionOfCategories do:[:aCategory |
((aCategory ~= 'documentation')
and:[(aCategory ~= 'initialization')
and:[aCategory ~= 'instance creation']]) ifTrue:[
self fileOutCategory:aCategory of:meta methodFilter:methodFilter on:outStream.
- outStream cr
]
]
].
@@ -3495,7 +3472,6 @@
collectionOfCategories notNil ifTrue:[
collectionOfCategories do:[:aCategory |
self fileOutCategory:aCategory of:nonMeta methodFilter:methodFilter on:outStream.
- outStream cr
]
].
@@ -3541,7 +3517,7 @@
"Modified: / 01-04-1997 / 16:01:05 / stefan"
"Modified: / 29-09-2011 / 14:53:49 / cg"
"Created: / 15-03-2012 / 17:39:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 30-01-2013 / 09:25:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 01-05-2013 / 09:17:33 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
fileOutAllDefinitionsOf:nonMetaInfo on:aStream
@@ -3628,14 +3604,14 @@
collectionOfCategories notNil ifTrue:[
collectionOfCategories do:[:aCategory |
self fileOutCategory:aCategory of:meta methodFilter:methodFilter on:aStream.
- aStream cr
+"/ aStream cr.
]
].
collectionOfCategories := aClass categories asSortedCollection.
collectionOfCategories notNil ifTrue:[
collectionOfCategories do:[:aCategory |
self fileOutCategory:aCategory of:aClass methodFilter:methodFilter on:aStream.
- aStream cr
+"/ aStream cr.
]
].
@@ -3646,6 +3622,7 @@
"Created: / 15-10-1996 / 11:13:00 / cg"
"Modified: / 22-03-1997 / 16:12:17 / cg"
"Created: / 19-03-2012 / 18:21:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 01-05-2013 / 09:06:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
fileOutMethod:change on:aStream
@@ -3801,7 +3778,6 @@
"Created: / 15-03-2012 / 19:01:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!ChangeSet::ClassSourceWriter::ClassInfo class methodsFor:'documentation'!
copyright
@@ -3822,7 +3798,6 @@
^ 'Id:: ChangeSet.st 1981 2012-11-30 17:20:01Z vranyj1 '
! !
-
!ChangeSet::ClassSourceWriter::ClassInfo class methodsFor:'instance creation'!
new
@@ -3831,7 +3806,6 @@
^ self basicNew initialize.
! !
-
!ChangeSet::ClassSourceWriter::ClassInfo methodsFor:'accessing'!
categories
@@ -3951,7 +3925,6 @@
superclass := something.
! !
-
!ChangeSet::ClassSourceWriter::ClassInfo methodsFor:'adding'!
addChange: change
@@ -4001,7 +3974,6 @@
"Created: / 15-03-2012 / 19:12:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!ChangeSet::ClassSourceWriter::ClassInfo methodsFor:'enumerating'!
methodsDo: aBlock
@@ -4011,7 +3983,6 @@
"Created: / 19-03-2012 / 18:14:19 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!ChangeSet::ClassSourceWriter::ClassInfo methodsFor:'initialization'!
initialize
@@ -4028,7 +3999,6 @@
"Modified: / 15-03-2012 / 19:12:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!ChangeSet::ClassSourceWriter::ClassInfo methodsFor:'printing & storing'!
printClassNameOn:aStream
@@ -4056,7 +4026,6 @@
"Modified: / 19-03-2012 / 19:43:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!ChangeSet::ClassSourceWriter::ClassInfo methodsFor:'queries'!
includesSelector: selector
@@ -4083,7 +4052,6 @@
"Created: / 15-03-2012 / 19:41:02 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!ChangeSet::DiffSet class methodsFor:'documentation'!
documentation
@@ -4093,7 +4061,6 @@
"
! !
-
!ChangeSet::DiffSet methodsFor:'accessing'!
changed
@@ -4175,7 +4142,6 @@
same := something.
! !
-
!ChangeSet::DiffSet methodsFor:'merging'!
addDiffSet:anotherDiffset
@@ -4199,7 +4165,6 @@
"Modified: / 19-03-2012 / 21:36:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!ChangeSet::DiffSet methodsFor:'misc'!
removeAllVersionMethods
@@ -4217,7 +4182,6 @@
].
! !
-
!ChangeSet::DiffSet methodsFor:'queries'!
changedClasses
@@ -4248,7 +4212,6 @@
"Created: / 12-10-2006 / 23:12:27 / cg"
! !
-
!ChangeSet::DolphinPACFileReader methodsFor:'reading-private'!
handleCategoriesForClass
@@ -4366,7 +4329,6 @@
"Modified: / 15.12.1999 / 00:29:06 / cg"
! !
-
!ChangeSet::SIFChangeFileReader methodsFor:'reading-private'!
handleAnnotation
@@ -4503,15 +4465,14 @@
"Modified: / 15.12.1999 / 00:29:06 / cg"
! !
-
!ChangeSet class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic3/ChangeSet.st,v 1.224 2013-04-25 13:11:15 stefan Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic3/ChangeSet.st,v 1.225 2013-05-01 09:33:15 +0100 vrany Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libbasic3/ChangeSet.st,v 1.224 2013-04-25 13:11:15 stefan Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic3/ChangeSet.st,v 1.225 2013-05-01 09:33:15 +0100 vrany Exp $'
!
version_HG
--- a/ClassDefinitionChange.st Tue Apr 30 10:50:53 2013 +0100
+++ b/ClassDefinitionChange.st Wed May 01 09:34:36 2013 +0100
@@ -47,7 +47,6 @@
"
! !
-
!ClassDefinitionChange methodsFor:'accessing'!
basicSuperClassName
@@ -298,7 +297,6 @@
^ nm
! !
-
!ClassDefinitionChange methodsFor:'applying'!
apply
@@ -345,7 +343,6 @@
"Modified: / 06-10-2011 / 17:01:58 / cg"
! !
-
!ClassDefinitionChange methodsFor:'comparing'!
isConflict
@@ -386,7 +383,6 @@
! !
-
!ClassDefinitionChange methodsFor:'converting'!
asAntiChange
@@ -396,7 +392,6 @@
"Created: / 02-11-2009 / 11:11:29 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!ClassDefinitionChange methodsFor:'printing & storing'!
definitionString
@@ -444,11 +439,14 @@
nextPutAll:superClassNameUsed;
nextPutAll:' ',selPart;
nextPutLine: classNameUsed asSymbol storeString;
- nextPutAll:' instanceVariableNames: ';
+ tab;
+ nextPutAll:'instanceVariableNames:';
nextPutLine:(instanceVariableNames ? '') storeString;
- nextPutAll:' classVariableNames: ';
+ tab;
+ nextPutAll:'classVariableNames:';
nextPutLine:(classVariableNames ? '') storeString;
- nextPutAll:' poolDictionaries: ';
+ tab;
+ nextPutAll:'poolDictionaries:';
nextPutLine:(poolDictionaries ? '') storeString.
self isPrivateClassDefinitionChange ifTrue:[
ownerNameUsed := self owningClassName.
@@ -456,16 +454,19 @@
ownerNameUsed := nsOrNil,'::',ownerNameUsed.
].
stream
- nextPutAll:' privateIn: ';
+ tab;
+ nextPutAll:'privateIn:';
nextPutAll:ownerNameUsed
] ifFalse:[
stream
- nextPutAll:' category: ';
+ tab;
+ nextPutAll:'category:';
nextPutAll:(category ? '') asString storeString
].
]
"Modified: / 13-06-2012 / 13:01:58 / cg"
+ "Modified: / 30-04-2013 / 19:52:35 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
definitionStringWithoutNamespace
@@ -565,7 +566,6 @@
! !
-
!ClassDefinitionChange methodsFor:'queries'!
definitionSelector
@@ -648,7 +648,6 @@
"Created: / 30-08-2010 / 13:55:37 / cg"
! !
-
!ClassDefinitionChange methodsFor:'special'!
installAsAutoloadedClassIfPublicWithFilename:aFilenameString
@@ -764,7 +763,6 @@
"Modified: / 30-01-2013 / 12:01:43 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
-
!ClassDefinitionChange methodsFor:'visiting'!
acceptChangeVisitor:aVisitor
@@ -773,15 +771,14 @@
"Created: / 25-11-2011 / 17:13:13 / cg"
! !
-
!ClassDefinitionChange class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic3/ClassDefinitionChange.st,v 1.81 2013-04-16 18:09:44 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic3/ClassDefinitionChange.st,v 1.82 2013-05-01 09:31:30 +0100 vrany Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libbasic3/ClassDefinitionChange.st,v 1.81 2013-04-16 18:09:44 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic3/ClassDefinitionChange.st,v 1.82 2013-05-01 09:31:30 +0100 vrany Exp $'
!
version_HG
--- a/Make.proto Tue Apr 30 10:50:53 2013 +0100
+++ b/Make.proto Wed May 01 09:34:36 2013 +0100
@@ -1,4 +1,4 @@
-# $Header: /cvs/stx/stx/libbasic3/Make.proto,v 1.135 2013-04-02 19:24:04 cg Exp $
+# $Header$
#
# DO NOT EDIT
# automagically generated from the projectDefinition: stx_libbasic3.
@@ -124,13 +124,8 @@
# build all mandatory prerequisite packages (containing superclasses) for this package
prereq:
cd ../libbasic && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
- cd ../libbasic2 && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES)"
-
-# build all packages containing referenced classes for this package
-# they are nor needed to compile the package
-references:
# build all packages containing referenced classes for this package
# they are nor needed to compile the package
--- a/Make.spec Tue Apr 30 10:50:53 2013 +0100
+++ b/Make.spec Wed May 01 09:34:36 2013 +0100
@@ -1,4 +1,4 @@
-# $Header: /cvs/stx/stx/libbasic3/Make.spec,v 1.85 2013-04-02 19:24:02 cg Exp $
+# $Header$
#
# DO NOT EDIT
# automagically generated from the projectDefinition: stx_libbasic3.
@@ -53,7 +53,11 @@
AbstractSourceCodeManager \
CallChain \
Change \
+ ChangeDeltaInformation \
+ ChangeNotificationParameter \
ChangeSet \
+ ChangeSetDiff \
+ ChangeSetDiffComponent \
ClassOrganizer \
HTMLDocGenerator \
HistoryManager \
@@ -61,20 +65,36 @@
MessageTracer \
MethodFinder \
ProfileTree \
+ ProjectChecker \
+ ProjectProblem \
+ SourceCodeCache \
SourceCodeManagerError \
SourceCodeManagerUtilities \
SystemOrganizer \
+ TraceBuffer \
VersionInfo \
WrappedMethod \
stx_libbasic3 \
CVSSourceCodeManager \
CVSVersionInfo \
+ ChangeSetDiffEntry \
+ ChangeSetDiffSet \
ClassChange \
CompositeChange \
+ DataBaseSourceCodeManager \
DoItChange \
+ FileBasedSourceCodeManager \
FileInChange \
+ GitSourceCodeManager \
+ InvalidChange \
+ MercurialSourceCodeManager \
+ MethodChangeNotificationParameter \
NameSpaceCreationChange \
OtherChange \
+ PerforceSourceCodeManager \
+ SVNVersionInfo \
+ SourceCodeManagerUtilitiesForContainerBasedManagers \
+ SourceCodeManagerUtilitiesForWorkspaceBasedManagers \
StoreSourceCodeManager \
ClassCategoryChange \
ClassClassVariableChange \
@@ -85,8 +105,12 @@
ClassPrimitiveChange \
ClassRemoveChange \
ClassRenameChange \
+ InfoChange \
+ MethodCategoryChangeNotificationParameter \
MethodCategoryRenameChange \
MethodChange \
+ MethodRemoveChangeNotificationParameter \
+ MethodTrapChangeNotificationParameter \
TimestampChange \
ClassPrimitiveDefinitionsChange \
ClassPrimitiveFunctionsChange \
@@ -96,30 +120,6 @@
MethodPackageChange \
MethodPrivacyChange \
MethodRemoveChange \
- ChangeNotificationParameter \
- MethodChangeNotificationParameter \
- MethodRemoveChangeNotificationParameter \
- MethodCategoryChangeNotificationParameter \
- MethodTrapChangeNotificationParameter \
- TraceBuffer \
- PerforceSourceCodeManager \
- ChangeSetDiffComponent \
- ChangeSetDiff \
- ChangeSetDiffSet \
- ChangeSetDiffEntry \
- ChangeDeltaInformation \
- SVNVersionInfo \
- SourceCodeCache \
- FileBasedSourceCodeManager \
- DataBaseSourceCodeManager \
- ProjectChecker \
- MercurialSourceCodeManager \
- InvalidChange \
- InfoChange \
- GitSourceCodeManager \
- ProjectProblem \
- SourceCodeManagerUtilitiesForContainerBasedManagers \
- SourceCodeManagerUtilitiesForWorkspaceBasedManagers \
@@ -128,7 +128,11 @@
$(OUTDIR_SLASH)AbstractSourceCodeManager.$(O) \
$(OUTDIR_SLASH)CallChain.$(O) \
$(OUTDIR_SLASH)Change.$(O) \
+ $(OUTDIR_SLASH)ChangeDeltaInformation.$(O) \
+ $(OUTDIR_SLASH)ChangeNotificationParameter.$(O) \
$(OUTDIR_SLASH)ChangeSet.$(O) \
+ $(OUTDIR_SLASH)ChangeSetDiff.$(O) \
+ $(OUTDIR_SLASH)ChangeSetDiffComponent.$(O) \
$(OUTDIR_SLASH)ClassOrganizer.$(O) \
$(OUTDIR_SLASH)HTMLDocGenerator.$(O) \
$(OUTDIR_SLASH)HistoryManager.$(O) \
@@ -136,20 +140,36 @@
$(OUTDIR_SLASH)MessageTracer.$(O) \
$(OUTDIR_SLASH)MethodFinder.$(O) \
$(OUTDIR_SLASH)ProfileTree.$(O) \
+ $(OUTDIR_SLASH)ProjectChecker.$(O) \
+ $(OUTDIR_SLASH)ProjectProblem.$(O) \
+ $(OUTDIR_SLASH)SourceCodeCache.$(O) \
$(OUTDIR_SLASH)SourceCodeManagerError.$(O) \
$(OUTDIR_SLASH)SourceCodeManagerUtilities.$(O) \
$(OUTDIR_SLASH)SystemOrganizer.$(O) \
+ $(OUTDIR_SLASH)TraceBuffer.$(O) \
$(OUTDIR_SLASH)VersionInfo.$(O) \
$(OUTDIR_SLASH)WrappedMethod.$(O) \
$(OUTDIR_SLASH)stx_libbasic3.$(O) \
$(OUTDIR_SLASH)CVSSourceCodeManager.$(O) \
$(OUTDIR_SLASH)CVSVersionInfo.$(O) \
+ $(OUTDIR_SLASH)ChangeSetDiffEntry.$(O) \
+ $(OUTDIR_SLASH)ChangeSetDiffSet.$(O) \
$(OUTDIR_SLASH)ClassChange.$(O) \
$(OUTDIR_SLASH)CompositeChange.$(O) \
+ $(OUTDIR_SLASH)DataBaseSourceCodeManager.$(O) \
$(OUTDIR_SLASH)DoItChange.$(O) \
+ $(OUTDIR_SLASH)FileBasedSourceCodeManager.$(O) \
$(OUTDIR_SLASH)FileInChange.$(O) \
+ $(OUTDIR_SLASH)GitSourceCodeManager.$(O) \
+ $(OUTDIR_SLASH)InvalidChange.$(O) \
+ $(OUTDIR_SLASH)MercurialSourceCodeManager.$(O) \
+ $(OUTDIR_SLASH)MethodChangeNotificationParameter.$(O) \
$(OUTDIR_SLASH)NameSpaceCreationChange.$(O) \
$(OUTDIR_SLASH)OtherChange.$(O) \
+ $(OUTDIR_SLASH)PerforceSourceCodeManager.$(O) \
+ $(OUTDIR_SLASH)SVNVersionInfo.$(O) \
+ $(OUTDIR_SLASH)SourceCodeManagerUtilitiesForContainerBasedManagers.$(O) \
+ $(OUTDIR_SLASH)SourceCodeManagerUtilitiesForWorkspaceBasedManagers.$(O) \
$(OUTDIR_SLASH)StoreSourceCodeManager.$(O) \
$(OUTDIR_SLASH)ClassCategoryChange.$(O) \
$(OUTDIR_SLASH)ClassClassVariableChange.$(O) \
@@ -160,8 +180,12 @@
$(OUTDIR_SLASH)ClassPrimitiveChange.$(O) \
$(OUTDIR_SLASH)ClassRemoveChange.$(O) \
$(OUTDIR_SLASH)ClassRenameChange.$(O) \
+ $(OUTDIR_SLASH)InfoChange.$(O) \
+ $(OUTDIR_SLASH)MethodCategoryChangeNotificationParameter.$(O) \
$(OUTDIR_SLASH)MethodCategoryRenameChange.$(O) \
$(OUTDIR_SLASH)MethodChange.$(O) \
+ $(OUTDIR_SLASH)MethodRemoveChangeNotificationParameter.$(O) \
+ $(OUTDIR_SLASH)MethodTrapChangeNotificationParameter.$(O) \
$(OUTDIR_SLASH)TimestampChange.$(O) \
$(OUTDIR_SLASH)ClassPrimitiveDefinitionsChange.$(O) \
$(OUTDIR_SLASH)ClassPrimitiveFunctionsChange.$(O) \
@@ -171,30 +195,6 @@
$(OUTDIR_SLASH)MethodPackageChange.$(O) \
$(OUTDIR_SLASH)MethodPrivacyChange.$(O) \
$(OUTDIR_SLASH)MethodRemoveChange.$(O) \
- $(OUTDIR_SLASH)ChangeNotificationParameter.$(O) \
- $(OUTDIR_SLASH)MethodChangeNotificationParameter.$(O) \
- $(OUTDIR_SLASH)MethodRemoveChangeNotificationParameter.$(O) \
- $(OUTDIR_SLASH)MethodCategoryChangeNotificationParameter.$(O) \
- $(OUTDIR_SLASH)MethodTrapChangeNotificationParameter.$(O) \
- $(OUTDIR_SLASH)TraceBuffer.$(O) \
- $(OUTDIR_SLASH)PerforceSourceCodeManager.$(O) \
- $(OUTDIR_SLASH)ChangeSetDiffComponent.$(O) \
- $(OUTDIR_SLASH)ChangeSetDiff.$(O) \
- $(OUTDIR_SLASH)ChangeSetDiffSet.$(O) \
- $(OUTDIR_SLASH)ChangeSetDiffEntry.$(O) \
- $(OUTDIR_SLASH)ChangeDeltaInformation.$(O) \
- $(OUTDIR_SLASH)SVNVersionInfo.$(O) \
- $(OUTDIR_SLASH)SourceCodeCache.$(O) \
- $(OUTDIR_SLASH)FileBasedSourceCodeManager.$(O) \
- $(OUTDIR_SLASH)DataBaseSourceCodeManager.$(O) \
- $(OUTDIR_SLASH)ProjectChecker.$(O) \
- $(OUTDIR_SLASH)MercurialSourceCodeManager.$(O) \
- $(OUTDIR_SLASH)InvalidChange.$(O) \
- $(OUTDIR_SLASH)InfoChange.$(O) \
- $(OUTDIR_SLASH)GitSourceCodeManager.$(O) \
- $(OUTDIR_SLASH)ProjectProblem.$(O) \
- $(OUTDIR_SLASH)SourceCodeManagerUtilitiesForContainerBasedManagers.$(O) \
- $(OUTDIR_SLASH)SourceCodeManagerUtilitiesForWorkspaceBasedManagers.$(O) \
$(OUTDIR_SLASH)extensions.$(O) \
--- a/ProjectProblem.st Tue Apr 30 10:50:53 2013 +0100
+++ b/ProjectProblem.st Wed May 01 09:34:36 2013 +0100
@@ -1566,6 +1566,11 @@
^ '$Header: /cvs/stx/stx/libbasic3/ProjectProblem.st,v 1.22 2013-04-17 21:45:28 cg Exp $'
!
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+!
+
version_SVN
^ '§Id: ProjectProblem.st 1962 2012-09-10 10:34:08Z vranyj1 §'
! !
--- a/SourceCodeManagerUtilitiesForWorkspaceBasedManagers.st Tue Apr 30 10:50:53 2013 +0100
+++ b/SourceCodeManagerUtilitiesForWorkspaceBasedManagers.st Wed May 01 09:34:36 2013 +0100
@@ -34,7 +34,6 @@
"
! !
-
!SourceCodeManagerUtilitiesForWorkspaceBasedManagers methodsFor:'utilities-cvs'!
checkinPackage:packageToCheckIn classes:doClasses extensions:doExtensions buildSupport:doBuild askForMethodsInOtherPackages:askForMethodsInOtherPackages
@@ -221,7 +220,6 @@
"Modified: / 24-09-2012 / 11:13:04 / cg"
! !
-
!SourceCodeManagerUtilitiesForWorkspaceBasedManagers class methodsFor:'documentation'!
version
@@ -232,6 +230,11 @@
^ '$Header: /cvs/stx/stx/libbasic3/SourceCodeManagerUtilitiesForWorkspaceBasedManagers.st,v 1.5 2013-03-27 12:02:47 cg Exp $'
!
+version_HG
+
+ ^ '$Changeset: <not expanded> $'
+!
+
version_SVN
^ '§Id:: SourceCodeManagerUtilitiesForWorkspaceBasedManagers.st 1971 2012-09-27 19:37:25Z vranyj1 §'
! !
--- a/bc.mak Tue Apr 30 10:50:53 2013 +0100
+++ b/bc.mak Wed May 01 09:34:36 2013 +0100
@@ -1,4 +1,4 @@
-# $Header: /cvs/stx/stx/libbasic3/bc.mak,v 1.115 2013-04-02 19:24:08 cg Exp $
+# $Header$
#
# DO NOT EDIT
# automagically generated from the projectDefinition: stx_libbasic3.
@@ -54,16 +54,12 @@
# build all mandatory prerequisite packages (containing superclasses) for this package
prereq:
pushd ..\libbasic & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
- pushd ..\libbasic2 & $(MAKE_BAT) "CFLAGS_LOCAL=$(GLOBALDEFINES) "
-clean::
- del *.$(CSUFFIX)
-
test: $(TOP)\goodies\builder\reports\NUL
pushd $(TOP)\goodies\builder\reports & $(MAKE_BAT)
--- a/extensions.st Tue Apr 30 10:50:53 2013 +0100
+++ b/extensions.st Wed May 01 09:34:36 2013 +0100
@@ -155,4 +155,4 @@
extensionsVersion_HG
^ '$Changeset: <not expanded> $'
-! !
\ No newline at end of file
+! !
--- a/libInit.cc Tue Apr 30 10:50:53 2013 +0100
+++ b/libInit.cc Wed May 01 09:34:36 2013 +0100
@@ -1,5 +1,5 @@
/*
- * $Header: /cvs/stx/stx/libbasic3/libInit.cc,v 1.101 2013-04-02 19:24:20 cg Exp $
+ * $Header$
*
* DO NOT EDIT
* automagically generated from the projectDefinition: stx_libbasic3.
--- a/libbasic3.rc Tue Apr 30 10:50:53 2013 +0100
+++ b/libbasic3.rc Wed May 01 09:34:36 2013 +0100
@@ -3,7 +3,7 @@
// automagically generated from the projectDefinition: stx_libbasic3.
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 6,2,1,78
+ FILEVERSION 6,2,32767,32767
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 Additional Developer Basic Classes (LIB)\0"
- VALUE "FileVersion", "6.2.1.78\0"
+ VALUE "FileVersion", "6.2.32767.32767\0"
VALUE "InternalName", "stx:libbasic3\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", "Tue, 02 Apr 2013 19:24:00 GMT\0"
+ VALUE "ProductDate", "Wed, 01 May 2013 08:33:35 GMT\0"
END
END
--- a/mingwmake.bat Tue Apr 30 10:50:53 2013 +0100
+++ b/mingwmake.bat Wed May 01 09:34:36 2013 +0100
@@ -3,10 +3,14 @@
@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%"
@pushd ..\rules
@call find_mingw.bat
@popd
-make.exe -N -f bc.mak %USEMINGW_ARG% %*
+make.exe -N -f bc.mak %DEFINES% %USEMINGW_ARG% %*