[etoys-dev] Etoys: System-bf.7.mcz

[commits at source.squeak.org]

Bert Freudenberg uploaded a new version of System to project Etoys:
http://source.squeak.org/etoys/System-bf.7.mcz

==================== Summary ====================

Name: System-bf.7
Author: bf
Time: 3 May 2010, 11:55:28 am
UUID: 77ce1a2f-9563-4960-acdb-e0531dec9d42
Ancestors: System-kfr.6

- report repository version in system version string

=============== Diff against System-kfr.6 ===============

Item was added:
+ ----- Method: SystemVersion>>repositoryDate: (in category 'accessing') -----
+ repositoryDate: aDate
+ 	repositoryDate := aDate
+ !

Item was added:
+ ----- Method: SystemVersion>>repositoryVersion: (in category 'accessing') -----
+ repositoryVersion: anInteger
+ 	repositoryVersion := anInteger
+ !

Item was added:
+ ----- Method: SystemVersion>>repositoryDate (in category 'accessing') -----
+ repositoryDate
+ 	^repositoryDate ifNil: [self date]!

Item was added:
+ ----- Method: SystemVersion>>repositoryVersion (in category 'accessing') -----
+ repositoryVersion
+ 	^repositoryVersion ifNil: [0]!

Item was changed:
  ----- Method: Utilities class>>updateFromDefaultRepository (in category 'fetching updates') -----
  updateFromDefaultRepository
+ 	| config |
  	"Flush all caches. If a previous download failed this is often helpful"
- 	| config numberAndDate |
  	MCFileBasedRepository flushAllCaches.
  	config := MCMcmUpdater updateFromDefaultRepository.
  	config ifNil: [^self inform: 'Repository unavailable' translated].
+ 	self setSystemVersionFromConfig: config.
- 	numberAndDate := self versionNumberAndDateFromConfig: config.
- "	self setSystemVersionFromConfig: config.		-- Etoys uses update stream number"
  	self inform: ('Update completed.
+ System version is now:
+ {1}' translated format: {SystemVersion current asString}).
- Repository version {1} ({2})' translated format: numberAndDate).
  !

Item was changed:
  Object subclass: #SystemVersion
+ 	instanceVariableNames: 'version date highestUpdate updates repositoryVersion repositoryDate'
- 	instanceVariableNames: 'version date highestUpdate updates'
  	classVariableNames: 'Current'
  	poolDictionaries: ''
  	category: 'System-Support'!

Item was changed:
  ----- Method: SmalltalkImage>>systemInformationString (in category 'sources, changes log') -----
  systemInformationString
  	"Identify software version"
+ 	^ SystemVersion current version, String cr, self lastUpdateString!
- 	^ SystemVersion current version, String cr, self lastUpdateString, String cr, self currentChangeSetString
- 
- "
- 	(eToySystem _ self at: #EToySystem ifAbsent: [nil]) ifNotNil:
- 		[aString _ aString, '
- Squeak-Central version: ', eToySystem version, ' of ', eToySystem versionDate]."!

Item was changed:
  ----- Method: SystemVersion>>printOn: (in category 'printing') -----
  printOn: stream
  	stream
  		nextPutAll: self datedVersion;
+ 		nextPutAll: ' update ' ;
+ 		print: self highestUpdate.
+ 	self repositoryVersion > 0 ifTrue: [
+ 		stream
+ 			nextPutAll: ' (';
+ 			nextPutAll: self repositoryString;
+ 			nextPut: $)]!
- 		nextPutAll: ' update ' , self highestUpdate printString!

Item was changed:
  ----- Method: SmalltalkImage>>lastUpdateString (in category 'sources, changes log') -----
  lastUpdateString
  	"SmalltalkImage current lastUpdateString"
+ 	| update |
+ 	update := 'latest update: #' translated, SystemVersion current highestUpdate printString.
+ 	 SystemVersion current repositoryVersion > 0 ifTrue: [
+ 		update := update, ' (', SystemVersion current repositoryString, ')']. 
+ 	^update!
- 	^'latest update: #' translated, SystemVersion current highestUpdate printString!

Item was changed:
  ----- Method: Utilities class>>setSystemVersionFromConfig: (in category 'fetching updates') -----
  setSystemVersionFromConfig: anMCConfiguration
  	"Set the current system version date to the latest date found in anMCConfiguration (or the associated working copy). Also set the highest update number to the sum of version numbers in the config."
  
  	| numberAndDate |
  	numberAndDate := self versionNumberAndDateFromConfig: anMCConfiguration.
  	SystemVersion current
+ 		repositoryVersion: numberAndDate first;
+ 		repositoryDate: numberAndDate second.
- 		highestUpdate: numberAndDate first;
- 		date: numberAndDate second.
  	^numberAndDate!

Item was added:
+ ----- Method: SystemVersion>>repositoryString (in category 'accessing') -----
+ repositoryString
+ 	^self repositoryVersion > 0
+ 		ifFalse: ['']
+ 		ifTrue: [
+ 			'repo v', self repositoryVersion asString,
+ 			' of ', self repositoryDate asString]!