From: Ron F. <ro...@us...> - 2004-04-12 16:51:24
|
Update of /cvsroot/nsclspectcl/SpecTcl/Display In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29309/Display Modified Files: Tag: SpecTcl-2-2_development Makefile.am Xamine.cc colormgr.cc dfltmgr.cc dfltmgr.h Log Message: - Use etc for etc stuff with link named Etc rather than the other way around. - Extract all Makefile definitions into separate include files so the user makefile becomes less variable with time. Index: dfltmgr.cc =================================================================== RCS file: /cvsroot/nsclspectcl/SpecTcl/Display/dfltmgr.cc,v retrieving revision 4.6 retrieving revision 4.6.4.1 diff -C2 -d -r4.6 -r4.6.4.1 *** dfltmgr.cc 7 Nov 2003 21:32:17 -0000 4.6 --- dfltmgr.cc 12 Apr 2004 16:37:31 -0000 4.6.4.1 *************** *** 296,299 **** --- 296,304 ---- Change Log: $Log$ + Revision 4.6.4.1 2004/04/12 16:37:31 ron-fox + - Use etc for etc stuff with link named Etc rather than the other way around. + - Extract all Makefile definitions into separate include files so the user makefile + becomes less variable with time. + Revision 4.6 2003/11/07 21:32:17 ron-fox Unconditionally include config.h *************** *** 305,309 **** Revision 4.4 2003/04/02 18:35:24 ron-fox Added support for central Xamine.Default files that live in any of: ! $SpecTclHome/Etc or $SpecTclHome/etc as well as the user's $HOME/Xamine.Defaults. The effect of having multiple files is cumulative. */ --- 310,314 ---- Revision 4.4 2003/04/02 18:35:24 ron-fox Added support for central Xamine.Default files that live in any of: ! $SpecTclHome/etc or $SpecTclHome/etc as well as the user's $HOME/Xamine.Defaults. The effect of having multiple files is cumulative. */ *************** *** 493,497 **** /*! This function reads the default set of properties from file. ! We first attempt to read in a defaults file in HOME/Etc, then HOME/etc. Then we superimpose on that the user's default file: --- 498,502 ---- /*! This function reads the default set of properties from file. ! We first attempt to read in a defaults file in HOME/etc, then HOME/etc. Then we superimpose on that the user's default file: *************** *** 513,521 **** char* dir = new char[strlen(HOME)+strlen("/etc") + 1]; ! // Try in INSTDIR/Etc... strcpy(dir, HOME); ! strcat(dir, "/Etc"); // Old style home dir... char* pFilename = ConstructFilename(dir); --- 518,526 ---- char* dir = new char[strlen(HOME)+strlen("/etc") + 1]; ! // Try in INSTDIR/etc... strcpy(dir, HOME); ! strcat(dir, "/etc"); // Old style home dir... char* pFilename = ConstructFilename(dir); Index: Makefile.am =================================================================== RCS file: /cvsroot/nsclspectcl/SpecTcl/Display/Makefile.am,v retrieving revision 4.8.2.2 retrieving revision 4.8.2.3 diff -C2 -d -r4.8.2.2 -r4.8.2.3 *** Makefile.am 7 Apr 2004 17:39:44 -0000 4.8.2.2 --- Makefile.am 12 Apr 2004 16:37:31 -0000 4.8.2.3 *************** *** 13,19 **** install-exec-local: ! $(mkinstalldirs) $(prefix)/Etc ! $(INSTALL_PROGRAM) $(srcdir)/*.ctbl $(prefix)/Etc ! $(INSTALL_PROGRAM) $(srcdir)/*.ico $(prefix)/Etc $(INSTALL_PROGRAM) $(srcdir)/Xamine $(prefix)/bin/Xamine2_0 --- 13,19 ---- install-exec-local: ! $(mkinstalldirs) $(prefix)/etc ! $(INSTALL_PROGRAM) $(srcdir)/*.ctbl $(prefix)/etc ! $(INSTALL_PROGRAM) $(srcdir)/*.ico $(prefix)/etc $(INSTALL_PROGRAM) $(srcdir)/Xamine $(prefix)/bin/Xamine2_0 Index: Xamine.cc =================================================================== RCS file: /cvsroot/nsclspectcl/SpecTcl/Display/Xamine.cc,v retrieving revision 4.8 retrieving revision 4.8.4.1 diff -C2 -d -r4.8 -r4.8.4.1 *** Xamine.cc 7 Nov 2003 21:36:27 -0000 4.8 --- Xamine.cc 12 Apr 2004 16:37:31 -0000 4.8.4.1 *************** *** 498,502 **** #ifdef HOME char IconName[100]; ! sprintf(IconName,"%s/Etc/Xamine.ico" ,HOME); SetIcon(main_win.getid(), IconName); #else --- 498,502 ---- #ifdef HOME char IconName[100]; ! sprintf(IconName,"%s/etc/Xamine.ico" ,HOME); SetIcon(main_win.getid(), IconName); #else Index: dfltmgr.h =================================================================== RCS file: /cvsroot/nsclspectcl/SpecTcl/Display/dfltmgr.h,v retrieving revision 4.3 retrieving revision 4.3.4.1 diff -C2 -d -r4.3 -r4.3.4.1 *** dfltmgr.h 25 Aug 2003 16:25:30 -0000 4.3 --- dfltmgr.h 12 Apr 2004 16:37:31 -0000 4.3.4.1 *************** *** 295,298 **** --- 295,303 ---- Change log: $Log$ + Revision 4.3.4.1 2004/04/12 16:37:31 ron-fox + - Use etc for etc stuff with link named Etc rather than the other way around. + - Extract all Makefile definitions into separate include files so the user makefile + becomes less variable with time. + Revision 4.3 2003/08/25 16:25:30 ron-fox Initial starting point for merge with filtering -- this probably does not *************** *** 301,305 **** Revision 4.2 2003/04/02 18:35:25 ron-fox Added support for central Xamine.Default files that live in any of: ! $SpecTclHome/Etc or $SpecTclHome/etc as well as the user's $HOME/Xamine.Defaults. The effect of having multiple files is cumulative. */ --- 306,310 ---- Revision 4.2 2003/04/02 18:35:25 ron-fox Added support for central Xamine.Default files that live in any of: ! $SpecTclHome/etc or $SpecTclHome/etc as well as the user's $HOME/Xamine.Defaults. The effect of having multiple files is cumulative. */ Index: colormgr.cc =================================================================== RCS file: /cvsroot/nsclspectcl/SpecTcl/Display/colormgr.cc,v retrieving revision 4.6 retrieving revision 4.6.4.1 diff -C2 -d -r4.6 -r4.6.4.1 *** colormgr.cc 7 Nov 2003 21:32:17 -0000 4.6 --- colormgr.cc 12 Apr 2004 16:37:31 -0000 4.6.4.1 *************** *** 536,540 **** sprintf(filename, fmtstring, XAMINE_DEFAULT_COLOR_DIR, planes); #else ! fmtstring = "%s/Etc/Xamine%d.ctbl"; sprintf(filename, fmtstring, HOME, planes); printf("Opening system colortable file %s\n", filename); --- 536,540 ---- sprintf(filename, fmtstring, XAMINE_DEFAULT_COLOR_DIR, planes); #else ! fmtstring = "%s/etc/Xamine%d.ctbl"; sprintf(filename, fmtstring, HOME, planes); printf("Opening system colortable file %s\n", filename); |