From 28267f5cdee8fb860a0eddbf5fdee5f3faeb2b50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Minisini?= <gambas@users.sourceforge.net>
Date: Sat, 29 Aug 2015 23:50:50 +0000
Subject: [PATCH] [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
---
 app/src/gambas3/.src/Project.module           | 19 +++----------------
 app/src/gambas3/.src/Welcome/CWelcome.class   |  2 +-
 .../gambas3/.src/Welcome/FSystemInfo.class    |  1 -
 3 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/app/src/gambas3/.src/Project.module b/app/src/gambas3/.src/Project.module
index 13a343cd3..f6c3308b3 100644
--- a/app/src/gambas3/.src/Project.module
+++ b/app/src/gambas3/.src/Project.module
@@ -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
 
diff --git a/app/src/gambas3/.src/Welcome/CWelcome.class b/app/src/gambas3/.src/Welcome/CWelcome.class
index 21b9e4502..4ea5fd7e9 100644
--- a/app/src/gambas3/.src/Welcome/CWelcome.class
+++ b/app/src/gambas3/.src/Welcome/CWelcome.class
@@ -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)
     
diff --git a/app/src/gambas3/.src/Welcome/FSystemInfo.class b/app/src/gambas3/.src/Welcome/FSystemInfo.class
index c6127a91d..36a87a7f3 100644
--- a/app/src/gambas3/.src/Welcome/FSystemInfo.class
+++ b/app/src/gambas3/.src/Welcome/FSystemInfo.class
@@ -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)