[DEVELOPMENT ENVIRONMENT]

* NEW: Better trust the interpreter instead of the compiler for getting the 
  full version with the SVN revision.
* NEW: Do not display the SVN revision anymore in the welcome dialog. Only 
  in the system information.


git-svn-id: svn://localhost/gambas/trunk@7250 867c0c6c-44f3-4631-809d-bfa615b0a4ec
This commit is contained in:
Benoît Minisini 2015-08-29 23:50:50 +00:00
parent 1d3f035c38
commit 28267f5cde
3 changed files with 4 additions and 18 deletions

View file

@ -384,22 +384,9 @@ Private Sub InitVersion()
aVer.Remove(aVer.Max)
Version = aVer.Join(".")
FullVersionWithRevision = FullVersion
If FullVersionWithRevision Ends ".0" Then
FullVersionWithRevision = Left$(FullVersionWithRevision, -2)
Endif
' sVer = VersionControl.GetVersion(File.Dir(File.Dir(File.Dir(Application.Path))))
' getting whole Version infos from the Compiler, it knows about the real used revision, if any
Exec [System.Path &/ "bin/gbc" & System.Version, "-V"] To sVer
sVer = Replace(sVer, gb.NewLine, Null)
aVer = Split(sVer, " ")
sVer = Trim(aVer[aVer.Max])
If sVer And sVer <> FullVersion Then
'Version &= " (r" & sVer & ")"
FullVersionWithRevision &= " (" & sVer & ")"
Endif
Exec [System.Path &/ "bin/gbx" & System.Version, "-V"] To sVer
FullVersionWithRevision = Trim(sVer)
If FullVersionWithRevision Ends ".0" Then FullVersionWithRevision = Left$(FullVersionWithRevision, -2)
Catch

View file

@ -72,7 +72,7 @@ Public Sub dwgWelcome_Draw()
Paint.Begin($hText)
Paint.Font = Font["+10,Bold"]
Y = Paint.Font.Ascent
X = PaintText("Gambas " & Project.FullVersionWithRevision, 8, Y, Color.White) 'TEXT_COLOR)
X = PaintText("Gambas " & Project.FullVersion, 8, Y, Color.White) 'TEXT_COLOR)
'Paint.Font = Font["+12,Bold"]
'PaintText(Project.FullVersionWithRevision, X + 8, Paint.Font.Ascent, Color.White) 'Color.SelectedForeground)

View file

@ -104,7 +104,6 @@ Static Public Sub GetInfo() As String[]
Dim aEnv As String[]
aText.Add("[System]")
' aText.Add("Gambas=" & System.FullVersion)
' getting Version: set to FullVersionWithRevision at Project.initVersion
aText.Add("Gambas=" & Project.FullVersionWithRevision)