M haver/Haverize.pck.st +4 -4
@@ 1,6 1,6 @@
-'From Haver 6.0 [latest update: #6091] on 23 November 2023 at 6:47:08 pm'!
+'From Haver 6.0 [latest update: #6092] on 24 November 2023 at 7:44:18 am'!
'Description Convert the running Cuis image to an Haver image.'!
-!provides: 'Haverize' 1 137!
+!provides: 'Haverize' 1 138!
SystemOrganization addCategory: #Haverize!
@@ 706,11 706,11 @@ haverBaseNameForIntegratedVersion: aSyst
^ self baseNameForVersion: aSystemVersion distributionPrefix: 'Haver' distributionSuffix: ''! !
-!SystemDictionary methodsFor: '*Haverize-image, changes name' stamp: 'KLG 11/23/2023 18:34:42'!
+!SystemDictionary methodsFor: '*Haverize-image, changes name' stamp: 'KLG 11/24/2023 07:44:03'!
haverBaseNameForVersion: aSystemVersion
"Answer a new haver base name for a system version."
- ^ self baseNameForVersion: aSystemVersion distributionPrefix: 'Haver' distributionSuffix: ''! !
+ ^ self baseNameForVersion: aSystemVersion distributionPrefix: 'Haver' distributionSuffix: '-dev'! !
!SystemDictionary methodsFor: '*Haverize-snapshot and quit' stamp: 'KLG 3/6/2023 10:48:48'!
saveAsNewHaverVersion
M haver/packaging/Distributor.pck.st +14 -14
@@ 1,6 1,6 @@
-'From Haver 6.0 [latest update: #6091] on 23 November 2023 at 6:17:51 pm'!
+'From Haver 6.0 [latest update: #6092] on 24 November 2023 at 7:56:01 am'!
'Description '!
-!provides: 'Distributor' 1 37!
+!provides: 'Distributor' 1 38!
!requires: 'FileFinder' 1 21 nil!
!requires: 'Compression' 1 30 nil!
SystemOrganization addCategory: #Distributor!
@@ 12,8 12,8 @@ Modules newEnvironment: #Distributor!
!interfacesOf: Distributor!
Modules environment: #Distributor ::
- interface: #SPI aliasFor: #API ::
- interface: #UTI aliasFor: #API!
+ interface: #UTI aliasFor: #API ::
+ interface: #SPI aliasFor: #API!
!importsOf: Distributor!
Modules environment: #Distributor ::
@@ 228,15 228,15 @@ addStartScriptFor: anImageFilename toArc
self addStartScriptFor: anImageFilename cuisImageFilename: nil toArchive: aZipArchive! !
-!(Modules>>#Distributor>>#ZipFileDistributor) methodsFor: 'distribution' stamp: 'KLG 4/22/2022 10:45:44'!
+!(Modules>>#Distributor>>#ZipFileDistributor) methodsFor: 'distribution' stamp: 'KLG 11/24/2023 07:51:06'!
distribute
"Distribute the haver stuff."
| zipArchive licenseFileString imageFilenames cuisImageFileName haverImageSeen |
- imageFilenames _ OrderedCollection new: 2.
- (zipArchive _ ZipArchive new) zipFileComment: 'Haver on Cuis'.
- haverImageSeen _ false.
- licenseFileString _ String streamContents: [ :licenseTextsStream |
+ imageFilenames := OrderedCollection new: 2.
+ (zipArchive := ZipArchive new) zipFileComment: 'Haver on Cuis'.
+ haverImageSeen := false.
+ licenseFileString := String streamContents: [ :licenseTextsStream |
licenseTextsStream
nextPutAll: 'LICENSES';
newLine; newLine;
@@ 244,10 244,10 @@ distribute
newLine; newLine; newLine.
filefinder bundlesDo: [ :fileBundle |
fileBundle isImage ifTrue:[ | dfn |
- (dfn _ fileBundle distributionFilename) includesSubString: 'Cuis' :: ifTrue: [
- cuisImageFileName _ dfn ].
+ (dfn := fileBundle distributionFilename) includesSubString: 'Cuis' :: ifTrue: [
+ cuisImageFileName := dfn ].
dfn includesSubString: 'Haver' :: ifTrue: [
- haverImageSeen _ true ].
+ haverImageSeen := true ].
imageFilenames add: dfn ].
fileBundle isLicenseFile
ifTrue: [
@@ 277,9 277,9 @@ distribute
haverImageSeen ifFalse: [ | haverImageFilename |
self flagHaver: 'Move this stuff to the HaverImageFileFinder!!'.
"This is a bit hack, because it duplicates information from the file finder:"
- haverImageFilename _ 'Image',
+ haverImageFilename := 'Image',
FileIOAccessor default pathNameDelimiter asString,
- Smalltalk haverBaseNameForCurrentVersion,
+ Smalltalk haverBaseNameForIntegratedCurrentVersion,
'.image'.
self
addStartScriptFor: haverImageFilename