--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Diff2Tests.st Fri Mar 16 20:12:51 2012 +0000
@@ -0,0 +1,224 @@
+"
+ COPYRIGHT (c) 2006 by eXept Software AG
+ All Rights Reserved
+
+ 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.
+"
+"{ Package: 'stx:libtool' }"
+
+TestCase subclass:#Diff2Tests
+ instanceVariableNames:''
+ classVariableNames:''
+ poolDictionaries:''
+ category:'Collections-Sequenceable-Diff2'
+!
+
+!Diff2Tests class methodsFor:'documentation'!
+
+copyright
+"
+ COPYRIGHT (c) 2006 by eXept Software AG
+ All Rights Reserved
+
+ 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.
+"
+! !
+
+!Diff2Tests class methodsFor:'as yet unclassified'!
+
+isAbstract
+
+ ^super isAbstract or: [ self name = #Diff2Tests ]
+
+ "Modified: / 16-03-2012 / 20:11:02 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
+!Diff2Tests methodsFor:'as yet unclassified'!
+
+assertDiffWorksAsPatch: d
+ | p f2 |
+ p := d diff.
+ f2 := p applyTo: d file1.
+ self assert: f2 = d file2.
+
+ "Modified: / 16-03-2012 / 18:25:50 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+diffClass
+
+ self subclassResponsibility
+!
+
+sampleDiff: diffClass
+ ^ diffClass new
+ file1: #(The red brown fox jumped over the rolling log);
+ file2: #(The brown spotted fox leaped over the rolling log).
+!
+
+testComm
+ | c |
+ c := (self sampleDiff: self diffClass) comm.
+ self assert: c = {#common -> #(#The) . #different -> (#(#red) -> #()) . #common -> #(#brown) . #different -> (#() -> #(#spotted)) . #common -> #(#fox) . #different -> (#(#jumped) -> #(#leaped)) . #common -> #(#over #the #rolling #log)}.
+
+ "Created: / 16-03-2012 / 18:22:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+testCommPrefix
+ | c |
+ c := self diffClass new
+ file1: #(d e f a b c);
+ file2: #(a b c).
+ c := c comm.
+ self assert: c = {#different -> (#(d e f) -> #()) . #common -> #(a b c)}.
+
+ "Created: / 16-03-2012 / 18:23:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+testCommSuffix
+ | c |
+ c := self diffClass new
+ file1: #(a b c d e f);
+ file2: #(a b c).
+ c := c comm.
+ self assert: c = {#common -> #(a b c) . #different -> (#(d e f) -> #())}.
+
+ "Created: / 16-03-2012 / 18:23:30 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+testDiffIndices
+ | p |
+ p := (self sampleDiff: self diffClass) diffIndices.
+ self assert: p = {(Diff2::Chunk offset: 2 length: 1)->(Diff2::Chunk offset: 2 length: 0) . (Diff2::Chunk offset: 4 length: 0)->(Diff2::Chunk offset: 3 length: 1) . (Diff2::Chunk offset: 5 length: 1)->(Diff2::Chunk offset: 5 length: 1)}.
+
+ "Modified: / 16-03-2012 / 19:13:50 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+testDiffPatch
+ self assertDiffWorksAsPatch: (self sampleDiff: self diffClass).
+!
+
+testDiffSuffix
+ self assertDiffWorksAsPatch: (self diffClass new
+ file1: #(a b c d e f);
+ file2: #(a b c)).
+!
+
+testLcs
+ | lcs |
+ lcs := (self sampleDiff: self diffClass) longestCommonSubsequence asArray.
+ self assert: lcs = {1->1. 3->2. 4->4. 6->6. 7->7. 8->8. 9->9}.
+"({file1index:7, file2index:7, chain:{file1index:6, file2index:6, chain:{file1index:5, file2index:5, chain:{file1index:3, file2index:3, chain:{file1index:2, file2index:1, chain:{file1index:0, file2index:0, chain:{file1index:-1, file2index:-1, chain:null}}}}}}})"
+
+ "Modified: / 16-03-2012 / 18:26:13 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+testLcs2
+ "Test case due to Levente Uzonyi."
+ | lcs |
+ lcs := (self diffClass new
+ file1: 'acbcaca';
+ file2: 'bcbcacb';
+ longestCommonSubsequence) asArray.
+ self assert: lcs = {2->2. 3->3. 4->4. 5->5. 6->6}.
+
+ "Modified: / 16-03-2012 / 18:26:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+testLcs2a
+ "Same test as testLcs2, but with file1 and file2 switched."
+ | lcs |
+ lcs := (self diffClass new
+ file1: 'bcbcacb';
+ file2: 'acbcaca';
+ longestCommonSubsequence) asArray.
+ self assert: lcs = {2->2. 3->3. 4->4. 5->5. 6->6}.
+
+ "Modified: / 16-03-2012 / 18:26:22 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+testLcs2b
+ "Based on testLcs2."
+ | lcs |
+ lcs := (self diffClass new
+ file1: 'acba';
+ file2: 'bcbb';
+ longestCommonSubsequence) asArray.
+ self assert: lcs = {2->2. 3->3}.
+
+ "Modified: / 16-03-2012 / 18:26:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+testLcsHM
+ "Test case from Hunt & McIlroy 1976."
+ | lcs |
+ lcs := (self diffClass new
+ file1: 'abcabba';
+ file2: 'cbabac';
+ longestCommonSubsequence) asArray.
+ self assert: lcs = {3->1. 4->3. 5->4. 7->5}.
+
+ "Modified: / 16-03-2012 / 18:26:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+testLcsHMb
+ "Test case from Hunt & McIlroy 1976, reversed."
+ | lcs |
+ lcs := (self diffClass new
+ file1: 'cbabac';
+ file2: 'abcabba';
+ longestCommonSubsequence) asArray.
+ self assert: lcs = {2->2. 3->4. 4->5. 5->7}.
+
+ "Modified: / 16-03-2012 / 18:26:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
+!Diff2Tests methodsFor:'documentation'!
+
+copyright
+"
+ Copyright (c) 2007-2012 Tony Garnock-Jones
+
+ This code is based on Squeak's DiffMerge package
+ written by Tony Garnock-Jones. Original project's web site:
+
+ http://www.squeaksource.com/DiffMerge
+
+ Permission is hereby granted, free of charge, to any person
+ obtaining a copy of this software and associated documentation
+ files (the 'Software'), to deal in the Software without
+ restriction, including without limitation the rights to use,
+ copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following
+ conditions:
+
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ OTHER DEALINGS IN THE SOFTWARE.
+
+"
+! !
+
+!Diff2Tests class methodsFor:'documentation'!
+
+version_SVN
+ ^ '$Id: Diff2Tests.st 7929 2012-03-16 20:12:51Z vranyj1 $'
+! !
--- a/Diff2Tests_HuntMcilroy.st Fri Mar 16 19:58:31 2012 +0000
+++ b/Diff2Tests_HuntMcilroy.st Fri Mar 16 20:12:51 2012 +0000
@@ -29,16 +29,13 @@
"
"{ Package: 'stx:libtool' }"
-DiffTests subclass:#Diff2Tests_HuntMcilroy
+Diff2Tests subclass:#Diff2Tests_HuntMcilroy
instanceVariableNames:''
classVariableNames:''
poolDictionaries:''
category:'Collections-Sequenceable-Diff2'
!
-Diff2Tests_HuntMcilroy comment:''
-!
-
!Diff2Tests_HuntMcilroy class methodsFor:'documentation'!
copyright
@@ -86,5 +83,5 @@
!Diff2Tests_HuntMcilroy class methodsFor:'documentation'!
version_SVN
- ^ '$Id: Diff2Tests_HuntMcilroy.st 7927 2012-03-16 19:30:50Z vranyj1 $'
+ ^ '$Id: Diff2Tests_HuntMcilroy.st 7929 2012-03-16 20:12:51Z vranyj1 $'
! !
--- a/Diff2Tests_MyersUkkonen.st Fri Mar 16 19:58:31 2012 +0000
+++ b/Diff2Tests_MyersUkkonen.st Fri Mar 16 20:12:51 2012 +0000
@@ -29,16 +29,13 @@
"
"{ Package: 'stx:libtool' }"
-DiffTests subclass:#Diff2Tests_MyersUkkonen
+Diff2Tests subclass:#Diff2Tests_MyersUkkonen
instanceVariableNames:''
classVariableNames:''
poolDictionaries:''
category:'Collections-Sequenceable-Diff2'
!
-Diff2Tests_MyersUkkonen comment:''
-!
-
!Diff2Tests_MyersUkkonen class methodsFor:'documentation'!
copyright
@@ -86,5 +83,5 @@
!Diff2Tests_MyersUkkonen class methodsFor:'documentation'!
version_SVN
- ^ '$Id: Diff2Tests_MyersUkkonen.st 7927 2012-03-16 19:30:50Z vranyj1 $'
+ ^ '$Id: Diff2Tests_MyersUkkonen.st 7929 2012-03-16 20:12:51Z vranyj1 $'
! !
--- a/Diff3Tests.st Fri Mar 16 19:58:31 2012 +0000
+++ b/Diff3Tests.st Fri Mar 16 20:12:51 2012 +0000
@@ -36,9 +36,6 @@
category:'Collections-Sequenceable-Diff3'
!
-Diff3Tests comment:''
-!
-
!Diff3Tests class methodsFor:'documentation'!
copyright
@@ -205,5 +202,5 @@
!Diff3Tests class methodsFor:'documentation'!
version_SVN
- ^ '$Id: Diff3Tests.st 7927 2012-03-16 19:30:50Z vranyj1 $'
+ ^ '$Id: Diff3Tests.st 7929 2012-03-16 20:12:51Z vranyj1 $'
! !
--- a/DiffTests.st Fri Mar 16 19:58:31 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,225 +0,0 @@
-"
- COPYRIGHT (c) 2006 by eXept Software AG
- All Rights Reserved
-
- 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.
-"
-"{ Package: 'stx:libtool' }"
-
-TestCase subclass:#DiffTests
- instanceVariableNames:''
- classVariableNames:''
- poolDictionaries:''
- category:'Collections-Sequenceable-Diff2'
-!
-
-DiffTests comment:''
-!
-
-!DiffTests class methodsFor:'documentation'!
-
-copyright
-"
- COPYRIGHT (c) 2006 by eXept Software AG
- All Rights Reserved
-
- 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.
-"
-! !
-
-!DiffTests class methodsFor:'as yet unclassified'!
-
-isAbstract
-
- ^super isAbstract or: [ self name = #DiffTests ]
-! !
-
-!DiffTests methodsFor:'as yet unclassified'!
-
-assertDiffWorksAsPatch: d
- | p f2 |
- p := d diff.
- f2 := p applyTo: d file1.
- self assert: f2 = d file2.
-
- "Modified: / 16-03-2012 / 18:25:50 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-diffClass
-
- self subclassResponsibility
-!
-
-sampleDiff: diffClass
- ^ diffClass new
- file1: #(The red brown fox jumped over the rolling log);
- file2: #(The brown spotted fox leaped over the rolling log).
-!
-
-testComm
- | c |
- c := (self sampleDiff: self diffClass) comm.
- self assert: c = {#common -> #(#The) . #different -> (#(#red) -> #()) . #common -> #(#brown) . #different -> (#() -> #(#spotted)) . #common -> #(#fox) . #different -> (#(#jumped) -> #(#leaped)) . #common -> #(#over #the #rolling #log)}.
-
- "Created: / 16-03-2012 / 18:22:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-testCommPrefix
- | c |
- c := self diffClass new
- file1: #(d e f a b c);
- file2: #(a b c).
- c := c comm.
- self assert: c = {#different -> (#(d e f) -> #()) . #common -> #(a b c)}.
-
- "Created: / 16-03-2012 / 18:23:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-testCommSuffix
- | c |
- c := self diffClass new
- file1: #(a b c d e f);
- file2: #(a b c).
- c := c comm.
- self assert: c = {#common -> #(a b c) . #different -> (#(d e f) -> #())}.
-
- "Created: / 16-03-2012 / 18:23:30 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-testDiffIndices
- | p |
- p := (self sampleDiff: self diffClass) diffIndices.
- self assert: p = {(Diff2::Chunk offset: 2 length: 1)->(Diff2::Chunk offset: 2 length: 0) . (Diff2::Chunk offset: 4 length: 0)->(Diff2::Chunk offset: 3 length: 1) . (Diff2::Chunk offset: 5 length: 1)->(Diff2::Chunk offset: 5 length: 1)}.
-
- "Modified: / 16-03-2012 / 19:13:50 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-testDiffPatch
- self assertDiffWorksAsPatch: (self sampleDiff: self diffClass).
-!
-
-testDiffSuffix
- self assertDiffWorksAsPatch: (self diffClass new
- file1: #(a b c d e f);
- file2: #(a b c)).
-!
-
-testLcs
- | lcs |
- lcs := (self sampleDiff: self diffClass) longestCommonSubsequence asArray.
- self assert: lcs = {1->1. 3->2. 4->4. 6->6. 7->7. 8->8. 9->9}.
-"({file1index:7, file2index:7, chain:{file1index:6, file2index:6, chain:{file1index:5, file2index:5, chain:{file1index:3, file2index:3, chain:{file1index:2, file2index:1, chain:{file1index:0, file2index:0, chain:{file1index:-1, file2index:-1, chain:null}}}}}}})"
-
- "Modified: / 16-03-2012 / 18:26:13 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-testLcs2
- "Test case due to Levente Uzonyi."
- | lcs |
- lcs := (self diffClass new
- file1: 'acbcaca';
- file2: 'bcbcacb';
- longestCommonSubsequence) asArray.
- self assert: lcs = {2->2. 3->3. 4->4. 5->5. 6->6}.
-
- "Modified: / 16-03-2012 / 18:26:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-testLcs2a
- "Same test as testLcs2, but with file1 and file2 switched."
- | lcs |
- lcs := (self diffClass new
- file1: 'bcbcacb';
- file2: 'acbcaca';
- longestCommonSubsequence) asArray.
- self assert: lcs = {2->2. 3->3. 4->4. 5->5. 6->6}.
-
- "Modified: / 16-03-2012 / 18:26:22 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-testLcs2b
- "Based on testLcs2."
- | lcs |
- lcs := (self diffClass new
- file1: 'acba';
- file2: 'bcbb';
- longestCommonSubsequence) asArray.
- self assert: lcs = {2->2. 3->3}.
-
- "Modified: / 16-03-2012 / 18:26:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-testLcsHM
- "Test case from Hunt & McIlroy 1976."
- | lcs |
- lcs := (self diffClass new
- file1: 'abcabba';
- file2: 'cbabac';
- longestCommonSubsequence) asArray.
- self assert: lcs = {3->1. 4->3. 5->4. 7->5}.
-
- "Modified: / 16-03-2012 / 18:26:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
-testLcsHMb
- "Test case from Hunt & McIlroy 1976, reversed."
- | lcs |
- lcs := (self diffClass new
- file1: 'cbabac';
- file2: 'abcabba';
- longestCommonSubsequence) asArray.
- self assert: lcs = {2->2. 3->4. 4->5. 5->7}.
-
- "Modified: / 16-03-2012 / 18:26:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
-!DiffTests methodsFor:'documentation'!
-
-copyright
-"
- Copyright (c) 2007-2012 Tony Garnock-Jones
-
- This code is based on Squeak's DiffMerge package
- written by Tony Garnock-Jones. Original project's web site:
-
- http://www.squeaksource.com/DiffMerge
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the 'Software'), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
-
-"
-! !
-
-!DiffTests class methodsFor:'documentation'!
-
-version_SVN
- ^ '$Id: DiffTests.st 7927 2012-03-16 19:30:50Z vranyj1 $'
-! !
--- a/Make.proto Fri Mar 16 19:58:31 2012 +0000
+++ b/Make.proto Fri Mar 16 20:12:51 2012 +0000
@@ -1,7 +1,7 @@
# $Header$
#
# DO NOT EDIT
-# automagically generated from the projectDefinition: stx_libtool at 2012-03-16 19:27:55.300.
+# automagically generated from the projectDefinition: stx_libtool at 2012-03-16 20:12:16.774.
#
# Warning: once you modify this file, do not rerun
# stmkmp or projectDefinition-build again - otherwise, your changes are lost.
@@ -242,7 +242,7 @@
$(OUTDIR)NewLauncher.$(O) NewLauncher.$(H): NewLauncher.st $(INCLUDE_TOP)/stx/libtool/AbstractLauncherApplication.$(H) $(INCLUDE_TOP)/stx/libview2/ToolApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)OrderedCollectionInspectorView.$(O) OrderedCollectionInspectorView.$(H): OrderedCollectionInspectorView.st $(INCLUDE_TOP)/stx/libtool/InspectorView.$(H) $(INCLUDE_TOP)/stx/libview/SimpleView.$(H) $(INCLUDE_TOP)/stx/libview/DisplaySurface.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsMedium.$(H) $(INCLUDE_TOP)/stx/libview/DeviceGraphicsContext.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsContext.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)SetInspectorView.$(O) SetInspectorView.$(H): SetInspectorView.st $(INCLUDE_TOP)/stx/libtool/InspectorView.$(H) $(INCLUDE_TOP)/stx/libview/SimpleView.$(H) $(INCLUDE_TOP)/stx/libview/DisplaySurface.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsMedium.$(H) $(INCLUDE_TOP)/stx/libview/DeviceGraphicsContext.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsContext.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)SettingsDialog.$(O) SettingsDialog.$(H): SettingsDialog.st $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalList.$(H) $(INCLUDE_TOP)/stx/libbasic2/List.$(H) $(INCLUDE_TOP)/stx/libbasic/OrderedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItemWithLabelAndIcon.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItemWithLabel.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItem.$(H) $(INCLUDE_TOP)/stx/libtool/AbstractSettingsApplication.$(H) $(STCHDR)
+$(OUTDIR)SettingsDialog.$(O) SettingsDialog.$(H): SettingsDialog.st $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalList.$(H) $(INCLUDE_TOP)/stx/libbasic2/List.$(H) $(INCLUDE_TOP)/stx/libbasic/OrderedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libtool/AbstractSettingsApplication.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItemWithLabelAndIcon.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItemWithLabel.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItem.$(H) $(STCHDR)
$(OUTDIR)SmalltalkCodeGeneratorTool.$(O) SmalltalkCodeGeneratorTool.$(H): SmalltalkCodeGeneratorTool.st $(INCLUDE_TOP)/stx/libtool/CodeGeneratorTool.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)Tools__BackgroundSourceProcessingService.$(O) Tools__BackgroundSourceProcessingService.$(H): Tools__BackgroundSourceProcessingService.st $(INCLUDE_TOP)/stx/libtool/Tools__CodeViewService.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)Tools__BreakpointService.$(O) Tools__BreakpointService.$(H): Tools__BreakpointService.st $(INCLUDE_TOP)/stx/libtool/Tools__CodeViewService.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
--- a/Make.spec Fri Mar 16 19:58:31 2012 +0000
+++ b/Make.spec Fri Mar 16 20:12:51 2012 +0000
@@ -1,7 +1,7 @@
# $Header$
#
# DO NOT EDIT
-# automagically generated from the projectDefinition: stx_libtool at 2012-03-16 19:27:51.421.
+# automagically generated from the projectDefinition: stx_libtool at 2012-03-16 20:12:11.999.
#
# Warning: once you modify this file, do not rerun
# stmkmp or projectDefinition-build again - otherwise, your changes are lost.
--- a/abbrev.stc Fri Mar 16 19:58:31 2012 +0000
+++ b/abbrev.stc Fri Mar 16 20:12:51 2012 +0000
@@ -209,12 +209,12 @@
Tools::Diff3CodeView2 Tools__Diff3CodeView2 stx:libtool 'Interface-CodeView' 2
Tools::TextDiff2Tool Tools__TextDiff2Tool stx:libtool 'Interface-Diff' 1
Tools::TextDiff3Tool Tools__TextDiff3Tool stx:libtool 'Interface-Diff' 1
+Diff2Tests Diff2Tests stx:libtool 'Collections-Sequenceable-Diff2' 1
+Diff2Tests_HuntMcilroy Diff2Tests_HuntMcilroy stx:libtool 'Collections-Sequenceable-Diff2' 1
+Diff2Tests_MyersUkkonen Diff2Tests_MyersUkkonen stx:libtool 'Collections-Sequenceable-Diff2' 1
+Diff3Tests Diff3Tests stx:libtool 'Collections-Sequenceable-Diff3' 1
Diff2 Diff2 stx:libtool 'Collections-Sequenceable-Diff2' 0
Diff3 Diff3 stx:libtool 'Collections-Sequenceable-Diff3' 0
Diff3Hunk Diff3Hunk stx:libtool 'Collections-Sequenceable-Diff3' 0
Diff3InclusiveVisitor Diff3InclusiveVisitor stx:libtool 'Collections-Sequenceable-Diff3' 0
-Diff3Tests Diff3Tests stx:libtool 'Collections-Sequenceable-Diff3' 1
-DiffTests DiffTests stx:libtool 'Collections-Sequenceable-Diff2' 1
-Diff2Tests_HuntMcilroy Diff2Tests_HuntMcilroy stx:libtool 'Collections-Sequenceable-Diff2' 1
-Diff2Tests_MyersUkkonen Diff2Tests_MyersUkkonen stx:libtool 'Collections-Sequenceable-Diff2' 1
Diff3ExclusiveVisitor Diff3ExclusiveVisitor stx:libtool 'Collections-Sequenceable-Diff3' 0
--- a/bc.mak Fri Mar 16 19:58:31 2012 +0000
+++ b/bc.mak Fri Mar 16 20:12:51 2012 +0000
@@ -1,7 +1,7 @@
# $Header$
#
# DO NOT EDIT
-# automagically generated from the projectDefinition: stx_libtool at 2012-03-16 19:27:57.499.
+# automagically generated from the projectDefinition: stx_libtool at 2012-03-16 20:12:18.976.
#
# Warning: once you modify this file, do not rerun
# stmkmp or projectDefinition-build again - otherwise, your changes are lost.
@@ -184,7 +184,7 @@
$(OUTDIR)NewLauncher.$(O) NewLauncher.$(H): NewLauncher.st $(INCLUDE_TOP)\stx\libtool\AbstractLauncherApplication.$(H) $(INCLUDE_TOP)\stx\libview2\ToolApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)OrderedCollectionInspectorView.$(O) OrderedCollectionInspectorView.$(H): OrderedCollectionInspectorView.st $(INCLUDE_TOP)\stx\libtool\InspectorView.$(H) $(INCLUDE_TOP)\stx\libview\SimpleView.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsMedium.$(H) $(INCLUDE_TOP)\stx\libview\DeviceGraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsContext.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)SetInspectorView.$(O) SetInspectorView.$(H): SetInspectorView.st $(INCLUDE_TOP)\stx\libtool\InspectorView.$(H) $(INCLUDE_TOP)\stx\libview\SimpleView.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsMedium.$(H) $(INCLUDE_TOP)\stx\libview\DeviceGraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsContext.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)SettingsDialog.$(O) SettingsDialog.$(H): SettingsDialog.st $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalList.$(H) $(INCLUDE_TOP)\stx\libbasic2\List.$(H) $(INCLUDE_TOP)\stx\libbasic\OrderedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItemWithLabelAndIcon.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItemWithLabel.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItem.$(H) $(INCLUDE_TOP)\stx\libtool\AbstractSettingsApplication.$(H) $(STCHDR)
+$(OUTDIR)SettingsDialog.$(O) SettingsDialog.$(H): SettingsDialog.st $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalList.$(H) $(INCLUDE_TOP)\stx\libbasic2\List.$(H) $(INCLUDE_TOP)\stx\libbasic\OrderedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libtool\AbstractSettingsApplication.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItemWithLabelAndIcon.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItemWithLabel.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItem.$(H) $(STCHDR)
$(OUTDIR)SmalltalkCodeGeneratorTool.$(O) SmalltalkCodeGeneratorTool.$(H): SmalltalkCodeGeneratorTool.st $(INCLUDE_TOP)\stx\libtool\CodeGeneratorTool.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)Tools__BackgroundSourceProcessingService.$(O) Tools__BackgroundSourceProcessingService.$(H): Tools__BackgroundSourceProcessingService.st $(INCLUDE_TOP)\stx\libtool\Tools__CodeViewService.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)Tools__BreakpointService.$(O) Tools__BreakpointService.$(H): Tools__BreakpointService.st $(INCLUDE_TOP)\stx\libtool\Tools__CodeViewService.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
--- a/libtool.rc Fri Mar 16 19:58:31 2012 +0000
+++ b/libtool.rc Fri Mar 16 20:12:51 2012 +0000
@@ -25,7 +25,7 @@
VALUE "LegalCopyright", "Copyright Claus Gittinger 1988-2011\nCopyright eXept Software AG 1998-2011\0"
VALUE "ProductName", "Smalltalk/X\0"
VALUE "ProductVersion", "6.2.1.1\0"
- VALUE "ProductDate", "Fri, 16 Mar 2012 19:28:36 GMT\0"
+ VALUE "ProductDate", "Fri, 16 Mar 2012 20:12:34 GMT\0"
END
END