# HG changeset patch # User Gerald Klix (speedy) # Date 1723672223 -7200 # Wed Aug 14 23:50:23 2024 +0200 # Branch Cuis7.0based # Node ID c51a688fb59662f4e0f49023a32e63395c19b80a # Parent 14983566498b879e87e3727251ca1ea28aa1580b SUM: Made versioning work for the integrated version. diff --git a/Haverize.st b/Haverize.st --- a/Haverize.st +++ b/Haverize.st @@ -1,2 +1,7 @@ +| haverVersion | +haverVersion := 1. + Feature require: (DirectoryEntry currentDirectory / 'HaverOnCuis' / 'haver' // 'Haverize.pck.st' :: pathName). -HaverizePackage haverVersion: 1 +HaverizePackage + haverVersion: haverVersion; + saveAsNewHaverVersionWhenIntegrating diff --git a/haver/Haverize.pck.st b/haver/Haverize.pck.st --- a/haver/Haverize.pck.st +++ b/haver/Haverize.pck.st @@ -1,6 +1,6 @@ -'From Haver7.0 [latest update: #6454] on 14 August 2024 at 11:14:44 pm'! +'From Haver7.0 [latest update: #6454] on 14 August 2024 at 11:43:15 pm'! 'Description Convert the running Cuis image to an Haver image.'! -!provides: 'Haverize' 1 170! +!provides: 'Haverize' 1 171! SystemOrganization addCategory: #Haverize! @@ -270,7 +270,7 @@ morph is: #SystemWindow :: and: [ morph model isKindOf: Browser ] ] :: do: [ :browserWindow | browserWindow delete ] ]! ! -!HaverizePackage class methodsFor: 'installing' stamp: 'KLG 4/4/2024 11:42:55'! +!HaverizePackage class methodsFor: 'installing' stamp: 'KLG 8/14/2024 23:42:46'! postPackageInstall "This gets called after installing all the package code. Redefine as appropriate" @@ -282,13 +282,7 @@ world backgroundImageData: nil ]. Modules >> #HaverThemes >> #HaverDarkPhisherBryceTheme :: beCurrent. self ensureHaverPreferences. - Character initializeAsciArtCharactersMap. - self shouldIntegrate ifTrue: [ - StdIOWriteStream stdout - nextPutAll: ' image created!!'; - newLine; - flush. - Smalltalk saveAsNewIntegratedHaverVersion ]! ! + Character initializeAsciArtCharactersMap.! ! !HaverizePackage class methodsFor: 'installing' stamp: 'KLG 9/7/2023 15:30:41'! prePackageInstall @@ -306,6 +300,20 @@ ChangeSet installNewUpdates ! ! +!HaverizePackage class methodsFor: 'installing' stamp: 'KLG 8/14/2024 23:42:23'! +saveAsNewHaverVersionWhenIntegrating + "Save the Image as new Haver version and quit. + + Only do this when integrating. + This methods is meant to be called by teh Haverize script." + + ^ self shouldIntegrate ifTrue: [ + StdIOWriteStream stdout + nextPutAll: ' image created!!'; + newLine; + flush. + Smalltalk saveAsNewIntegratedHaverVersion ]! ! + !HaverizePackage class methodsFor: 'installing' stamp: 'KLG 5/29/2022 15:02:51'! shouldIntegrate "Answer true if we should integrate Haver."