Changeset cfaad89 in tol

Timestamp:

Dec 5, 2016, 11:49:55 AM (10 years ago)

Author:

Pedro Gea <pgea@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

0614f30

Parents:

cc45a10

Message:

Refs #1938
Se generaliza la versión en los archivos de recursos .rc.
Se crean variables en tcl con las versiones de tolsh y tolbase.
Se simplifica el icono de tolbase en el caso GNU.
Se modifica el título de la aplicación para indicar versión y si es de 32-bits o de 64-bits.

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@7368 be4846ae-f051-483a-831f-b64e7d08527f

Files:

• tolbase/generic/tolbase-gnu.rc (modified) (5 diffs)
• tolbase/generic/tolbase-msvc.rc (modified) (5 diffs)
• tolbase/lib/pkgIndex.tcl.in (modified) (1 diff)
• tolbase/lib/toltk/project.tcl (modified) (2 diffs)
• tolbase/lib/toltk/tolbase.tcl (modified) (1 diff)
• toltcl/library/pkgIndex.tcl.in (modified) (1 diff)

tolbase/generic/tolbase-gnu.rc

@@ -3 +3 @@
 
 // Icon resources
-1 ICON "../lib/toltk/images/tolbase-gnu.ico"
+1 ICON "../lib/toltk/images/tolbase.ico"
 
 // Version Information resources
 1 VERSIONINFO
-    FILEVERSION     3,2,0,0
-    PRODUCTVERSION  3,2,0,0
+    FILEVERSION     3,0,0,0
+    PRODUCTVERSION  3,0,0,0
     FILEOS          VOS__WINDOWS32
     FILETYPE        VFT_APP
@@ -22 +22 @@
             VALUE "CompanyName", "Bayes Forecast"
             VALUE "FileDescription", "TOLBase (GNU)"
-            VALUE "FileVersion", "3.2.0.0"
+            VALUE "FileVersion", "3.0.0.0"
             VALUE "InternalName", "tolbase"
             VALUE "LegalCopyright", "GPL-3"
@@ -29 +29 @@
             VALUE "PrivateBuild", ""
             VALUE "ProductName", "TOLBase"
-            VALUE "ProductVersion", "3.2.0.0"
+            VALUE "ProductVersion", "3.0.0.0"
             VALUE "SpecialBuild", ""
         }
@@ -36 +36 @@
             VALUE "Comments", ""
             VALUE "CompanyName", "Bayes Forecast"
-            VALUE "FileDescription", "TOLBase (GNU)"
-            VALUE "FileVersion", "3.2.0.0"
+            VALUE "FileDescription", "TOLBase"
+            VALUE "FileVersion", "3.0.0.0"
             VALUE "InternalName", "tolbase"
             VALUE "LegalCopyright", "GPL-3"
@@ -44 +44 @@
             VALUE "PrivateBuild", ""
             VALUE "ProductName", "TOLBase"
-            VALUE "ProductVersion", "3.2.0.0"
+            VALUE "ProductVersion", "3.0.0.0"
             VALUE "SpecialBuild", ""
         }

tolbase/generic/tolbase-msvc.rc

@@ -3 +3 @@
 
 // Icon resources
-1 ICON "../lib/toltk/images/tolbase-gnu.ico"
+1 ICON "../lib/toltk/images/tolbase-msvc.ico"
 
 // Version Information resources
 1 VERSIONINFO
-    FILEVERSION     3,2,0,0
-    PRODUCTVERSION  3,2,0,0
+    FILEVERSION     3,0,0,0
+    PRODUCTVERSION  3,0,0,0
     FILEOS          VOS__WINDOWS32
     FILETYPE        VFT_APP
@@ -22 +22 @@
             VALUE "CompanyName", "Bayes Forecast"
             VALUE "FileDescription", "TOLBase (MSVC)"
-            VALUE "FileVersion", "3.2.0.0"
+            VALUE "FileVersion", "3.0.0.0"
             VALUE "InternalName", "tolbase"
             VALUE "LegalCopyright", "GPL-3"
@@ -29 +29 @@
             VALUE "PrivateBuild", ""
             VALUE "ProductName", "TOLBase"
-            VALUE "ProductVersion", "3.2.0.0"
+            VALUE "ProductVersion", "3.0.0.0"
             VALUE "SpecialBuild", ""
         }
@@ -37 +37 @@
             VALUE "CompanyName", "Bayes Forecast"
             VALUE "FileDescription", "TOLBase (MSVC)"
-            VALUE "FileVersion", "3.2.0.0"
+            VALUE "FileVersion", "3.0.0.0"
             VALUE "InternalName", "tolbase"
             VALUE "LegalCopyright", "GPL-3"
@@ -44 +44 @@
             VALUE "PrivateBuild", ""
             VALUE "ProductName", "TOLBase"
-            VALUE "ProductVersion", "3.2.0.0"
+            VALUE "ProductVersion", "3.0.0.0"
             VALUE "SpecialBuild", ""
         }

tolbase/lib/pkgIndex.tcl.in

@@ -4 +4 @@
     [ string map [list %d $dir] {
       lappend auto_path {%d}
+      set tolbase_version @TOLBASE_VERSION_MAJOR@.@TOLBASE_VERSION_MINOR@
       source [ file join {%d} toltk init_toltk.tcl ]
       package provide TolbaseApp @TOLBASE_VERSION_MAJOR@.@TOLBASE_VERSION_MINOR@

tolbase/lib/toltk/project.tcl

@@ -134 +134 @@
     array set tol_platform [lindex [toltcl::eval {PlatformInfo(?)} -named 1] 1]
     if {$tol_platform(CompilerID) eq "GNU"} {
-      set prjtitle "TOLBase (GNU)"
+      if {$tol_platform(PointerSize) eq "4"} {
+        set prjtitle "TOLBase $::tolbase_version (32-bits)"
+      } elseif {$tol_platform(PointerSize) eq "8"} {
+        set prjtitle "TOLBase $::tolbase_version (64-bits)"      
+      } else {
+        set prjtitle "TOLBase (GNU)"      
+      }
     } elseif {$tol_platform(CompilerID) eq "MSVC"} {
       set prjtitle "TOLBase (MSVC)"
@@ -223 +229 @@
     # tol platform selection
     array set tol_platform [lindex [toltcl::eval {PlatformInfo(?)} -named 1] 1]
-    if {$tol_platform(CompilerID) eq "GNU"} {
-      wm iconbitmap . -default [file join $toltk_images_path tolbase-gnu.ico]
-    } elseif {$tol_platform(CompilerID) eq "MSVC"} {
+    if {$tol_platform(CompilerID) eq "MSVC"} {
       wm iconbitmap . -default [file join $toltk_images_path tolbase-msvc.ico]
     } else {

tolbase/lib/toltk/tolbase.tcl

@@ -1339 +1339 @@
   # tol platform selection
   array set tol_platform [lindex [toltcl::eval {PlatformInfo(?)} -named 1] 1]
-  if {$tol_platform(CompilerID) eq "GNU"} {
-    set imgfile [file join $toltk_library toltk images splash-gnu.gif]
-  } elseif {$tol_platform(CompilerID) eq "MSVC"} {
+  if {$tol_platform(CompilerID) eq "MSVC"} {
     set imgfile [file join $toltk_library toltk images splash-msvc.gif]
   } else {

toltcl/library/pkgIndex.tcl.in

@@ -28 +28 @@
     [ string map [list %d $dir] {
       source [ file join {%d} tolsh.tcl ]
+      set tolsh_version @TOLTCL_VERSION_MAJOR@.@TOLTCL_VERSION_MINOR@
       package provide TolshApp @TOLTCL_VERSION_MAJOR@.@TOLTCL_VERSION_MINOR@      
     } ]