Menu
▾
▴
[Nscldaq-cvscommits] clients/slowControls/caenv812 CFD812.tcl,1.1,1.2 CFDState.tcl,1.1,1.2 Makefile.am,1.2,1.3 caenv812Gui.tcl,1.1,1.2 caenv812control.tcl,1.1,1.2 loadcfd.tcl,1.2,1.3
|
From: Ron F. <ro...@us...> - 2006-02-23 21:33:29
|
Update of /cvsroot/nscldaq/clients/slowControls/caenv812 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22271/slowControls/caenv812 Modified Files: CFD812.tcl CFDState.tcl Makefile.am caenv812Gui.tcl caenv812control.tcl loadcfd.tcl Log Message: Reorganize Tcl packagse and scripts so that 'executables' are in bin and packges are in TclLibs/pckdir witha TclLibs top level for .so's and TclLibs/data for data files. Index: caenv812control.tcl =================================================================== RCS file: /cvsroot/nscldaq/clients/slowControls/caenv812/caenv812control.tcl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** caenv812control.tcl 2 Nov 2005 22:08:32 -0000 1.1 --- caenv812control.tcl 23 Feb 2006 21:33:08 -0000 1.2 *************** *** 24,34 **** #---------------------------------- ! set version 1.0 set instanceNumber 0; # id of next gui widget instance. set livePanels 0; # Number of live panels. set here [file dirname [info script]] ! set drivers [file join $here .. ControlDrivers] ! set helpdir [file join $here caenv812help] --- 24,40 ---- #---------------------------------- ! set version 1.1 set instanceNumber 0; # id of next gui widget instance. set livePanels 0; # Number of live panels. set here [file dirname [info script]] ! set drivers [file join $here .. TclLibs] ! ! set wd [pwd] ! cd $drivers ! set drivers [pwd] ! cd $wd ! ! set helpdir [file join $drivers data caenv812] Index: CFDState.tcl =================================================================== RCS file: /cvsroot/nscldaq/clients/slowControls/caenv812/CFDState.tcl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CFDState.tcl 2 Nov 2005 22:08:32 -0000 1.1 --- CFDState.tcl 23 Feb 2006 21:33:08 -0000 1.2 *************** *** 1,2 **** --- 1,16 ---- + # This software is Copyright by the Board of Trustees of Michigan + # State University (c) Copyright 2005. + # + # You may use this software under the terms of the GNU public license + # (GPL). The terms of this license are described at: + # + # http://www.gnu.org/licenses/gpl.txt + # + # Author: + # Ron Fox + # NSCL + # Michigan State University + # East Lansing, MI 48824-1321 + # # CFDState.tcl *************** *** 18,21 **** --- 32,36 ---- # is the base address of the corresponding module. # Masks - An array of disable masks. + package provide CFDState 2.0 Index: Makefile.am =================================================================== RCS file: /cvsroot/nscldaq/clients/slowControls/caenv812/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile.am 16 Nov 2005 13:58:13 -0000 1.2 --- Makefile.am 23 Feb 2006 21:33:08 -0000 1.3 *************** *** 1,12 **** ! DRIVERDIR=$(prefix)/Scripts/ControlDrivers ! APPDIR=$(prefix)/Scripts/ControlApplications ! HELPDIR=$(prefix)/Scripts/ControlApplications/caenv812help VERSION=2.0 #Must match the package versions!!! PACKAGES=CFD812.tcl CFDState.tcl caenv812Gui.tcl APPS=caenv812control.tcl loadcfd.tcl MANPAGES=loadcfd.1 caenv812control.1 CFDState.3 CFD812.3 caenv812gui.3 \ caenv812control.1 caen812configfile.5 HELPFILES=close.html exit.html filemenu.html gui.html helpmenu.html \ new.html read.html write.html config.html overview.html --- 1,15 ---- ! DRIVERDIR=$(prefix)/TclLibs/caenv812 ! APPDIR=$(prefix)/bin ! HELPDIR=$(prefix)/TclLibs/data/caenv812 VERSION=2.0 #Must match the package versions!!! PACKAGES=CFD812.tcl CFDState.tcl caenv812Gui.tcl + APPS=caenv812control.tcl loadcfd.tcl + MANPAGES=loadcfd.1 caenv812control.1 CFDState.3 CFD812.3 caenv812gui.3 \ caenv812control.1 caen812configfile.5 + HELPFILES=close.html exit.html filemenu.html gui.html helpmenu.html \ new.html read.html write.html config.html overview.html *************** *** 16,22 **** chmod o+rx $(DRIVERDIR) $(APPDIR) $(HELPDIR) $(INSTALL_SCRIPT) $(PACKAGES) $(DRIVERDIR) $(INSTALL_SCRIPT) $(APPS) $(APPDIR) $(INSTALL_DATA) $(HELPFILES) $(HELPDIR) ! EXTRA_DIST= $(PACKAGES) $(APPS) $(MANPAGES) $(HELPFILES) --- 19,27 ---- chmod o+rx $(DRIVERDIR) $(APPDIR) $(HELPDIR) $(INSTALL_SCRIPT) $(PACKAGES) $(DRIVERDIR) + for f in $(APPS); do $(INSTALL_SCRIPT) $$f $(APPDIR)/`basename $$f .tcl`; done $(INSTALL_SCRIPT) $(APPS) $(APPDIR) $(INSTALL_DATA) $(HELPFILES) $(HELPDIR) ! echo "pkg_mkIndex $(DRIVERDIR) *.tcl" > makeindex.tcl ! $(TCLSH_CMD) <makeindex.tcl EXTRA_DIST= $(PACKAGES) $(APPS) $(MANPAGES) $(HELPFILES) Index: loadcfd.tcl =================================================================== RCS file: /cvsroot/nscldaq/clients/slowControls/caenv812/loadcfd.tcl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** loadcfd.tcl 16 Nov 2005 13:58:13 -0000 1.2 --- loadcfd.tcl 23 Feb 2006 21:33:08 -0000 1.3 *************** *** 36,40 **** # for packages in the tree rooted in .. ! set libdirs [file join [file dirname $me] .. ControlDrivers] set dir [pwd] cd $libdirs --- 36,40 ---- # for packages in the tree rooted in .. ! set libdirs [file join [file dirname $me] .. TclLibs] set dir [pwd] cd $libdirs Index: caenv812Gui.tcl =================================================================== RCS file: /cvsroot/nscldaq/clients/slowControls/caenv812/caenv812Gui.tcl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** caenv812Gui.tcl 2 Nov 2005 22:08:32 -0000 1.1 --- caenv812Gui.tcl 23 Feb 2006 21:33:08 -0000 1.2 *************** *** 104,108 **** # Get the device and state 'objects' made. ! $self createDevice $self createState --- 104,110 ---- # Get the device and state 'objects' made. ! if {[catch {$self createDevice} msg]} { ! error "controller creation failed: $msg" ! } $self createState *************** *** 216,221 **** destructor { ! $self destroyDevice ! $self destroyState } --- 218,223 ---- destructor { ! catch {$self destroyDevice} ! catch {$self destroyState} } Index: CFD812.tcl =================================================================== RCS file: /cvsroot/nscldaq/clients/slowControls/caenv812/CFD812.tcl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CFD812.tcl 2 Nov 2005 22:08:32 -0000 1.1 --- CFD812.tcl 23 Feb 2006 21:33:08 -0000 1.2 *************** *** 1,2 **** --- 1,16 ---- + # This software is Copyright by the Board of Trustees of Michigan + # State University (c) Copyright 2005. + # + # You may use this software under the terms of the GNU public license + # (GPL). The terms of this license are described at: + # + # http://www.gnu.org/licenses/gpl.txt + # + # Author: + # Ron Fox + # NSCL + # Michigan State University + # East Lansing, MI 48824-1321 + # # CFD812 |