--- a/Smalltalk.st Fri Nov 23 17:35:50 2012 +0100
+++ b/Smalltalk.st Fri Nov 23 18:44:05 2012 +0100
@@ -7661,9 +7661,15 @@
their way to the outside world.
ST/X revision Naming is:
- <major>.<minor>.<revision>.<release>"
-
- ^ 1
+ <major>.<minor>.<revision>.<release>"
+
+ |releaseNumber|
+
+ releaseNumber := Smalltalk versionBuildNumber.
+ releaseNumber isEmpty ifTrue:[
+ ^ 0.
+ ].
+ ^ releaseNumber
"
Smalltalk releaseNr
@@ -7725,6 +7731,24 @@
)
!
+versionBuildNumber
+ "{ Pragma: +optSpace }"
+
+ "return the executables build number - that's the jenkins build #.
+ Empty if not built by jenkins"
+
+%{ /* NOCONTEXT */
+ extern char *__getBuildNumberString();
+
+ RETURN (__MKSTRING(__getBuildNumberString() COMMA_SND) );
+%}.
+ ^ ''
+
+ "
+ Smalltalk versionBuildNumber
+ "
+!
+
versionDate
"{ Pragma: +optSpace }"
@@ -7743,24 +7767,6 @@
"
!
-versionBuildNumber
- "{ Pragma: +optSpace }"
-
- "return the executables build number - that's the jenkins build #.
- Empty if not built by jenkins"
-
-%{ /* NOCONTEXT */
- extern char *__getBuildNumberString();
-
- RETURN (__MKSTRING(__getBuildNumberString() COMMA_SND) );
-%}.
- ^ ''
-
- "
- Smalltalk versionBuildNumber
- "
-!
-
versionString
"{ Pragma: +optSpace }"
@@ -7770,7 +7776,9 @@
'.',
self minorVersionNr printString ,
'.',
- self revisionNr printString)
+ self revisionNr printString,
+ '.',
+ self releaseNr printString)
"
@@ -7795,11 +7803,11 @@
!Smalltalk class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/Smalltalk.st,v 1.999 2012-11-21 18:57:52 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/Smalltalk.st,v 1.1000 2012-11-23 17:44:05 stefan Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libbasic/Smalltalk.st,v 1.999 2012-11-21 18:57:52 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/Smalltalk.st,v 1.1000 2012-11-23 17:44:05 stefan Exp $'
!
version_SVN