From 018aeac4d8004ec1f58b742a59e048ff8af6e703 Mon Sep 17 00:00:00 2001 From: Ferdi Franceschini Date: Thu, 14 Jan 2010 09:31:03 +1100 Subject: [PATCH] Put all cvs keyword references in one place to simplify merges. r2864 | ffr | 2010-01-14 09:31:03 +1100 (Thu, 14 Jan 2010) | 2 lines --- site_ansto/instrument/config/nexus/nxscripts_common_1.tcl | 6 +++++- site_ansto/instrument/server_config.tcl | 4 ---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/site_ansto/instrument/config/nexus/nxscripts_common_1.tcl b/site_ansto/instrument/config/nexus/nxscripts_common_1.tcl index b5362cdb..23573a9f 100644 --- a/site_ansto/instrument/config/nexus/nxscripts_common_1.tcl +++ b/site_ansto/instrument/config/nexus/nxscripts_common_1.tcl @@ -1334,7 +1334,11 @@ foreach expt $::nexus::exports { set tmpstr [string map {"$" ""} {$Name: not supported by cvs2svn $}] set nx_content_release_tag [lindex $tmpstr [expr [llength $tmpstr] - 1]] -set tmpstr [string map {"$" ""} {$Revision: 1.51.2.1 $}] +::utility::mkVar sics_release Text manager sics_release true entry true true +sics_release lock +sics_release $nx_content_release_tag + +set tmpstr [string map {"$" ""} {$Revision: 1.51.2.2 $}] set nx_content_revision_num [lindex $tmpstr [expr [llength $tmpstr] - 1]] #namespace eval data { diff --git a/site_ansto/instrument/server_config.tcl b/site_ansto/instrument/server_config.tcl index 5a042139..1b3eaf1f 100644 --- a/site_ansto/instrument/server_config.tcl +++ b/site_ansto/instrument/server_config.tcl @@ -135,10 +135,6 @@ foreach {var val klass priv} { ::utility::mkVar $var Text $priv $var true $klass true true $var $val } -::utility::mkVar sics_release Text manager sics_release true entry true true -set tmpstr [string map {"$" ""} {$Name: not supported by cvs2svn $}] -sics_release [lindex $tmpstr [expr [llength $tmpstr] - 1]] -sics_release lock ::utility::mkVar SicsDataPath Text internal SicsDataPath $sicsroot/data/