emc-commit Mailing List for LinuxCNC (Page 1855)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/emc/rcslib/etc
In directory sc8-pr-cvs1:/tmp/cvs-serv23088

Modified Files:
	platname rtlinuxdir.sh tcltklibflags.sh tcltkincflags.sh 
	havertai.sh havertlinux.sh rtaidir 
Log Message:
each of these scripts tries to determine something that should perhaps 
be set explicitly, so they now examine an environment variable and use
that with no checking or guessing if it is set, they also print a warning message 
suggesting that an environment 
variable be set rather than relying on their outcome.
It then goes on to give guessing a try.

Index: platname
===================================================================
RCS file: /cvsroot/emc/rcslib/etc/platname,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** platname	19 Jun 2003 02:30:20 -0000	1.30
--- platname	20 Jun 2003 13:56:09 -0000	1.31
***************
*** 1,4 ****
--- 1,23 ----
  #!/bin/sh

+ # 20-Jun-2003 WPS moved this to the front and add warning message
+ # This allows this script to be more or less manually bypassed
+ if test "x${PLAT}" != "x" ; then 
+     echo ${PLAT}
+     exit 0
+ fi
+ 
+ if test ! -f .platname_guess_warn -a ! -f ~/.platname_guess_warn ; then
+ 
+     echo "Platform name is being guessed. Set the environment variable PLAT to override." 1>&2
+     # Touch the platname_guess_warn files so we don't have to see this warning 
+     # too many times.
+     touch .platname_guess_warn >/dev/null 2>/dev/null
+     touch ~/.platname_guess_warn >/dev/null 2>/dev/null
+ 
+ fi
+ 
+ 
+ 
  # 18JUN03 MGS made some additions to this file so that it would work on the 2.18 BDI
  # Hopefully, it won't break anything else...
***************
*** 12,16 ****

  # Change to the directory containing this script
! cd $0/..

  # Add this directory to the PATH environment variable
--- 31,37 ----

  # Change to the directory containing this script
! # cd $0/.. doesn't work with bash 2.05 and relative path names, so 
! # if $0 ends up evaluating to ../etc/platname then cd ../etc/platname/.. produces# this error ../etc/platname: line 14: cd: ../etc/platname/..: No such file or directory
! cd `echo $0 | sed s#/platname## | sed s#platname##`

  # Add this directory to the PATH environment variable
***************
*** 21,29 ****
  # Change back to the original directory
  cd $ORIGINAL_DIR
- 
- if test "0${PLAT}" != 0 ; then 
-     echo ${PLAT}
-     exit 0
- fi

  if test "0${HOME}" = 0 ; then
--- 42,45 ----

Index: rtlinuxdir.sh
===================================================================
RCS file: /cvsroot/emc/rcslib/etc/rtlinuxdir.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** rtlinuxdir.sh	9 Dec 2002 20:50:06 -0000	1.1
--- rtlinuxdir.sh	20 Jun 2003 13:56:09 -0000	1.2
***************
*** 1,4 ****
--- 1,17 ----
  #!/bin/sh

+ 
+ if test "x${RTLINUXDIR}" != "x" ; then
+     echo -n ${RTLINUXDIR}
+     exit 0
+ fi
+ 
+ if test ! -f .rtlinuxdir_guess_warn -a ! -f ~/.rtlinuxdir_guess_warn ; then
+     echo "Trying to guess where  RTLINUX is installed." 1>&2
+     echo "Set the environment variable RTLINUXDIR to override." 1>&2
+     touch .rtlinuxdir_guess_warn >/dev/null 2>/dev/null
+     touch ~/.rtlinuxdir_guess_warn >/dev/null 2>/dev/null
+ fi
+ 
  if [ -f ~/.debug_scripts ] ; then
      set -x;

Index: tcltklibflags.sh
===================================================================
RCS file: /cvsroot/emc/rcslib/etc/tcltklibflags.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tcltklibflags.sh	20 Feb 2003 13:33:07 -0000	1.3
--- tcltklibflags.sh	20 Jun 2003 13:56:09 -0000	1.4
***************
*** 1,4 ****
--- 1,17 ----
  #!/bin/sh

+ 
+ if test "x${TCLTKLIBFLAGS}" != "x" ; then
+     echo ${TCLTKLIBFLAGS}
+     exit 0
+ fi
+ 
+ if test ! -f .tcltklibflags_guess_warn -a ! ~/.tcltklibflags_guess_warn ; then 
+     echo "Trying to guess what flags need to be used to link C programs that interact with tcl/tk." 1>&2
+     echo "Set the environment variable TCLTKLIBFLAGS to override this." 1>&2
+     touch  .tcltklibflags_guess_warn >/dev/null 2>/dev/null
+     touch  ~/.tcltklibflags_guess_warn >/dev/null 2>/dev/null
+ fi
+ 
  # set -x

***************
*** 27,30 ****
--- 40,45 ----
  fi

+ TCLTKLIBFLAGS="$TCL_LFLAG $TCLX_LFLAG  $TK_LFLAG  $TKX_LFLAG"
+ export TCLTKLIBFLAGS

  echo $TCL_LFLAG $TCLX_LFLAG  $TK_LFLAG  $TKX_LFLAG

Index: tcltkincflags.sh
===================================================================
RCS file: /cvsroot/emc/rcslib/etc/tcltkincflags.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tcltkincflags.sh	20 Feb 2003 13:36:44 -0000	1.3
--- tcltkincflags.sh	20 Jun 2003 13:56:09 -0000	1.4
***************
*** 1,4 ****
--- 1,18 ----
  #!/bin/sh

+ 
+ if test "x${TCLTKINCFLAGS}" != "x" ; then
+     echo ${TCLTKINCFLAGS}
+     exit 0
+ fi
+ 
+ if test ! -f .tcltkincflags_guess_warn -a ! ~.tcltkincflags_guess_warn ; then 
+     echo "Trying to guess what flags need to be used to compile C programs that interact with tcl/tk." 1>&2
+     echo "Set the environment variable TCLTKINCFLAGS to override this." 1>&2
+     touch  .tcltkincflags_guess_warn >/dev/null 2>/dev/null
+     touch  ~/.tcltkincflags_guess_warn >/dev/null 2>/dev/null
+ fi
+ 
+ 
  if [ -f ~/.debug_scripts ] ; then
   set -x
***************
*** 35,38 ****
--- 49,55 ----
      TK_IFLAGS=
  fi
+ 
+ TCLTKINCFLAGS="$TCL_IFLAGS $TCL_EXTEND_IFLAGS $TK_IFLAGS"
+ export TCLTKINCFLAGS

  echo $TCL_IFLAGS $TCL_EXTEND_IFLAGS $TK_IFLAGS 

Index: havertai.sh
===================================================================
RCS file: /cvsroot/emc/rcslib/etc/havertai.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** havertai.sh	6 May 2003 15:18:12 -0000	1.1
--- havertai.sh	20 Jun 2003 13:56:09 -0000	1.2
***************
*** 2,5 ****
--- 2,17 ----

+ if test "x${HAVE_RTAI}" != "x" ; then
+     echo ${HAVE_RTAI}
+     exit 0
+ fi
+ 
+ if test ! -f .rtai_guess_warn -a ! -f ~/.rtai_guess_warn ; then
+     echo "Trying to determine if RTAI is installed." 1>&2
+     echo "Set the environment variable HAVE_RTAI to YES or NO to override." 1>&2
+     touch .rtai_guess_warn >/dev/null 2>/dev/null
+     touch ~/.rtai_guess_warn >/dev/null 2>/dev/null
+ fi
+ 
  ECHO_CMD=echo
  # I would like to make this echo -n which eliminates annecessary and troublesome

Index: havertlinux.sh
===================================================================
RCS file: /cvsroot/emc/rcslib/etc/havertlinux.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** havertlinux.sh	7 Apr 2003 15:35:25 -0000	1.5
--- havertlinux.sh	20 Jun 2003 13:56:09 -0000	1.6
***************
*** 2,5 ****
--- 2,21 ----

+ if test "x${HAVE_RTLINUX}" != "x" ; then
+     echo ${HAVE_RTLINUX}
+     exit 0
+ fi
+ 
+ if test ! -f .rtlinux_guess_warn -a ! -f ~/.rtlinux_guess_warn ; then
+     echo "Trying to determine if RTLINUX is installed." 1>&2
+     echo "Set the environment variable HAVE_RTLINUX to YES or NO to override." 1>&2
+     touch .rtlinux_guess_warn >/dev/null 2>/dev/null
+     touch ~/.rtlinux_guess_warn >/dev/null 2>/dev/null
+ fi
+ 
+ 
+ 
+     
+ 
  ECHO_CMD=echo
  # I would like to make this echo -n which eliminates annecessary and troublesome

Index: rtaidir
===================================================================
RCS file: /cvsroot/emc/rcslib/etc/rtaidir,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** rtaidir	19 Jun 2003 15:39:58 -0000	1.4
--- rtaidir	20 Jun 2003 13:56:09 -0000	1.5
***************
*** 6,11 ****
  fi

! echo "Trying to guess RTAI directory." 1>&2
! echo "Set the environment variable RTAIDIR to override this." 1>&2

  rev=`uname -r`
--- 6,15 ----
  fi

! if test ! -f ./rtaidir_guess_warn -a ! -f ~/.rtaidir_guess_warn ; then 
!     echo "Trying to guess RTAI directory." 1>&2
!     echo "Set the environment variable RTAIDIR to override this." 1>&2
!     touch  ./rtaidir_guess_warn >/dev/null 2>/dev/null
!     touch  ~/.rtaidir_guess_warn >/dev/null 2>/dev/null
! fi

  rev=`uname -r`

2003	Jan	Feb	Mar	Apr	May	Jun (12)	Jul (105)	Aug (245)	Sep (165)	Oct (100)	Nov (92)	Dec (74)
2004	Jan (179)	Feb (233)	Mar (175)	Apr (168)	May (146)	Jun (165)	Jul (18)	Aug (95)	Sep (134)	Oct (120)	Nov (51)	Dec (65)
2005	Jan (96)	Feb (100)	Mar (113)	Apr (82)	May (281)	Jun (168)	Jul (54)	Aug (72)	Sep (104)	Oct (182)	Nov (126)	Dec (133)
2006	Jan (211)	Feb (252)	Mar (291)	Apr (199)	May (345)	Jun (282)	Jul (272)	Aug (261)	Sep (287)	Oct (464)	Nov (233)	Dec (210)
2007	Jan (669)	Feb (304)	Mar (483)	Apr (150)	May (293)	Jun (215)	Jul (178)	Aug (138)	Sep (159)	Oct (301)	Nov (367)	Dec (165)
2008	Jan (171)	Feb (148)	Mar (150)	Apr (180)	May (112)	Jun (109)	Jul (196)	Aug (319)	Sep (294)	Oct (284)	Nov (399)	Dec (280)
2009	Jan (536)	Feb (454)	Mar (382)	Apr (255)	May (321)	Jun (318)	Jul (412)	Aug (226)	Sep (76)	Oct (251)	Nov (134)	Dec (101)
2010	Jan (262)	Feb (210)	Mar (219)	Apr (55)	May (180)	Jun (225)	Jul (151)	Aug (184)	Sep (54)	Oct (160)	Nov (237)	Dec (115)
2011	Jan (141)	Feb (68)	Mar (204)	Apr (329)	May (68)	Jun (34)	Jul (304)	Aug (206)	Sep (183)	Oct (121)	Nov (1125)	Dec (934)
2012	Jan (466)	Feb (161)	Mar (314)	Apr (63)	May (62)	Jun (53)	Jul (47)	Aug (41)	Sep (36)	Oct (108)	Nov (297)	Dec (73)
2013	Jan (236)	Feb (81)	Mar (422)	Apr (441)	May (86)	Jun (177)	Jul (146)	Aug (140)	Sep (93)	Oct (126)	Nov (133)	Dec (230)
2014	Jan (380)	Feb (233)	Mar (251)	Apr (214)	May (168)	Jun (670)	Jul (538)	Aug (459)	Sep (330)	Oct (327)	Nov (339)	Dec (456)
2015	Jan (188)	Feb (426)	Mar (186)	Apr (71)	May (151)	Jun (283)	Jul (208)	Aug (477)	Sep (148)	Oct (302)	Nov (297)	Dec (331)
2016	Jan (474)	Feb (55)	Mar (92)	Apr (118)	May (286)	Jun (751)	Jul (494)	Aug (166)	Sep (97)	Oct (216)	Nov (41)	Dec (78)
2017	Jan (148)	Feb (205)	Mar (112)	Apr (119)	May (125)	Jun (102)	Jul (242)	Aug (26)	Sep (53)	Oct (28)	Nov (38)	Dec (97)
2018	Jan (71)	Feb (49)	Mar (43)	Apr (13)	May (19)	Jun (44)	Jul (74)	Aug (30)	Sep (44)	Oct (57)	Nov (74)	Dec (34)
2019	Jan (41)	Feb (50)	Mar (30)	Apr (24)	May (44)	Jun (101)	Jul (94)	Aug (123)	Sep (101)	Oct (81)	Nov (48)	Dec (51)
2020	Jan (74)	Feb (81)	Mar (129)	Apr (310)	May (176)	Jun (97)	Jul (137)	Aug (205)	Sep (84)	Oct (71)	Nov (106)	Dec (138)
2021	Jan (117)	Feb (94)	Mar (89)	Apr (71)	May (98)	Jun (99)	Jul (67)	Aug (129)	Sep (108)	Oct (127)	Nov (115)	Dec (114)
2022	Jan (115)	Feb (85)	Mar (97)	Apr (92)	May (102)	Jun (109)	Jul (168)	Aug (230)	Sep (183)	Oct (106)	Nov (109)	Dec (146)
2023	Jan (186)	Feb (126)	Mar (99)	Apr (92)	May (158)	Jun (74)	Jul (113)	Aug (93)	Sep (84)	Oct (163)	Nov (72)	Dec (81)
2024	Jan (71)	Feb (85)	Mar (63)	Apr (50)	May (45)	Jun (28)	Jul (106)	Aug (45)	Sep (60)	Oct (44)	Nov (53)	Dec (28)
2025	Jan (87)	Feb (58)	Mar (71)	Apr (37)	May (37)	Jun (46)	Jul (74)	Aug (26)	Sep (55)	Oct (42)	Nov	Dec

emc-commit Mailing List for LinuxCNC (Page 1855)

emc-commit — CVS commit notification list.