20321 add build number to system version

Jenkinsfile

@@ -30,11 +30,11 @@ node('unix') {
 		stage ("Bootstrap-${architecture}") {
 			shell "mkdir -p bootstrap-cache #required to generate hermes files"
 			shell "./pharo Pharo.image ./bootstrap/scripts/generateHermesFiles.st --quit"
-			shell "./pharo ./Pharo.image bootstrap/scripts/bootstrap.st --ARCH=${architecture} --quit"
+			shell "./pharo ./Pharo.image bootstrap/scripts/bootstrap.st --ARCH=${architecture} --BUILD_NUMBER=${env.BUILD_ID} --quit"
 	    }
 
 		stage ("Full Image-${architecture}") {
-			shell "BOOTSTRAP_ARCH=${architecture} bash ./bootstrap/scripts/build.sh -a ${architecture}"
+			shell "BUILD_NUMBER=${BUILD_NUMBER} BOOTSTRAP_ARCH=${architecture} bash ./bootstrap/scripts/build.sh -a ${architecture}"
 			stash includes: "bootstrap-cache/*.zip,bootstrap-cache/*.sources,bootstrap/scripts/**", name: "bootstrap${architecture}"
 	    }
 

bootstrap/scripts/bootstrap.sh

@@ -5,6 +5,6 @@ unzip bootstrapImage.zip
 ./pharo Pharo.image ./bootstrap/scripts/prepare_image.st --save --quit
 mkdir -p bootstrap-cache #required to generate hermes files
 ./pharo Pharo.image ./bootstrap/scripts/generateHermesFiles.st --quit
-./pharo Pharo.image ./bootstrap/scripts/bootstrap.st --ARCH=${BOOTSTRAP_ARCH} --quit
+./pharo Pharo.image ./bootstrap/scripts/bootstrap.st --ARCH=${BOOTSTRAP_ARCH} --BUILD_NUMBER=${BUILD_NUMBER} --quit
 
 bash ./bootstrap/scripts/build.sh

bootstrap/scripts/bootstrap.st

@@ -3,6 +3,7 @@
 
 options := CommandLineArguments default.
 architecture := options optionAt: 'ARCH' ifAbsent: [ '32' ].
+buildNumber := options optionAt: 'BUILD_NUMBER' ifAbsent: [ 'NO_CI' ].
 
 "Configure logging"
 (CustomStringStreamBeacon with: FileStream stdout)
@@ -14,6 +15,7 @@ FileStream stdout
 
 
 (PBBootstrap forArchitecture: architecture)
+	buildNumber: buildNumber;
 	prepareBootstrap;
 	createImage
 

bootstrap/src/Pharo30Bootstrap.package/PBBootstrap.class/instance/buildNumber..st

@@ -0,0 +1,4 @@
+accessing
+buildNumber: aBuildNumber
+
+	buildNumber := aBuildNumber

bootstrap/src/Pharo30Bootstrap.package/PBBootstrap.class/instance/buildNumber.st

@@ -0,0 +1,4 @@
+accessing
+buildNumber
+
+	^ buildNumber

bootstrap/src/Pharo30Bootstrap.package/PBBootstrap.class/instance/createImage.st

@@ -3,5 +3,6 @@ createImage
 
 	(PBImageBuilderSpur50 forArchitecture: architecture)
 		gitRepositoryUrl: 'git@github.com:pharo-project/pharo.git' location: '.' subdirectory: 'src';
-	 	imageFileReference: imageReference;  
+	 	imageFileReference: imageReference;
+		buildNumber: self buildNumber;
 		bootstrap.

bootstrap/src/Pharo30Bootstrap.package/PBBootstrap.class/properties.json

@@ -8,7 +8,8 @@
 	"instvars" : [
 		"architecture",
 		"kernelPackageNames",
-		"imageReference"
+		"imageReference",
+		"buildNumber"
 	],
 	"name" : "PBBootstrap",
 	"type" : "normal"

bootstrap/src/Pharo30Bootstrap.package/PBImageBuilder50.class/instance/buildNumber..st

@@ -0,0 +1,4 @@
+accessing
+buildNumber: aNumber
+
+	buildNumber := aNumber

bootstrap/src/Pharo30Bootstrap.package/PBImageBuilder50.class/instance/buildNumber.st

@@ -0,0 +1,4 @@
+accessing
+buildNumber
+
+	^ buildNumber

bootstrap/src/Pharo30Bootstrap.package/PBImageBuilder50.class/instance/initializeImage.st

@@ -25,13 +25,14 @@ initializeImage
 					type: ''Pharo'';
 					major: {major};
 					minor: {minor};
-					suffix: ''SNAPSHOT'';
-					commitHash: ''{update}'';
+					suffix: ''alpha.build.{build}.sha.{hash}'';
+					commitHash: ''{hash}'';
 					yourself).
 	PharoBootstrapInitialization initializeCommandLineHandlerAndErrorHandling' format: {
 		'major' -> definitionFetcher majorVersion asString.
 		'minor' -> definitionFetcher minorVersion asString.
-		'update' -> definitionFetcher commitHash asString.
+		'build' -> self buildNumber asString.
+		'hash' -> definitionFetcher commitHash asString.
 	} asDictionary).
  	objectSpace installAsActiveProcess: process.
 

bootstrap/src/Pharo30Bootstrap.package/PBImageBuilder50.class/properties.json

@@ -15,7 +15,8 @@
 		"definitionFetcher",
 		"statistics",
 		"logger",
-		"imageFileReference"
+		"imageFileReference",
+		"buildNumber"
 	],
 	"name" : "PBImageBuilder50",
 	"type" : "normal"

src/System-Support.package/SmalltalkImage.class/instance/lastUpdateString.st

@@ -1,4 +1,4 @@
 sources, change log
 lastUpdateString
 	"SmalltalkImage current lastUpdateString"
-	^'Latest update: #', SystemVersion current highestUpdate printString
+	^'Build information: ', SystemVersion current suffix asString

src/System-Support.package/SystemVersion.class/instance/highestUpdate.st

@@ -1,11 +1,4 @@
 accessing
 highestUpdate
 	"Returns the highest number of available updates"
-
-	| sortedUpdates |
-	highestUpdate ifNil: [
-		sortedUpdates := self updates asSortedCollection.
-		highestUpdate := (sortedUpdates isEmpty
-			ifTrue: [0]
-			ifFalse: [sortedUpdates last])].
 	^highestUpdate

src/System-Support.package/SystemVersion.class/instance/initialize.st

@@ -1,5 +1,4 @@
 initialization
 initialize
 	super initialize.
-	date := Date today.
-	updates := Set new.
+	date := Date today.

src/System-Support.package/SystemVersion.class/instance/majorMinor..st

@@ -3,8 +3,7 @@ majorMinor: aSeparatingString
 	"Return the major/minor version number of the form XaSeparatingStringY, without any 'alpha' or 'beta' or other suffix. If the receiver needs upgrading, do it. Remove the guard in 1.3."
 	"SystemVersion current majorMinor: '-'"
 	"SystemVersion current majorMinor: ''"
-
-	self upgrade.
+
 	^String streamContents: [:str |
 		str 
 			nextPutAll: self major printString; 

src/System-Support.package/SystemVersion.class/instance/printOn..st

@@ -1,6 +1,3 @@
 printing
 printOn: stream
-	stream
-		nextPutAll: self datedVersion;
-		nextPutAll: ' update ';
-		nextPutAll: self highestUpdate printString
+	stream nextPutAll: self imageVersionString

src/System-Support.package/SystemVersion.class/properties.json

@@ -11,7 +11,6 @@
 		"version",
 		"date",
 		"highestUpdate",
-		"updates",
 		"type",
 		"major",
 		"minor",