emc-commit — CVS commit notification list.

[Emc-commit] documents/lyx Handbook.lyx,1.14,NONE

[<ray...@us...>]

Update of /cvsroot/emc/documents/lyx
In directory sc8-pr-cvs1:/tmp/cvs-serv22973

Removed Files:
	Handbook.lyx 
Log Message:
Removed single file handbook.

--- Handbook.lyx DELETED ---

[Emc-commit] emc_HAL/src/emcmot emcmot.c,1.4,1.5

[<ms...@us...>]

Update of /cvsroot/emc/emc_HAL/src/emcmot
In directory sc8-pr-cvs1:/tmp/cvs-serv7644

Modified Files:
	emcmot.c 
Log Message:
Fix a bug I introduced by elimanating the duplicate code - I need to have this stuff tested before I commit it...

Index: emcmot.c
===================================================================
RCS file: /cvsroot/emc/emc_HAL/src/emcmot/emcmot.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** emcmot.c	3 Jul 2003 06:04:54 -0000	1.4
--- emcmot.c	3 Jul 2003 16:55:16 -0000	1.5
***************
*** 4674,4683 ****
  			  period = smCount[axis] / -delta;
  			}
! 		      up[axis] = period * (duty_cycle_up / 100);
! 		      if (up[axis] <= 0)
! 			up[axis] = 1;
! 		      down[axis] = period - up[axis];
! 		      if (down[axis] <= 0)
! 			down[axis] = 1;
  		    }
  
--- 4674,4686 ----
  			  period = smCount[axis] / -delta;
  			}
! 		      if (delta != 0)
! 			{
! 			  up[axis] = period * (duty_cycle_up / 100);
! 			  if (up[axis] <= 0)
! 			    up[axis] = 1;
! 			  down[axis] = period - up[axis];
! 			  if (down[axis] <= 0)
! 			    down[axis] = 1;
! 			}
  		    }
  

[Emc-commit] emc_HAL/src/emcmot emcmot.c,1.3,1.4

[<ms...@us...>]

Update of /cvsroot/emc/emc_HAL/src/emcmot
In directory sc8-pr-cvs1:/tmp/cvs-serv13026

Modified Files:
	emcmot.c 
Log Message:
Fixed an unmatched #endif leftover from removing the orphaned  block in the last commit. Also made a small change in binfunc() that eliminates a small piece of duplicated code.

Index: emcmot.c
===================================================================
RCS file: /cvsroot/emc/emc_HAL/src/emcmot/emcmot.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** emcmot.c	1 Jul 2003 23:59:43 -0000	1.3
--- emcmot.c	3 Jul 2003 06:04:54 -0000	1.4
***************
*** 4206,4210 ****
  #endif
  #endif
- #endif
  	      /* round it */
  	      if (pdmultfloat < 0.0)
--- 4206,4209 ----
***************
*** 4669,4678 ****
  			  direction[axis] = 1;
  			  period = smCount[axis] / +delta;
- 			  up[axis] = period * (duty_cycle_up / 100);
- 			  if (up[axis] <= 0)
- 			    up[axis] = 1;
- 			  down[axis] = period - up[axis];
- 			  if (down[axis] <= 0)
- 			    down[axis] = 1;
  			}
  		      else if (delta < 0)
--- 4668,4671 ----
***************
*** 4680,4690 ****
  			  direction[axis] = 0;
  			  period = smCount[axis] / -delta;
- 			  up[axis] = period * (duty_cycle_up / 100);
- 			  if (up[axis] <= 0)
- 			    up[axis] = 1;
- 			  down[axis] = period - up[axis];
- 			  if (down[axis] <= 0)
- 			    down[axis] = 1;
  			}
  		    }
  
--- 4673,4683 ----
  			  direction[axis] = 0;
  			  period = smCount[axis] / -delta;
  			}
+ 		      up[axis] = period * (duty_cycle_up / 100);
+ 		      if (up[axis] <= 0)
+ 			up[axis] = 1;
+ 		      down[axis] = period - up[axis];
+ 		      if (down[axis] <= 0)
+ 			down[axis] = 1;
  		    }
  

[Emc-commit] rcslib/src/cms Makefile.lib,4.54,4.55

[<wsh...@us...>]

Update of /cvsroot/emc/rcslib/src/cms
In directory sc8-pr-cvs1:/tmp/cvs-serv10874

Modified Files:
	Makefile.lib 
Log Message:
copy out headers problem.


Index: Makefile.lib
===================================================================
RCS file: /cvsroot/emc/rcslib/src/cms/Makefile.lib,v
retrieving revision 4.54
retrieving revision 4.55
diff -C2 -d -r4.54 -r4.55
*** Makefile.lib	15 May 2003 16:41:46 -0000	4.54
--- Makefile.lib	2 Jul 2003 15:34:04 -0000	4.55
***************
*** 4,8 ****
  ifeq (rtlinux_2, $(findstring rtlinux_2, $(PLAT)))
  
! LIBCMS_OBJS = rtlnml.o \
  	rtlinux_kernel_api_implement.o
  
--- 4,8 ----
  ifeq (rtlinux_2, $(findstring rtlinux_2, $(PLAT)))
  
! CMS_OBJS = rtlnml.o \
  	rtlinux_kernel_api_implement.o
  
***************
*** 12,21 ****
  ifeq (rtlinux_3, $(findstring rtlinux_3, $(PLAT)))
  
! LIBCMS_OBJS = rtlnml.o \
  	rtlinux_kernel_api_implement.o
  else
  # ifeq (rtlinux_3, $(findstring rtlinux_3, $(PLAT)))
  
! LIBCMS_OBJS =
  endif
  # ifeq (rtlinux_3, $(findstring rtlinux_2, $(PLAT)))
--- 12,21 ----
  ifeq (rtlinux_3, $(findstring rtlinux_3, $(PLAT)))
  
! CMS_OBJS = rtlnml.o \
  	rtlinux_kernel_api_implement.o
  else
  # ifeq (rtlinux_3, $(findstring rtlinux_3, $(PLAT)))
  
! CMS_OBJS =
  endif
  # ifeq (rtlinux_3, $(findstring rtlinux_2, $(PLAT)))
***************
*** 25,29 ****
  
  
! LIBCMS_OBJS_SET=1
  
  endif
--- 25,29 ----
  
  
! CMS_OBJS_SET=1
  
  endif
***************
*** 32,39 ****
  ifeq (rtai, $(PLAT))
  
! LIBCMS_OBJS = rtlnml.o  \
  	rtai_kernel_api_implement.o
  
! LIBCMS_OBJS_SET=1
  
  endif
--- 32,39 ----
  ifeq (rtai, $(PLAT))
  
! CMS_OBJS = rtlnml.o  \
  	rtai_kernel_api_implement.o
  
! CMS_OBJS_SET=1
  
  endif
***************
*** 42,50 ****
  NO_RPC=1
  
- x:=$(shell echo  LIBCMS_OBJS_SET=$(LIBCMS_OBJS_SET) >>/tmp/rcslibmake.log)
  
! ifndef LIBCMS_OBJS_SET
  
! ALLPLATS_LIBCMS_OBJS= 	cms.o \
  	cmsdiag.o \
  	nmldiag.o \
--- 42,49 ----
  NO_RPC=1
  
  
! ifndef CMS_OBJS_SET
  
! ALLPLATS_CMS_OBJS= 	cms.o \
  	cmsdiag.o \
  	nmldiag.o \
***************
*** 84,88 ****
  	crypt2.o \
  	cmssvrp.o \
! 	nmlqr.o
  
  ifndef NO_XML
--- 83,90 ----
  	crypt2.o \
  	cmssvrp.o \
! 	cms_datetime.o \
! 	nmlqr.o \
! 	cms_xml_up.o 
! 
  
  ifndef NO_XML
***************
*** 90,107 ****
  endif
  
- ifdef USE_XML
- LIBCMS_XML_OBJS= \
- 	cms_xml_up.o
- 
- else
- # ifdef USE_XML
- 
- LIBCMS_XML_OBJS=
- 
- endif
- # ifdef USE_XML
  
  
! LIBCMS_RPC_XDR_OBJS = \
  	cms_xup.o \
  	xdr_msg.o
--- 92,98 ----
  endif
  
  
  
! CMS_RPC_XDR_OBJS = \
  	cms_xup.o \
  	xdr_msg.o
***************
*** 112,119 ****
  ifneq ($(findstring vxworksSun, $(PLAT)),vxworksSun)
  
! LIBCMS_OBJS :=	$(LIBCMS_OBJS) \
! 	$(LIBCMS_RPC_XDR_OBJS) \
! 	$(ALLPLATS_LIBCMS_OBJS) \
! 	$(LIBCMS_XML_OBJS) \
  	globmem.o \
  	bbdmem.o \
--- 103,110 ----
  ifneq ($(findstring vxworksSun, $(PLAT)),vxworksSun)
  
! CMS_OBJS :=	$(CMS_OBJS) \
! 	$(CMS_RPC_XDR_OBJS) \
! 	$(ALLPLATS_CMS_OBJS) \
! 	$(CMS_XML_OBJS) \
  	globmem.o \
  	bbdmem.o \
***************
*** 126,132 ****
  # ifneq ($(findstring vxworksSun, $(PLAT)),vxworksSun)
  
! LIBCMS_OBJS :=	$(LIBCMS_OBJS) \
! 	$(ALLPLATS_LIBCMS_OBJS) \
! 	$(LIBCMS_XML_OBJS) \
  	globmem.o \
  	bbdmem.o \
--- 117,123 ----
  # ifneq ($(findstring vxworksSun, $(PLAT)),vxworksSun)
  
! CMS_OBJS :=	$(CMS_OBJS) \
! 	$(ALLPLATS_CMS_OBJS) \
! 	$(CMS_XML_OBJS) \
  	globmem.o \
  	bbdmem.o \
***************
*** 142,149 ****
  # ifneq ($(findstring vxworksppc, $(PLAT)),vxworksppc)
  
! LIBCMS_OBJS :=	$(LIBCMS_OBJS) \
! 	$(LIBCMS_RPC_XDR_OBJS) \
! 	$(ALLPLATS_LIBCMS_OBJS) \
! 	$(LIBCMS_XML_OBJS) \
  	globmem.o \
  	bbdmem.o \
--- 133,140 ----
  # ifneq ($(findstring vxworksppc, $(PLAT)),vxworksppc)
  
! CMS_OBJS :=	$(CMS_OBJS) \
! 	$(CMS_RPC_XDR_OBJS) \
! 	$(ALLPLATS_CMS_OBJS) \
! 	$(CMS_XML_OBJS) \
  	globmem.o \
  	bbdmem.o \
***************
*** 158,162 ****
  # ifeq ($(findstring vxworks, $(PLAT)),vxworks)
  
! LIBCMS_TTY_OBJS = \
  	ttyintf.o \
  	ttymem.o \
--- 149,153 ----
  # ifeq ($(findstring vxworks, $(PLAT)),vxworks)
  
! CMS_TTY_OBJS = \
  	ttyintf.o \
  	ttymem.o \
***************
*** 166,173 ****
  ifeq (darwin, $(findstring darwin, $(PLAT)))
  
! LIBCMS_OBJS :=	$(LIBCMS_OBJS) \
! 	$(LIBCMS_RPC_XDR_OBJS) \
! 	$(ALLPLATS_LIBCMS_OBJS) \
! 	$(LIBCMS_XML_OBJS)
  
  else
--- 157,164 ----
  ifeq (darwin, $(findstring darwin, $(PLAT)))
  
! CMS_OBJS :=	$(CMS_OBJS) \
! 	$(CMS_RPC_XDR_OBJS) \
! 	$(ALLPLATS_CMS_OBJS) \
! 	$(CMS_XML_OBJS)
  
  else
***************
*** 176,192 ****
  ifeq (qnx, $(findstring qnx, $(PLAT)))
  
! LIBCMS_OBJS :=	$(LIBCMS_OBJS) \
! 	$(LIBCMS_RPC_XDR_OBJS) \
! 	$(ALLPLATS_LIBCMS_OBJS) \
! 	$(LIBCMS_XML_OBJS) 
  
  else
  # qnx
  
! LIBCMS_OBJS :=	$(LIBCMS_OBJS) \
! 	$(LIBCMS_RPC_XDR_OBJS) \
! 	$(LIBCMS_TTY_OBJS) \
! 	$(ALLPLATS_LIBCMS_OBJS) \
! 	$(LIBCMS_XML_OBJS) 
  
  endif
--- 167,183 ----
  ifeq (qnx, $(findstring qnx, $(PLAT)))
  
! CMS_OBJS :=	$(CMS_OBJS) \
! 	$(CMS_RPC_XDR_OBJS) \
! 	$(ALLPLATS_CMS_OBJS) \
! 	$(CMS_XML_OBJS) 
  
  else
  # qnx
  
! CMS_OBJS :=	$(CMS_OBJS) \
! 	$(CMS_RPC_XDR_OBJS) \
! 	$(CMS_TTY_OBJS) \
! 	$(ALLPLATS_CMS_OBJS) \
! 	$(CMS_XML_OBJS) 
  
  endif
***************
*** 200,204 ****
  
  ifeq (linuxVME, $(PLAT))
! LIBCMS_OBJS := $(LIBCMS_OBJS) globmem.o
  else
  # ifeq (linuxVME, $(PLAT))
--- 191,195 ----
  
  ifeq (linuxVME, $(PLAT))
! CMS_OBJS := $(CMS_OBJS) globmem.o
  else
  # ifeq (linuxVME, $(PLAT))
***************
*** 210,214 ****
  ifeq ($(PLAT),linux_rtai)
  
! LIBCMS_OBJS := $(LIBCMS_OBJS) \
  	rtlmem.o \
  	rtlnml.o \
--- 201,205 ----
  ifeq ($(PLAT),linux_rtai)
  
! CMS_OBJS := $(CMS_OBJS) \
  	rtlmem.o \
  	rtlnml.o \
***************
*** 220,224 ****
  ifneq ($(NO_RTL),1)
  
! LIBCMS_OBJS := $(LIBCMS_OBJS) \
  	rtlmem.o \
  	rtlnml.o \
--- 211,215 ----
  ifneq ($(NO_RTL),1)
  
! CMS_OBJS := $(CMS_OBJS) \
  	rtlmem.o \
  	rtlnml.o \
***************
*** 240,249 ****
  # ifeq (linuxVME, $(PLAT))
  
- x:=$(shell echo LIBCMS_OBJS=$(LIBCMS_OBJS) >>/tmp/rclsibmake.log)
  
  endif
! # ifndef LIBCMS_OBJS_SET
  
  
  LIBRCS_OBJS := $(LIBRCS_OBJS) \
! 	$(LIBCMS_OBJS)
--- 231,306 ----
  # ifeq (linuxVME, $(PLAT))
  
  
  endif
! # ifndef CMS_OBJS_SET
! 
! CMS_HEADERS :=  cms.hh \
! 	cmsdiag.hh \
! 	nmldiag.hh \
! 	cms_cfg.hh \
! 	autokey.h \
! 	cms_user.hh \
! 	cms_up.hh \
! 	cms_xup.hh \
! 	cms_aup.hh \
! 	cms_xml_up.hh \
! 	nml.hh \
! 	nmlmsg.hh \
! 	globmem.hh \
! 	spinlock.h \
! 	shmem.hh \
! 	memsem.hh \
! 	rpc_host.hh \
! 	cms_srv.hh \
! 	nml_srv.hh \
! 	phantom.hh \
! 	perftype.hh \
! 	_physmem.h \
! 	physmem.hh \
! 	rem_msg.hh \
! 	rpc_srv.hh \
! 	tcp_srv.hh \
! 	http_srv.hh \
! 	tcpmem.hh \
! 	stcpmem.hh \
! 	xdr_msg.hh \
! 	tcp_opts.hh \
! 	udp_opts.hh \
! 	udpmem.hh \
! 	udp_srv.hh \
! 	sendmsgt.h \
! 	recvmsgt.h \
! 	recvn.h \
! 	sendn.h \
! 	msghdr.h \
! 	sokintrf.h \
! 	rpcintrf.h \
! 	windlg.h \
! 	dlgproc.h \
! 	nmlperf.hh \
! 	nmlwatch.h \
! 	locmem.hh \
! 	filemem.hh \
! 	cms_dup.hh \
! 	sendline.h \
! 	recvline.h \
! 	stcpsvr.hh \
! 	stcpopts.hh \
! 	gpioctl.h \
! 	mapmem.h \
! 	crypt2.hh \
! 	bbdmem.hh \
! 	bbd.h \
! 	bus_lock.h \
! 	dma.h \
! 	nmlqr.hh \
! 	bd_types.h \
! 	ttyintf.h \
! 	ttymem.hh \
! 	tty_srv.hh \
! 	rtlmem.hh \
! 	rtlnml.h
  
  
  LIBRCS_OBJS := $(LIBRCS_OBJS) \
! 	$(CMS_OBJS)

[Emc-commit] rcslib/src/cms cms_datetime.cc,NONE,1.1

[<wsh...@us...>]

Update of /cvsroot/emc/rcslib/src/cms
In directory sc8-pr-cvs1:/tmp/cvs-serv24293

Added Files:
	cms_datetime.cc 
Log Message:
this file is really only needed for OMAC XML stuff, but since I already checked in the Makefile that mentions it by mistake I'll check this in too.


--- NEW FILE: cms_datetime.cc ---

#include "cms.hh"

#include <time.h>
#include <stdio.h>
#include <errno.h>


void get_current_cms_date_time(struct CMS_DATE_TIME  *dt)
{
  struct tm *tm_ptr;
  time_t time_returned_from_time;
  time_t time_storage_var;

  if(!dt)
    {
      return;
    }


  tm_ptr=0;
  time_returned_from_time = time(&time_storage_var);
  if(((time_t)-1) == time_returned_from_time )
    {
      perror("time:");
      return;
    }
  tm_ptr = localtime(&time_returned_from_time);

  if(!tm_ptr)
    {
      return;
    }
  dt->seconds = tm_ptr->tm_sec;
  dt->minutes = tm_ptr->tm_min;
  dt->hours = tm_ptr->tm_hour;
  dt->days = tm_ptr->tm_mday;
  dt->months = tm_ptr->tm_mon;
  dt->years = tm_ptr->tm_year;
}


void get_current_cms_date(struct CMS_DATE  *d)
{
  struct tm *tm_ptr;
  time_t time_returned_from_time;
  time_t time_storage_var;
  
  if(!d)
    {
      return;
    }


  tm_ptr=0;
  time_returned_from_time = time(&time_storage_var);
  if(((time_t)-1) == time_returned_from_time )
    {
      perror("time:");
      return;
    }
  tm_ptr = localtime(&time_returned_from_time);

  if(!tm_ptr)
    {
      return;
    }
  d->days = tm_ptr->tm_mday;
  d->months = tm_ptr->tm_mon;
  d->years = tm_ptr->tm_year;
}


void get_current_cms_time(struct CMS_TIME  *t)
{
  struct tm *tm_ptr;
  time_t time_returned_from_time;
  time_t time_storage_var;

  if(!t)
    {
      return;
    }


  tm_ptr=0;
  time_returned_from_time = time(&time_storage_var);
  if(((time_t)-1) == time_returned_from_time )
    {
      perror("time:");
      return;
    }
  tm_ptr = localtime(&time_returned_from_time);

  if(!tm_ptr)
    {
      return;
    }
  t->seconds = tm_ptr->tm_sec;
  t->minutes = tm_ptr->tm_min;
  t->hours = tm_ptr->tm_hour;
}

[Emc-commit] emc_HAL/src/emcmot emcmot.c,1.2,1.3

[<ms...@us...>]

Update of /cvsroot/emc/emc_HAL/src/emcmot
In directory sc8-pr-cvs1:/tmp/cvs-serv12656

Modified Files:
	emcmot.c 
Log Message:
Changes to emcmot.c to improve stepper motor performance in freqmod & steppermod

Index: emcmot.c
===================================================================
RCS file: /cvsroot/emc/emc_HAL/src/emcmot/emcmot.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** emcmot.c	16 May 2003 22:02:55 -0000	1.2
--- emcmot.c	1 Jul 2003 23:59:43 -0000	1.3
***************
*** 1,2 ****
--- 1,3 ----
+ #define _XOPEN_SOURCE
  /*
    emcmot.c
***************
*** 7,14 ****
    Modification history:
  
    29-Jan-2003 WPS changed call to simMotInit to extMotCycle
    10-Dec-2002 WPS eliminated use of direct time stamp measurements, apparently
[...11439 lines suppressed...]
!   while (!emcmot_done)
!     {
!       cycles++;
!       delta = etime ();
!       emcmotController (0);
!       cur_time = etime ();
!       delta = cur_time - delta;
!       delta = emcmotConfig->servoCycleTime - delta;
! 
!       if (delta > 0.0)
! 	{
! 	  esleep (delta);
! 	}
      }
  
!   cleanup_module ();
!   exit (0);
  }
  
  #endif /* not rtlinux */

[Emc-commit] emc sim.var,1.10,1.11 stepper.var,1.1,1.2

[<ray...@us...>]

Update of /cvsroot/emc/emc
In directory sc8-pr-cvs1:/tmp/cvs-serv29406

Modified Files:
	sim.var stepper.var 
Log Message:
Removed g92 values

Index: sim.var
===================================================================
RCS file: /cvsroot/emc/emc/sim.var,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** sim.var	7 May 2003 19:49:50 -0000	1.10
--- sim.var	29 Jun 2003 02:33:12 -0000	1.11
***************
*** 11,21 ****
  5185	0.000000
  5186	0.000000
! 5211	-0.716000
! 5212	1.000000
! 5213	1.000000
  5214	0.000000
  5215	0.000000
  5216	0.000000
! 5220	6.000000
  5221	0.000000
  5222	0.000000
--- 11,21 ----
  5185	0.000000
  5186	0.000000
! 5211	0.000000
! 5212	0.000000
! 5213	0.000000
  5214	0.000000
  5215	0.000000
  5216	0.000000
! 5220	0.000000
  5221	0.000000
  5222	0.000000

Index: stepper.var
===================================================================
RCS file: /cvsroot/emc/emc/stepper.var,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** stepper.var	24 May 2002 18:05:28 -0000	1.1
--- stepper.var	29 Jun 2003 02:33:12 -0000	1.2
***************
*** 11,15 ****
  5185	0.000000
  5186	0.000000
! 5211	-0.000000
  5212	0.000000
  5213	0.000000
--- 11,15 ----
  5185	0.000000
  5186	0.000000
! 5211	0.000000
  5212	0.000000
  5213	0.000000

[Emc-commit] emc/src/emcsim Makefile,1.8,1.9

[<wsh...@us...>]

Update of /cvsroot/emc/emc/src/emcsim
In directory sc8-pr-cvs1:/tmp/cvs-serv27573

Modified Files:
	Makefile 
Log Message:
Don't build inisim or simstatprint unless someone actually asks for it.


Index: Makefile
===================================================================
RCS file: /cvsroot/emc/emc/src/emcsim/Makefile,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Makefile	13 Jun 2001 19:58:02 -0000	1.8
--- Makefile	23 Jun 2003 13:55:49 -0000	1.9
***************
*** 105,110 ****
  	simmot_n.h
  
! BINS =	inisim \
! 	simstatprint
  
  
--- 105,113 ----
  	simmot_n.h
  
! # Don't build this stuff by default: there is some chance of 
! # it failing due to bad configuration stuff and not many people will
! # use it. run "make inisim" or "make simstatprint" if you want them.
! #BINS =	inisim \
! #	simstatprint
  
  
***************
*** 119,125 ****
  	simdio.o \
  	simaio.o \
! 	simbase.o \
! 	inisim.o \
! 	simmot_n.o
  
  endif
--- 122,130 ----
  	simdio.o \
  	simaio.o \
! 	simbase.o
! 
! #  \
! #	inisim.o \
! #	simmot_n.o
  
  endif

[Emc-commit] rcslib/src/cms Makefile,4.48,4.49 cms_cfg.cc,4.42,4.43

[<wsh...@us...>]

Update of /cvsroot/emc/rcslib/src/cms
In directory sc8-pr-cvs1:/tmp/cvs-serv25474

Modified Files:
	Makefile cms_cfg.cc 
Log Message:
RTLMEM is not very often used, and it is somewhat problematic since it
depends on RTAI or RTLINUX so lets avoid having cms_cfg.cc use it unless
CMS_CFG_USE_RTLMEM is in the .def file or added to the make command line.


Index: Makefile
===================================================================
RCS file: /cvsroot/emc/rcslib/src/cms/Makefile,v
retrieving revision 4.48
retrieving revision 4.49
diff -C2 -d -r4.48 -r4.49
*** Makefile	7 May 2003 19:35:28 -0000	4.48
--- Makefile	23 Jun 2003 13:40:39 -0000	4.49
***************
*** 6,11 ****
  endif
  
  
- ifndef PLAT  
  include ../Makefile.rcs
  
--- 6,11 ----
  endif
  
+ ifndef PLAT
  
  include ../Makefile.rcs
  
***************
*** 44,118 ****
  SRCS = rtlnml.c
  
! OBJS = $(LIBCMS_OBJS)
  
  else
  
! HEADERS = cms.hh \
! 	cmsdiag.hh \
! 	nmldiag.hh \
! 	cms_cfg.hh \
! 	autokey.h \
! 	cms_user.hh \
! 	cms_up.hh \
! 	cms_xup.hh \
! 	cms_aup.hh \
! 	cms_xml_up.hh \
! 	nml.hh \
! 	nmlmsg.hh \
! 	globmem.hh \
! 	spinlock.h \
! 	shmem.hh \
! 	memsem.hh \
! 	rpc_host.hh \
! 	cms_srv.hh \
! 	nml_srv.hh \
! 	phantom.hh \
! 	perftype.hh \
! 	_physmem.h \
! 	physmem.hh \
! 	rem_msg.hh \
! 	rpc_srv.hh \
! 	tcp_srv.hh \
! 	http_srv.hh \
! 	tcpmem.hh \
! 	stcpmem.hh \
! 	xdr_msg.hh \
! 	tcp_opts.hh \
! 	udp_opts.hh \
! 	udpmem.hh \
! 	udp_srv.hh \
! 	sendmsgt.h \
! 	recvmsgt.h \
! 	recvn.h \
! 	sendn.h \
! 	msghdr.h \
! 	sokintrf.h \
! 	rpcintrf.h \
! 	windlg.h \
! 	dlgproc.h \
! 	nmlperf.hh \
! 	nmlwatch.h \
! 	locmem.hh \
! 	filemem.hh \
! 	cms_dup.hh \
! 	sendline.h \
! 	recvline.h \
! 	stcpsvr.hh \
! 	stcpopts.hh \
! 	gpioctl.h \
! 	mapmem.h \
! 	crypt2.hh \
! 	bbdmem.hh \
! 	bbd.h \
! 	bus_lock.h \
! 	dma.h \
! 	nmlqr.hh \
! 	bd_types.h \
! 	ttyintf.h \
! 	ttymem.hh \
! 	tty_srv.hh \
! 	rtlmem.hh \
! 	rtlnml.h
! 
  
  VXWORKS_SRCS = \
--- 44,52 ----
  SRCS = rtlnml.c
  
! OBJS = $(CMS_OBJS)
  
  else
  
! HEADERS = $(CMS_HEADERS)
  
  VXWORKS_SRCS = \
***************
*** 136,140 ****
  
  
! COMMON_SRCS =	cms.cc \
  	cmsdiag.cc \
  	nmldiag.cc \
--- 70,76 ----
  
  
! COMMON_SRCS =	\
! 	cms.cc \
! 	cms_datetime.cc \
  	cmsdiag.cc \
  	nmldiag.cc \
***************
*** 210,214 ****
  
  
! OBJS := $(LIBCMS_OBJS)
  
  endif
--- 146,150 ----
  
  
! OBJS := $(CMS_OBJS)
  
  endif
***************
*** 228,231 ****
--- 164,171 ----
  endif
  
+ ifdef CMS_CFG_USE_RTLMEM
+ LOCAL_CFLAGS += -DCMS_CFG_USE_RTLMEM
+ endif
+ 
  
  #Application Makefile for inclusion
***************
*** 274,278 ****
  
  $(DEVP_LIB_DIR)/libcms.o: \
! 	$(LIBCMS_OBJS:%=$(DEVP_LIB_DIR)/%)
  	$(LD) -r $^ -o $@
  
--- 214,218 ----
  
  $(DEVP_LIB_DIR)/libcms.o: \
! 	$(CMS_OBJS:%=$(DEVP_LIB_DIR)/%)
  	$(LD) -r $^ -o $@
  
***************
*** 424,431 ****
  iostest: $(DEVP_LIB_DIR)/iostest.o
  
- .PHONY: nmltest nmlcfg nmlperf perfsvr nmlclean iostest strtest nmlwatch \
- 	nmltest.tc nmlperf.tc perfsvr.tc nmlclean.tc nmlwatch.tc spintest \
- 	test_con tcpproxy nmlpwd
- 
  main: $(DEVP_BIN_DIR)/main
  
--- 364,367 ----
***************
*** 503,508 ****
--- 439,455 ----
  # ifdef PLAT
  
+ .PHONY: nmltest nmlcfg nmlperf perfsvr nmlclean iostest strtest nmlwatch \
+ 	nmltest.tc nmlperf.tc perfsvr.tc nmlclean.tc nmlwatch.tc spintest \
+ 	test_con tcpproxy nmlpwd
+ 
+ 
+ $(DEVP_BIN_DIR)/nmlsizes: nmlsizes.cc
+ 	$(CPLUSPLUS) -g  -I. -I.. -I../stg_clss -I../print -I../os_intf -I../posemath -I../node  $(CFLAGS) $(CPLUSPLUSFLAGS) $^ -o $@
  
+ nmlsizes: $(DEVP_BIN_DIR)/nmlsizes
+ 	-rm ./nmlsizes
+ 	-ln -s $(DEVP_BIN_DIR)/nmlsizes nmlsizes
  
+ .PHONY: nmlsizes
  
  

Index: cms_cfg.cc
===================================================================
RCS file: /cvsroot/emc/rcslib/src/cms/cms_cfg.cc,v
retrieving revision 4.42
retrieving revision 4.43
diff -C2 -d -r4.42 -r4.43
*** cms_cfg.cc	6 May 2003 15:18:13 -0000	4.42
--- cms_cfg.cc	23 Jun 2003 13:40:39 -0000	4.43
***************
*** 71,80 ****
  #endif
  
! #ifdef LINUX
! #if defined(HAVE_RTL) || defined(linux_rtai)
! #ifndef linux_2_0_36
! #include "rtlmem.hh"		// class RTLMEM
! #endif
  #endif
  #endif
  
--- 71,83 ----
  #endif
  
! 
! #ifdef CMS_CFG_USE_RTLMEM
! #if !defined(linux) || ( !defined(HAVE_RTL) && !defined(linux_rtai)) || defined(linux_2_0_36)
! #warning "CMS_CFG_USE_RTLMEM should not be set for this platform."
! #undef CMS_CFG_USE_RTLMEM
  #endif
+ 
+ #ifdef CMS_CFG_USE_RTLMEM
+ #include "rtlmem.hh"		// class RTLMEM
  #endif
  
***************
*** 1359,1365 ****
  	}
  #endif /* !__MSDOS__ */
! #ifdef LINUX
! #if defined(HAVE_RTL) || defined(linux_rtai)
! #ifndef linux_2_0_36
        if (!strcmp (buffer_type, "RTLMEM"))
  	{
--- 1362,1366 ----
  	}
  #endif /* !__MSDOS__ */
! #ifdef CMS_CFG_USE_RTLMEM
        if (!strcmp (buffer_type, "RTLMEM"))
  	{
***************
*** 1394,1399 ****
  	    }
  	}
- #endif
- #endif
  #endif
        if (!strcmp (buffer_type, "LOCMEM"))
--- 1395,1398 ----

[Emc-commit] documents/lyx Glossary.lyx,1.6,1.7

[<ray...@us...>]

Update of /cvsroot/emc/documents/lyx
In directory sc8-pr-cvs1:/tmp/cvs-serv27575

Modified Files:
	Glossary.lyx 
Log Message:
added kinematics from Sagar

Index: Glossary.lyx
===================================================================
RCS file: /cvsroot/emc/documents/lyx/Glossary.lyx,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Glossary.lyx	22 May 2003 21:53:45 -0000	1.6
--- Glossary.lyx	21 Jun 2003 16:07:56 -0000	1.7
***************
*** 40,46 ****
  rather than the standard style.
  It also uses each term as a Label so that one term can
! easily refer to another using a cross reference. 
! Cross references need a space ahead and after 
! so that they look good in the published documents. 
  \end_inset 
  
--- 40,46 ----
  rather than the standard style.
  It also uses each term as a Label so that one term can
! easily refer to another using a cross reference.
! Cross references need a space ahead and after
! so that they look good in the published documents.
  \end_inset 
  
***************
*** 88,92 ****
  \end_inset 
  
!  The amount of play or slop in a lead-screw 
  \begin_inset LatexCommand \ref{Leadscrew}
  
--- 88,93 ----
  \end_inset 
  
!  The amount of "play" or lost motion that occurs when direction is reversed
!  in a lead screw 
  \begin_inset LatexCommand \ref{Leadscrew}
  
***************
*** 94,97 ****
--- 95,118 ----
  
  .
+  or other mechanical motion driving system.
+  It can result from nuts that are loose on leadscrews, slippage in belts,
+  cable slack, "wind-up" in rotary couplings, and other places where the
+  mechanical system is not "tight".
+  Backlash will result in inaccurate motion, or in the case of motion caused
+  by external forces (think cutting tool pulling on the work piece) the result
+  can be broken cutting tools.
+  This can happen because of the sudden increase in chip load on the cutter
+  as the work piece is pulled across the backlash distance by the cutting
+  tool.
+  
+ \layout Description
+ 
+ Backlash_compensation - Any technique that attempts to reduce the effect
+  of backlash without actually removing it from the mechanical system.
+  This is typically done in software in the controller.
+  This can correct the final resting place of the part in motion but fails
+  to solve problems related to direction changes while in motion (think circular
+  interpolation) and motion that is caused when external forces (think cutting
+  tool pulling on the work piece) are the source of the motion.
  \layout Description
  
***************
*** 316,319 ****
--- 337,349 ----
  \layout Description
  
+ Joint_Coordinates:
+ \begin_inset LatexCommand \label{Joint_Coordinates}
+ 
+ \end_inset 
+ 
+  These specify the angles between the individual joints of the machine.\SpecialChar ~
+ Kinematics
+ \layout Description
+ 
  Jog Manually moving an axis of a machine.
   Jogging either moves the axis a fixed amount for each key-press, or moves
***************
*** 334,338 ****
--- 364,385 ----
  \end_inset 
  
+  The position relationship between world coordinates 
+ \begin_inset LatexCommand \ref{World_Coordinates}
+ 
+ \end_inset 
+ 
+  and joint coordinates 
+ \begin_inset LatexCommand \ref{Joint_Coordinates}
+ 
+ \end_inset 
  
+  of a machine.
+  There are two types of kinematics.
+  Forward kinematics is used to calculate world coordinates from joint coordinate
+ s.
+  Inverse kinematics is used for exactly opposite purpose.Note that kinematics
+  does not take into account, the forces, moments etc.
+  on the machine.
+  It is for positioning only.
  \layout Description
  
***************
*** 569,571 ****
--- 616,628 ----
  
   were written.
+ \layout Description
+ 
+ World_Coordinates:
+ \begin_inset LatexCommand \label{World_Coordinates}
+ 
+ \end_inset 
+ 
+  This is the absolute frame of reference.
+  It gives coordinates in terms of a fixed reference frame that is attached
+  to some point (generally the base) of the machine tool.
  \the_end

[Emc-commit] rcslib/src Makefile,4.78,4.79

[<ms...@us...>]

Update of /cvsroot/emc/rcslib/src
In directory sc8-pr-cvs1:/tmp/cvs-serv30895/src

Modified Files:
	Makefile 
Log Message:
Commented out a line in rcslib/src/Makefile (no rule to build test.o)

Index: Makefile
===================================================================
RCS file: /cvsroot/emc/rcslib/src/Makefile,v
retrieving revision 4.78
retrieving revision 4.79
diff -C2 -d -r4.78 -r4.79
*** Makefile	20 Jun 2003 13:48:42 -0000	4.78
--- Makefile	20 Jun 2003 20:41:37 -0000	4.79
***************
*** 913,917 ****
  .PHONY: librcs archive archive_plat archive_src
  
! test: $(DEVP_LIB_DIR)/test.o
  
  memtest: $(DEVP_LIB_DIR)/memtest.o
--- 913,918 ----
  .PHONY: librcs archive archive_plat archive_src
  
! # 20JUN03 MGS commented out this line because make complains that there's no rule to make test.o
! #test: $(DEVP_LIB_DIR)/test.o
  
  memtest: $(DEVP_LIB_DIR)/memtest.o

[Emc-commit] rcslib/etc platname,1.30,1.31 rtlinuxdir.sh,1.1,1.2 tcltklibflags.sh,1.3,1.4 tcltkincflags.sh,1.3,1.4 havertai.sh,1.1,1.2 havertlinux.sh,1.5,1.6 rtaidir,1.4,1.5

[<emc...@li...>]

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`

[Emc-commit] rcslib/src Makefile,4.77,4.78

[<emc...@li...>]

Update of /cvsroot/emc/rcslib/src
In directory sc8-pr-cvs1:/tmp/cvs-serv22005

Modified Files:
	Makefile 
Log Message:
should eliminate the harmless errors that are shown about .depend.lists not
existing the first time the make is run
adds a phony target to delete .??_guess_warn_files


Index: Makefile
===================================================================
RCS file: /cvsroot/emc/rcslib/src/Makefile,v
retrieving revision 4.77
retrieving revision 4.78
diff -C2 -d -r4.77 -r4.78
*** Makefile	15 May 2003 16:41:46 -0000	4.77
--- Makefile	20 Jun 2003 13:48:42 -0000	4.78
***************
*** 11,20 ****
  SRCS =  rcsvers.c
  
- x:=$(shell rm /tmp/rcslibmake.log)
- x:=$(shell date >/tmp/rcslibmake.log)
- x:=$(shell chmod a+rw /tmp/rcslibmake.log)
- x:=$(shell echo PLAT=$(PLAT)  >>/tmp/rcslibmake.log )
- x:=$(shell echo MAKE=$(MAKE) MAKEFLAGS=\"$(MAKEFLAGS)\" MAKECMDGOALS=\"$(MAKECMDGOALS)\" CURDIR=\"$(CURDIR)\"  >>/tmp/rcslibmake.log )
- 
  ifneq (java, $(findstring java, $(PLAT)))
  ifneq (rtlinux, $(findstring rtlinux, $(PLAT)))
--- 11,14 ----
***************
*** 37,46 ****
  endif
  
- x:=$(shell echo HAVE_RTAI=$(HAVE_RTAI) HAVE_RTLINUX=$(HAVE_RTLINUX) >>/tmp/rcslibmake.log  )
- 
  ifneq (YES, $(HAVE_RTLINUX))
  ifneq (YES, $(HAVE_RTAI))
  NO_RTL=1
- x:=$(shell echo setting NO_RTL=1 >>/tmp/rcslibmake.log )
  endif
  endif
--- 31,37 ----
***************
*** 49,54 ****
  endif
  
- x:=$(shell echo NO_RTL=$(NO_RTL) >>/tmp/rcslibmake.log )
- 
  # Include definitions of LIBRCS_OBJS
  include print/Makefile.lib
--- 40,43 ----
***************
*** 68,77 ****
  
  nt_xdr_make_all:
! 	$(MAKE) -C nt_xdr all
  
  .PHONY: nt_xdr_make_all
  
  nt_xdr_make_headers:
! 	$(MAKE) -C nt_xdr headers
  
  endif
--- 57,66 ----
  
  nt_xdr_make_all:
! 	$(MAKE) PLAT=$(PLAT) -C nt_xdr all
  
  .PHONY: nt_xdr_make_all
  
  nt_xdr_make_headers:
! 	$(MAKE) PLAT=$(PLAT) -C nt_xdr headers
  
  endif
***************
*** 84,89 ****
  LIBRCS_OBJS := $(LIBRCS_OBJS)
  
- x:=$(shell echo LIBRCS_OBJS=\"$(LIBRCS_OBJS)\" >>/tmp/rcslibmake.log )
- 
  # Declare which files are to be released.
  
--- 73,76 ----
***************
*** 229,233 ****
  
  delete clean depend sources headers:
! 	(cd java; $(MAKE) $(MFLAGS)  COMPILE_TOGETHER=1 $@;)
  
  else
--- 216,220 ----
  
  delete clean depend sources headers:
! 	(cd java; $(MAKE) PLAT=$(PLAT) $(MFLAGS)  COMPILE_TOGETHER=1 $@;)
  
  else
***************
*** 237,242 ****
  
  delete clean depend sources headers release_headers:
! 	(cd posemath; $(MAKE) $@ $(MFLAGS);)
! 	(cd cms; $(MAKE) $@ $(MFLAGS);)
  
  
--- 224,229 ----
  
  delete clean depend sources headers release_headers:
! 	(cd posemath; $(MAKE) PLAT=$(PLAT) $@ $(MFLAGS);)
! 	(cd cms; $(MAKE) PLAT=$(PLAT) $@ $(MFLAGS);)
  
  
***************
*** 248,253 ****
  
  delete clean depend sources headers:
! 	(cd posemath; $(MAKE) $@ $(MFLAGS);)
! 	(cd cms; $(MAKE) $@ $(MFLAGS);)
  
  
--- 235,240 ----
  
  delete clean depend sources headers:
! 	(cd posemath; $(MAKE) PLAT=$(PLAT) $@ $(MFLAGS);)
! 	(cd cms; $(MAKE) PLAT=$(PLAT) $@ $(MFLAGS);)
  
  
***************
*** 259,269 ****
  
  delete clean sources headers:
! 	(cd nt_xdr; $(MAKE) $@ $(MFLAGS);)
! 	(cd stg_clss; $(MAKE) $@ $(MFLAGS);)
! 	(cd print; $(MAKE) $@ $(MFLAGS);)
! 	(cd os_intf; $(MAKE) $@ $(MFLAGS);)
! 	(cd posemath; $(MAKE) $@ $(MFLAGS);)
! 	(cd cms; $(MAKE) $(MFLAGS)  $@;)
! 	(cd node; $(MAKE) $(MFLAGS)  $@;)
  
  else
--- 246,256 ----
  
  delete clean sources headers:
! 	(cd nt_xdr; $(MAKE) PLAT=$(PLAT) $@ $(MFLAGS);)
! 	(cd stg_clss; $(MAKE) PLAT=$(PLAT) $@ $(MFLAGS);)
! 	(cd print; $(MAKE) PLAT=$(PLAT) $@ $(MFLAGS);)
! 	(cd os_intf; $(MAKE) PLAT=$(PLAT) $@ $(MFLAGS);)
! 	(cd posemath; $(MAKE) PLAT=$(PLAT) $@ $(MFLAGS);)
! 	(cd cms; $(MAKE) PLAT=$(PLAT) $(MFLAGS)  $@;)
! 	(cd node; $(MAKE) PLAT=$(PLAT) $(MFLAGS)  $@;)
  
  else
***************
*** 271,280 ****
  
  delete clean:
! 	$(MAKE) -C stg_clss $@
! 	$(MAKE) -C print $@
! 	$(MAKE) -C posemath $@
! 	$(MAKE) -C os_intf $@
! 	$(MAKE) -C cms $@
! 	$(MAKE) -C node $@
  
  # ! win
--- 258,267 ----
  
  delete clean:
! 	$(MAKE) PLAT=$(PLAT) -C stg_clss $@
! 	$(MAKE) PLAT=$(PLAT) -C print $@
! 	$(MAKE) PLAT=$(PLAT) -C posemath $@
! 	$(MAKE) PLAT=$(PLAT) -C os_intf $@
! 	$(MAKE) PLAT=$(PLAT) -C cms $@
! 	$(MAKE) PLAT=$(PLAT) -C node $@
  
  # ! win
***************
*** 312,317 ****
  
  install:
! 	(cd java; $(MAKE) $(MFLAGS) COMPILE_TOGETHER=1 $@;)
! 	($(MAKE) $(MFLAGS) archive)
  
  
--- 299,304 ----
  
  install:
! 	(cd java; $(MAKE) PLAT=$(PLAT) $(MFLAGS) COMPILE_TOGETHER=1 $@;)
! 	($(MAKE) PLAT=$(PLAT) $(MFLAGS) archive)
  
  
***************
*** 325,331 ****
  
  install:
! 	(cd posemath; $(MAKE) $@ $(MFLAGS);)
! 	(cd cms; $(MAKE) $@ $(MFLAGS);)
! 	($(MAKE) $(MFLAGS) archive)
  
  
--- 312,318 ----
  
  install:
! 	(cd posemath; $(MAKE) PLAT=$(PLAT) $@ $(MFLAGS);)
! 	(cd cms; $(MAKE) PLAT=$(PLAT) $@ $(MFLAGS);)
! 	($(MAKE) PLAT=$(PLAT) $(MFLAGS) archive)
  
  
***************
*** 337,343 ****
  
  install:
! 	(cd posemath; $(MAKE) $@ $(MFLAGS);)
! 	(cd cms; $(MAKE) $@ $(MFLAGS);)
! 	($(MAKE) $(MFLAGS) archive)
  
  
--- 324,330 ----
  
  install:
! 	(cd posemath; $(MAKE) PLAT=$(PLAT) $@ $(MFLAGS);)
! 	(cd cms; $(MAKE) PLAT=$(PLAT) $@ $(MFLAGS);)
! 	($(MAKE) PLAT=$(PLAT) $(MFLAGS) archive)
  
  
***************
*** 348,361 ****
  
  install:
! 	(cd stg_clss; $(MAKE) $@ $(MFLAGS);)
! 	(cd print; $(MAKE) $@ $(MFLAGS);)
! 	(cd os_intf; $(MAKE) $@ $(MFLAGS);)
! 	(cd posemath; $(MAKE) $@ $(MFLAGS);)
! 	(cd cms; $(MAKE) $@ $(MFLAGS);)
! 	(cd node; $(MAKE) $@ $(MFLAGS);)
! 	(cd pcio; $(MAKE) $@ $(MFLAGS);)
! 	(cd pmac; $(MAKE) $@ $(MFLAGS);)
  	(if [ ! -f $(RELEASE_LIB_DIR)/libwww.$(DYNAMIC_LIB_EXTENSION) ] ; then \
! 		cd w3c; $(MAKE) $@ $(MFLAGS); \
  	fi;)
  
--- 335,348 ----
  
  install:
! 	(cd stg_clss; $(MAKE) PLAT=$(PLAT) $@ $(MFLAGS);)
! 	(cd print; $(MAKE) PLAT=$(PLAT) $@ $(MFLAGS);)
! 	(cd os_intf; $(MAKE) PLAT=$(PLAT) $@ $(MFLAGS);)
! 	(cd posemath; $(MAKE) PLAT=$(PLAT) $@ $(MFLAGS);)
! 	(cd cms; $(MAKE) PLAT=$(PLAT) $@ $(MFLAGS);)
! 	(cd node; $(MAKE) PLAT=$(PLAT) $@ $(MFLAGS);)
! 	(cd pcio; $(MAKE) PLAT=$(PLAT) $@ $(MFLAGS);)
! 	(cd pmac; $(MAKE) PLAT=$(PLAT) $@ $(MFLAGS);)
  	(if [ ! -f $(RELEASE_LIB_DIR)/libwww.$(DYNAMIC_LIB_EXTENSION) ] ; then \
! 		cd w3c; $(MAKE) PLAT=$(PLAT) $@ $(MFLAGS); \
  	fi;)
  
***************
*** 366,376 ****
  
  install:
! 	(cd nt_xdr; $(MAKE) $@  $(MFLAGS);)
! 	(cd stg_clss; $(MAKE) $@ $(MFLAGS);)
! 	(cd print; $(MAKE) $@ $(MFLAGS);)
! 	(cd os_intf; $(MAKE) $@ $(MFLAGS);)
! 	(cd posemath; $(MAKE) $@ $(MFLAGS);)
! 	(cd cms; $(MAKE) $@ $(MFLAGS);)
! 	(cd node; $(MAKE) $@ $(MFLAGS);)
  
  # win
--- 353,363 ----
  
  install:
! 	(cd nt_xdr; $(MAKE) PLAT=$(PLAT) $@  $(MFLAGS);)
! 	(cd stg_clss; $(MAKE) PLAT=$(PLAT) $@ $(MFLAGS);)
! 	(cd print; $(MAKE) PLAT=$(PLAT) $@ $(MFLAGS);)
! 	(cd os_intf; $(MAKE) PLAT=$(PLAT) $@ $(MFLAGS);)
! 	(cd posemath; $(MAKE) PLAT=$(PLAT) $@ $(MFLAGS);)
! 	(cd cms; $(MAKE) PLAT=$(PLAT) $@ $(MFLAGS);)
! 	(cd node; $(MAKE) PLAT=$(PLAT) $@ $(MFLAGS);)
  
  # win
***************
*** 378,389 ****
  
  install:
! 	(cd stg_clss; $(MAKE) install $(MFLAGS)  ;)
! 	(cd print; $(MAKE) install $(MFLAGS);)
! 	(cd os_intf; $(MAKE) install $(MFLAGS);)
! 	(cd posemath; $(MAKE) install $(MFLAGS);)
! 	(cd cms; $(MAKE) install $(MFLAGS);)
! 	(cd node; $(MAKE) install  $(MFLAGS);)
  	(if [ ! -f $(RELEASE_LIB_DIR)/libwww.$(DYNAMIC_LIB_EXTENSION) ] ; then \
! 		cd w3c; $(MAKE) headers sources depend all install $(MFLAGS); \
  	fi;)
  
--- 365,376 ----
  
  install:
! 	(cd stg_clss; $(MAKE) PLAT=$(PLAT) install $(MFLAGS)  ;)
! 	(cd print; $(MAKE) PLAT=$(PLAT) install $(MFLAGS);)
! 	(cd os_intf; $(MAKE) PLAT=$(PLAT) install $(MFLAGS);)
! 	(cd posemath; $(MAKE) PLAT=$(PLAT) install $(MFLAGS);)
! 	(cd cms; $(MAKE) PLAT=$(PLAT) install $(MFLAGS);)
! 	(cd node; $(MAKE) PLAT=$(PLAT) install  $(MFLAGS);)
  	(if [ ! -f $(RELEASE_LIB_DIR)/libwww.$(DYNAMIC_LIB_EXTENSION) ] ; then \
! 		cd w3c; $(MAKE) PLAT=$(PLAT) headers sources depend all install $(MFLAGS); \
  	fi;)
  
***************
*** 412,416 ****
  
  install:
! 	(cd java; $(MAKE) $(MFLAGS) COMPILE_TOGETHER=1 $@;)
  
  # java
--- 399,403 ----
  
  install:
! 	(cd java; $(MAKE) PLAT=$(PLAT) $(MFLAGS) COMPILE_TOGETHER=1 $@;)
  
  # java
***************
*** 421,426 ****
  
  install:
! 	(cd posemath; $(MAKE) $@ $(MFLAGS);)
! 	(cd cms; $(MAKE) $@ $(MFLAGS);)
  
  # rtlinux
--- 408,413 ----
  
  install:
! 	(cd posemath; $(MAKE) PLAT=$(PLAT) $@ $(MFLAGS);)
! 	(cd cms; $(MAKE) PLAT=$(PLAT) $@ $(MFLAGS);)
  
  # rtlinux
***************
*** 430,435 ****
  
  install:
! 	(cd posemath; $(MAKE) $@ $(MFLAGS);)
! 	(cd cms; $(MAKE) $@ $(MFLAGS);)
  
  # rtai
--- 417,422 ----
  
  install:
! 	(cd posemath; $(MAKE) PLAT=$(PLAT) $@ $(MFLAGS);)
! 	(cd cms; $(MAKE) PLAT=$(PLAT) $@ $(MFLAGS);)
  
  # rtai
***************
*** 439,450 ****
  
  install:
! 	(cd stg_clss; $(MAKE) $(MFLAGS)  $@;)
! 	(cd print; $(MAKE) $@ $(MFLAGS);)
! 	(cd os_intf; $(MAKE) $@ $(MFLAGS);)
! 	(cd posemath; $(MAKE) $@ $(MFLAGS);)
! 	(cd cms; $(MAKE) $(MFLAGS)  $@;)
! 	(cd node; $(MAKE) $@ $(MFLAGS);)
! 	(cd pcio; $(MAKE) $@ $(MFLAGS);)
! 	(cd pmac; $(MAKE) $@ $(MFLAGS);)
  
  # lynx
--- 426,437 ----
  
  install:
! 	(cd stg_clss; $(MAKE) PLAT=$(PLAT) $(MFLAGS)  $@;)
! 	(cd print; $(MAKE) PLAT=$(PLAT) $@ $(MFLAGS);)
! 	(cd os_intf; $(MAKE) PLAT=$(PLAT) $@ $(MFLAGS);)
! 	(cd posemath; $(MAKE) PLAT=$(PLAT) $@ $(MFLAGS);)
! 	(cd cms; $(MAKE) PLAT=$(PLAT) $(MFLAGS)  $@;)
! 	(cd node; $(MAKE) PLAT=$(PLAT) $@ $(MFLAGS);)
! 	(cd pcio; $(MAKE) PLAT=$(PLAT) $@ $(MFLAGS);)
! 	(cd pmac; $(MAKE) PLAT=$(PLAT) $@ $(MFLAGS);)
  
  # lynx
***************
*** 454,464 ****
  
  install:
! 	(cd nt_xdr; $(MAKE) $(MFLAGS)  $@;)
! 	(cd stg_clss; $(MAKE) $(MFLAGS)  $@;)
! 	(cd print; $(MAKE) $@ $(MFLAGS);)
! 	(cd os_intf; $(MAKE) $@ $(MFLAGS);)
! 	(cd posemath; $(MAKE) $@ $(MFLAGS);)
! 	(cd cms; $(MAKE) $(MFLAGS)  $@;)
! 	(cd node; $(MAKE) $@ $(MFLAGS);)
  
  # win
--- 441,451 ----
  
  install:
! 	(cd nt_xdr; $(MAKE) PLAT=$(PLAT) $(MFLAGS)  $@;)
! 	(cd stg_clss; $(MAKE) PLAT=$(PLAT) $(MFLAGS)  $@;)
! 	(cd print; $(MAKE) PLAT=$(PLAT) $@ $(MFLAGS);)
! 	(cd os_intf; $(MAKE) PLAT=$(PLAT) $@ $(MFLAGS);)
! 	(cd posemath; $(MAKE) PLAT=$(PLAT) $@ $(MFLAGS);)
! 	(cd cms; $(MAKE) PLAT=$(PLAT) $(MFLAGS)  $@;)
! 	(cd node; $(MAKE) PLAT=$(PLAT) $@ $(MFLAGS);)
  
  # win
***************
*** 466,475 ****
  
  install:
! 	(cd stg_clss; $(MAKE) $(MFLAGS)  $@;)
! 	(cd print; $(MAKE) $@ $(MFLAGS);)
! 	(cd os_intf; $(MAKE) $@ $(MFLAGS);)
! 	(cd posemath; $(MAKE) $@ $(MFLAGS);)
! 	(cd cms; $(MAKE) $@ $(MFLAGS);)
! 	(cd node; $(MAKE) $@ $(MFLAGS);)
  
  # win
--- 453,462 ----
  
  install:
! 	(cd stg_clss; $(MAKE) PLAT=$(PLAT) $(MFLAGS)  $@;)
! 	(cd print; $(MAKE) PLAT=$(PLAT) $@ $(MFLAGS);)
! 	(cd os_intf; $(MAKE) PLAT=$(PLAT) $@ $(MFLAGS);)
! 	(cd posemath; $(MAKE) PLAT=$(PLAT) $@ $(MFLAGS);)
! 	(cd cms; $(MAKE) PLAT=$(PLAT) $@ $(MFLAGS);)
! 	(cd node; $(MAKE) PLAT=$(PLAT) $@ $(MFLAGS);)
  
  # win
***************
*** 494,498 ****
  
  post_install_only: sendmail
! 	($(MAKE) $(MFLAGS)  archive)
  
  .PHONY: post_install_only
--- 481,485 ----
  
  post_install_only: sendmail
! 	($(MAKE) PLAT=$(PLAT) $(MFLAGS)  archive)
  
  .PHONY: post_install_only
***************
*** 523,528 ****
  
  archive:
! 	-($(MAKE) $(MFLAGS)  archive_plat)
! 	-($(MAKE) $(MFLAGS)  archive_src)
  
  ifdef PLAT
--- 510,515 ----
  
  archive:
! 	-($(MAKE) PLAT=$(PLAT) $(MFLAGS)  archive_plat)
! 	-($(MAKE) PLAT=$(PLAT) $(MFLAGS)  archive_src)
  
  ifdef PLAT
***************
*** 693,697 ****
  
  all:
! 	(cd java; $(MAKE) $(MFLAGS) COMPILE_TOGETHER=1 $@;)
  
  else
--- 680,684 ----
  
  all:
! 	(cd java; $(MAKE) PLAT=$(PLAT) $(MFLAGS) COMPILE_TOGETHER=1 $@;)
  
  else
***************
*** 724,733 ****
  
  all:
! 	(cd cms; $(MAKE) $(MFLAGS)  nmlcfg nmlperf perfsvr nmltest tcpproxy;)
  
  else
  
  all:
! 	(cd cms; $(MAKE) $(MFLAGS)  nmlcfg nmlperf perfsvr nmltest tcpproxy;)
  	-(cd $(DEVP_DIR) ; \rm -f rcslib_$(PLAT).zip;  \
  	zip rcslib_$(PLAT).zip include/* src/* lib/librcs.a \
--- 711,720 ----
  
  all:
! 	(cd cms; $(MAKE) PLAT=$(PLAT) $(MFLAGS) PLAT=$(PLAT)  nmlcfg nmlclean nmlperf perfsvr nmltest tcpproxy;)
  
  else
  
  all:
! 	(cd cms; $(MAKE) PLAT=$(PLAT) $(MFLAGS) PLAT=$(PLAT)  nmlcfg nmlclean nmlperf perfsvr nmltest tcpproxy;)
  	-(cd $(DEVP_DIR) ; \rm -f rcslib_$(PLAT).zip;  \
  	zip rcslib_$(PLAT).zip include/* src/* lib/librcs.a \
***************
*** 958,962 ****
  ifneq (rtai, $(PLAT))
  
! $(DEVP_LIB_DIR)/rcsvers.o:  $(DEVP_DIR)/.stg_clssbuild $(DEVP_DIR)/.printbuild $(DEVP_DIR)/.posemathbuild $(DEVP_DIR)/.os_intfbuild $(DEVP_DIR)/.cmsbuild $(DEVP_DIR)/.nodebuild
  
  
--- 945,949 ----
  ifneq (rtai, $(PLAT))
  
! $(DEVP_LIB_DIR)/rcsvers.o:  $(DEVP_DIR)/.stg_clssbuild $(DEVP_DIR)/.printbuild $(DEVP_DIR)/.posemathbuild $(DEVP_DIR)/.os_intfbuild $(DEVP_DIR)/.cmsbuild $(DEVP_DIR)/.nodebuild $(DEVP_DIR)/.nodeheaders $(DEVP_DIR)/.stg_clssheaders $(DEVP_DIR)/.printheaders $(DEVP_DIR)/.cmsheaders $(DEVP_DIR)/.os_intfheaders
  
  
***************
*** 979,993 ****
  ifneq (java, $(findstring java, $(PLAT)))
  
- ALLHEADERS = $(shell find . -type f -a '(' -name \*.h -o -name \*.hh ')' )
- 
  headers: $(DEVP_DIR)/.headersbuild
  
! $(DEVP_DIR)/.headersbuild: $(ALLHEADERS)
! 	$(MAKE) -C stg_clss headers
! 	$(MAKE) -C print headers
! 	$(MAKE) -C posemath headers
! 	$(MAKE) -C os_intf headers
! 	$(MAKE) -C cms headers
! 	$(MAKE) -C node headers
  	touch $@
  
--- 966,972 ----
  ifneq (java, $(findstring java, $(PLAT)))
  
  headers: $(DEVP_DIR)/.headersbuild
  
! $(DEVP_DIR)/.headersbuild: 
  	touch $@
  
***************
*** 1002,1035 ****
  
  $(DEVP_DIR)/.stg_clssbuild : $(DEVP_DIR)/.headersbuild
- 	$(MAKE) -C stg_clss
  	touch $@
  
  
! 
! $(DEVP_DIR)/.printbuild : $(DEVP_DIR)/.headersbuild
! 	$(MAKE) -C print
! 	 touch $@
  
  
  $(DEVP_DIR)/.os_intfbuild : $(DEVP_DIR)/.headersbuild
- 	$(MAKE) -C os_intf
  	touch $@
  
  
  $(DEVP_DIR)/.posemathbuild : $(DEVP_DIR)/.headersbuild
- 	$(MAKE) -C posemath
  	touch $@
  
  
  
  $(DEVP_DIR)/.cmsbuild : $(DEVP_DIR)/.headersbuild
- 	$(MAKE) -C cms
  	touch $@
  
  
  $(DEVP_DIR)/.nodebuild : $(DEVP_DIR)/.headersbuild
- 	$(MAKE) -C node
  	touch $@
  
  
  
--- 981,1014 ----
  
  $(DEVP_DIR)/.stg_clssbuild : $(DEVP_DIR)/.headersbuild
  	touch $@
+ 	$(MAKE) PLAT=$(PLAT) -C stg_clss
  
  
! $(DEVP_DIR)/.printbuild : $(DEVP_DIR)/.headersbuild 
! 	touch $@
! 	$(MAKE) PLAT=$(PLAT) -C print
  
  
  $(DEVP_DIR)/.os_intfbuild : $(DEVP_DIR)/.headersbuild
  	touch $@
+ 	$(MAKE) PLAT=$(PLAT) -C os_intf
  
  
  $(DEVP_DIR)/.posemathbuild : $(DEVP_DIR)/.headersbuild
  	touch $@
+ 	$(MAKE) PLAT=$(PLAT) -C posemath
  
  
  
  $(DEVP_DIR)/.cmsbuild : $(DEVP_DIR)/.headersbuild
  	touch $@
+ 	$(MAKE) PLAT=$(PLAT) -C cms
  
  
  $(DEVP_DIR)/.nodebuild : $(DEVP_DIR)/.headersbuild
  	touch $@
+ 	$(MAKE) PLAT=$(PLAT) -C node
  
+ .DELETE_ON_ERROR: $(DEVP_DIR)/.printbuild  $(DEVP_DIR)/.os_intfbuild  $(DEVP_DIR)/.posemathbuid  $(DEVP_DIR)/.cmsbuild  $(DEVP_DIR)/.nodebuild
  
  
***************
*** 1058,1067 ****
  
  $(DEVP_DIR)/.dependbuild:  $(DEVP_DIR)/.sourcesbuild $(DEVP_DIR)/.headersbuild
! 	$(MAKE) -C stg_clss depend
! 	$(MAKE) -C print depend
! 	$(MAKE) -C posemath depend
! 	$(MAKE) -C os_intf depend
! 	$(MAKE) -C cms depend
! 	$(MAKE) -C node depend
  	-\rm .cleandepend
  	touch $@
--- 1037,1046 ----
  
  $(DEVP_DIR)/.dependbuild:  $(DEVP_DIR)/.sourcesbuild $(DEVP_DIR)/.headersbuild
! 	$(MAKE) PLAT=$(PLAT) -C stg_clss depend
! 	$(MAKE) PLAT=$(PLAT) -C print depend
! 	$(MAKE) PLAT=$(PLAT) -C posemath depend
! 	$(MAKE) PLAT=$(PLAT) -C os_intf depend
! 	$(MAKE) PLAT=$(PLAT) -C cms depend
! 	$(MAKE) PLAT=$(PLAT) -C node depend
  	-\rm .cleandepend
  	touch $@
***************
*** 1071,1080 ****
  
  $(DEVP_DIR)/.sourcesbuild: 
! 	$(MAKE) -C stg_clss sources
! 	$(MAKE) -C print sources
! 	$(MAKE) -C posemath sources
! 	$(MAKE) -C os_intf sources
! 	$(MAKE) -C cms sources
! 	$(MAKE) -C node sources
  	-\rm .cleandepend
  	touch $@
--- 1050,1059 ----
  
  $(DEVP_DIR)/.sourcesbuild: 
! 	$(MAKE) PLAT=$(PLAT) -C stg_clss sources
! 	$(MAKE) PLAT=$(PLAT) -C print sources
! 	$(MAKE) PLAT=$(PLAT) -C posemath sources
! 	$(MAKE) PLAT=$(PLAT) -C os_intf sources
! 	$(MAKE) PLAT=$(PLAT) -C cms sources
! 	$(MAKE) PLAT=$(PLAT) -C node sources
  	-\rm .cleandepend
  	touch $@
***************
*** 1087,1091 ****
  
  cleanbuild:
! 	\rm -f $(DEVP_DIR)/.??*build
  
  
--- 1066,1077 ----
  
  cleanbuild:
! 	-\rm -f $(DEVP_DIR)/.??*build
! 	-\rm -f $(DEVP_DIR)/.??*headers
! 	-\rm -f $(DEVP_LIB_DIR)/rcsvers.o
! 	-\rm -f $(DEVP_INCLUDE_DIR)/rcs.hh
! 	-\rm -f $(DEVP_INCLUDE_DIR)/rcs_defs.hh
! 	-\rm -f $(DEVP_LIB_DIR)/librcs.a
! 	-\rm -f $(DEVP_LIB_DIR)/librcs*.so*
! 
  
  
***************
*** 1095,1118 ****
  
  
! .depend.lists: make_depend_lists
! depend: make_depend_lists
  
- .PHONY: make_depend_lists
  
! make_depend_lists:
! 	-$(ECHO_MARK) \rm .depend.lists
  	-$(ECHO_MARK) touch .depend.lists
  	-$(ECHO_MARK) find . -type f -a '(' -name \*.c -o -name \*.cc ')' 2>/dev/null | awk '{printf("$$(DEVP_DIR)/.sourcesbuild: %s\n",$$1);}' >>.depend.lists
! 	-$(ECHO_MARK) find . -type f -a '(' \*.h -o -name \*.hh ')' 2>/dev/null | awk '{printf("$$(DEVP_DIR)/.headersbuild: %s\n",$$1);}' >>.depend.lists
! 	-$(ECHO_MARK) find cms -type f -a '(' -name \*.h -o -name \*.hh -o -name Make\* -o -name \*.c -o -name \*.cc ')' 2>/dev/null | awk '{printf("$$(DEVP_DIR)/.cmsbuild: %s\n",$$1);}' >>.depend.lists
! 	-$(ECHO_MARK) find posemath -type f -a '(' -name \*.h -o -name \*.hh -o -name Make\* -o -name \*.c -o -name \*.cc ')' 2>/dev/null | awk '{printf("$$(DEVP_DIR)/.posemathbuild: %s\n",$$1);}' >>.depend.lists
! 	-$(ECHO_MARK) find node -type f -a '(' -name \*.h -o -name \*.hh -o -name Make\* -o -name \*.c -o -name \*.cc ')' 2>/dev/null | awk '{printf("$$(DEVP_DIR)/.nodebuild: %s\n",$$1);}' >>.depend.lists
! 	-$(ECHO_MARK) find os_intf -type f -a '(' -name \*.h -o -name \*.hh -o -name Make\* -o -name \*.c -o -name \*.cc ')' 2>/dev/null | awk '{printf("$$(DEVP_DIR)/.os_intfbuild: %s\n",$$1);}' >>.depend.lists
! 	-$(ECHO_MARK) find print -type f -a '(' -name \*.h -o -name \*.hh -o -name Make\* -o -name \*.c -o -name \*.cc ')' 2>/dev/null | awk '{printf("$$(DEVP_DIR)/.printbuild: %s\n",$$1);}' >>.depend.lists
! 	-$(ECHO_MARK) find stg_clss -type f -a '(' -name \*.h -o -name \*.hh -o -name Make\* -o -name \*.c -o -name \*.cc ')' 2>/dev/null  | awk '{printf("$$(DEVP_DIR)/.stg_clssbuild: %s\n",$$1);}' >>.depend.lists
  
  
  
- include .depend.lists
  
  
--- 1081,1230 ----
  
  
! depend: .depend.lists
  
  
! .DELETE_ON_ERROR: .depend.lists
! 
! .depend.lists: $(ALLFILES)
! 	-$(ECHO_MARK) if test -f .depend.lists ; then \rm .depend.lists >/dev/null 2>/dev/null ; fi
  	-$(ECHO_MARK) touch .depend.lists
  	-$(ECHO_MARK) find . -type f -a '(' -name \*.c -o -name \*.cc ')' 2>/dev/null | awk '{printf("$$(DEVP_DIR)/.sourcesbuild: %s\n",$$1);}' >>.depend.lists
! 	-$(ECHO_MARK) find . -type f -a '(' -name \*.h -o -name \*.hh ')' 2>/dev/null | awk '{printf("$$(DEVP_DIR)/.headersbuild: %s\n",$$1);}' >>.depend.lists
! 	-$(ECHO_MARK) find cms -type f -a '(' -name \*.h -o -name \*.hh -o \( -name Make\* -a -not -name \*~\* \)  -o -name \*.c -o -name \*.cc ')' 2>/dev/null | awk '{printf("$$(DEVP_DIR)/.cmsbuild: %s\n",$$1);}' >>.depend.lists
! 	-$(ECHO_MARK) find posemath -type f -a '(' -name \*.h -o -name \*.hh -o \( -name Make\* -a -not -name \*~\* \)  -o -name \*.c -o -name \*.cc ')' 2>/dev/null | awk '{printf("$$(DEVP_DIR)/.posemathbuild: %s\n",$$1);}' >>.depend.lists
! 	-$(ECHO_MARK) find node -type f -a '(' -name \*.h -o -name \*.hh -o \( -name Make\* -a -not -name \*~\* \)  -o -name \*.c -o -name \*.cc ')' 2>/dev/null | awk '{printf("$$(DEVP_DIR)/.nodebuild: %s\n",$$1);}' >>.depend.lists
! 	-$(ECHO_MARK) find os_intf -type f -a '(' -name \*.h -o -name \*.hh -o \( -name Make\* -a -not -name \*~\* \)  -o -name \*.c -o -name \*.cc ')' 2>/dev/null | awk '{printf("$$(DEVP_DIR)/.os_intfbuild: %s\n",$$1);}' >>.depend.lists
! 	-$(ECHO_MARK) find print -type f -a '(' -name \*.h -o -name \*.hh -o \( -name Make\* -a -not -name \*~\* \)  -o -name \*.c -o -name \*.cc ')' 2>/dev/null | awk '{printf("$$(DEVP_DIR)/.printbuild: %s\n",$$1);}' >>.depend.lists
! 	-$(ECHO_MARK) find stg_clss -type f -a '(' -name \*.h -o -name \*.hh -o \( -name Make\* -a -not -name \*~\* \)  -o -name \*.c -o -name \*.cc ')' 2>/dev/null  | awk '{printf("$$(DEVP_DIR)/.stg_clssbuild: %s\n",$$1);}' >>.depend.lists
  
+ ifeq (YES, $(shell if test -f .depend.lists ; then echo YES ; fi))
+ include .depend.lists
+ endif
  
+ $(DEVP_DIR)/.os_intfheaders: $(OS_INTF_HEADERS:%=os_intf/%)
+ 	touch $@
+ 	$(MAKE) PLAT=$(PLAT) -C os_intf headers
+ 
+ $(DEVP_DIR)/.cmsheaders: $(CMS_HEADERS:%=cms/%)*
+ 	touch $@
+ 	$(MAKE) PLAT=$(PLAT) -C cms  headers
+ 
+ 
+ $(DEVP_DIR)/.stg_clssheaders : $(STG_CLSS_HEADERS:%=stg_clss/%)
+ 	touch $@
+ 	$(MAKE) PLAT=$(PLAT) -C stg_clss headers
+ 
+ 
+ $(DEVP_DIR)/.printheaders: $(PRINT_HEADERS:%=print/%)
+ 	touch $@
+ 	$(MAKE) PLAT=$(PLAT) -C print  headers
+ 
+ 
+ $(DEVP_DIR)/.posemathheaders: $(POSEMATH_HEADERS:%=posemath/%)
+ 	touch $@
+ 	$(MAKE) PLAT=$(PLAT) -C posemath  headers
+ 
+ $(DEVP_DIR)/.nodeheaders: $(NODE_HEADERS:%=node/%)
+ 	touch $@
+ 	$(MAKE) PLAT=$(PLAT) -C node  headers
+ 
+ .PHONY: makeallheaders
+ 
+ $(DEVP_DIR)/.headersbuild:  $(DEVP_DIR)/.nodeheaders $(DEVP_DIR)/.stg_clssheaders $(DEVP_DIR)/.printheaders $(DEVP_DIR)/.cmsheaders $(DEVP_DIR)/.os_intfheaders
+ 
+ .DELETE_ON_ERROR: $(DEVP_DIR)/.headersbuild  $(DEVP_DIR)/.nodeheaders $(DEVP_DIR)/.stg_clssheaders $(DEVP_DIR)/.printheaders $(DEVP_DIR)/.cmsheaders $(DEVP_DIR)/.os_intfheaders
+ 
+ $(CMS_OBJS:%=$(DEVP_LIB_DIR)/%)	:
+ 	-\rm -f $(DEVP_DIR)/.cmsbuild
+ 	-@ echo need $@
+ 	make PLAT=$(PLAT)  -C cms
+ 	touch $(DEVP_DIR)/.cmsbuild
+ 
+ $(NODE_OBJS:%=$(DEVP_LIB_DIR)/%):
+ 	-\rm -f $(DEVP_DIR)/.nodebuild
+ 	-@ echo need $@
+ 	make PLAT=$(PLAT)  -C node
+ 	touch $(DEVP_DIR)/.nodebuild
+ 
+ $(PRINT_OBJS:%=$(DEVP_LIB_DIR)/%):
+ 	-\rm -f $(DEVP_DIR)/.printbuild
+ 	-@ echo need $@
+ 	make PLAT=$(PLAT)  -C print
+ 	touch $(DEVP_DIR)/.printbuild
+ 
+ $(OS_INTF_OBJS:%=$(DEVP_LIB_DIR)/%):
+ 	-\rm -f $(DEVP_DIR)/.os_intfbuild
+ 	-@ echo need $@
+ 	make PLAT=$(PLAT)  -C os_intf
+ 	touch $(DEVP_DIR)/.os_intfbuild
+ 
+ $(STG_CLSS_OBJS:%=$(DEVP_LIB_DIR)/%):
+ 	-\rm -f $(DEVP_DIR)/.stg_clssbuild
+ 	-@ echo need $@
+ 	make PLAT=$(PLAT)  -C stg_clss
+ 	touch $(DEVP_DIR)/.stg_clssbuild 
+ 
+ $(POSEMATH_OBJS:%=$(DEVP_LIB_DIR)/%):
+ 	-\rm -f $(DEVP_DIR)/.posemathbuild
+ 	-@ echo need $@
+ 	make PLAT=$(PLAT)  -C posemath $@
+ 	touch $(DEVP_DIR)/.posemathbuild 
+ 
+ $(CMS_HEADERS:%=$(DEVP_INCLUDE_DIR)/%)	:
+ 	-\rm -f $(DEVP_DIR)/.cmsheaders
+ 	-@ echo need $@
+ 	make PLAT=$(PLAT)  -C cms headers
+ 	touch $(DEVP_DIR)/.cmsheaders
+ 
+ $(NODE_HEADERS:%=$(DEVP_INCLUDE_DIR)/%):
+ 	-\rm -f $(DEVP_DIR)/.nodeheaders
+ 	-@ echo need $@
+ 	make PLAT=$(PLAT)  -C node headers
+ 	touch $(DEVP_DIR)/.nodeheaders
+ 
+ $(PRINT_HEADERS:%=$(DEVP_INCLUDE_DIR)/%):
+ 	-\rm -f $(DEVP_DIR)/.printheaders
+ 	-@ echo need $@
+ 	make PLAT=$(PLAT)  -C print headers
+ 	touch $(DEVP_DIR)/.printheaders
+ 
+ $(OS_INTF_HEADERS:%=$(DEVP_INCLUDE_DIR)/%):
+ 	-\rm -f $(DEVP_DIR)/.os_intfheaders
+ 	-@ echo need $@
+ 	make PLAT=$(PLAT)  -C os_intf headers
+ 	touch $(DEVP_DIR)/.os_intfheaders
+ 
+ $(STG_CLSS_HEADERS:%=$(DEVP_INCLUDE_DIR)/%):
+ 	-\rm -f $(DEVP_DIR)/.stg_clssheaders
+ 	-@ echo need $@
+ 	make PLAT=$(PLAT)  -C stg_clss headers
+ 	touch $(DEVP_DIR)/.stg_clssheaders
+ 
+ $(POSEMATH_HEADERS:%=$(DEVP_INCLUDE_DIR)/%):
+ 	-\rm -f $(DEVP_DIR)/.posemathheaders
+ 	-@ echo need $@
+ 	make PLAT=$(PLAT)  -C posemath headers
+ 	touch $(DEVP_DIR)/.posemathheaders
+ 
+ all: remove_guess_warn_files
+ 
+ remove_guess_warn_files: 
+ 	-@\rm -f .tcltkincflags_guess_warn >/dev/null 2>/dev/null
+ 	-@\rm -f ~/.tcltkincflags_guess_warn >/dev/null 2>/dev/null
+ 	-@\rm -f .tcltklibflags_guess_warn >/dev/null 2>/dev/null
+ 	-@\rm -f ~/.tcltklibflags_guess_warn >/dev/null 2>/dev/null
+ 	-@\rm -f .rtlinux_guess_warn >/dev/null 2>/dev/null
+ 	-@\rm -f ~/.rtlinux_guess_warn >/dev/null 2>/dev/null
+ 	-@\rm -f .rtlinuxdir_guess_warn >/dev/null 2>/dev/null
+ 	-@\rm -f ~/.rtlinuxdir_guess_warn >/dev/null 2>/dev/null
+ 	-@\rm -f .rtai_guess_warn >/dev/null 2>/dev/null
+ 	-@\rm -f ~/.rtai_guess_warn >/dev/null 2>/dev/null
+ 	-@\rm -f .rtaidir_guess_warn >/dev/null 2>/dev/null
+ 	-@\rm -f ~/.rtaidir_guess_warn >/dev/null 2>/dev/null
+ 	-@\rm -f .platname_guess_warn >/dev/null 2>/dev/null
+ 	-@\rm -f ~/.platname_guess_warn >/dev/null 2>/dev/null
+ 
+ .PHONY: remove_guess_warn_files
  
  
  

[Emc-commit] rcslib/etc rtaidir,1.3,1.4 testnml_internal.sh,1.1,1.2 testnml.sh,1.2,1.3

[<emc...@li...>]

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

Modified Files:
	rtaidir testnml_internal.sh testnml.sh 
Log Message:
testnml needs to run from the build directory not the source directory if
these are not the same.
rtaidir should compensate for the /rtaidir/ in the newer rtai installs.


Index: rtaidir
===================================================================
RCS file: /cvsroot/emc/rcslib/etc/rtaidir,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** rtaidir	31 Jan 2003 15:05:00 -0000	1.3
--- rtaidir	19 Jun 2003 15:39:58 -0000	1.4
***************
*** 1,4 ****
--- 1,12 ----
  #!/bin/bash
  
+ if test "x${RTAIDIR}" != "x" ; then
+     echo ${RTAIDIR}
+     exit 0
+ fi
+ 
+ echo "Trying to guess RTAI directory." 1>&2
+ echo "Set the environment variable RTAIDIR to override this." 1>&2
+ 
  rev=`uname -r`
  
***************
*** 14,18 ****
  		iver=`objdump -s -j .modinfo $i | gawk '{printf("%s", $6)} END {printf("%s\n",$NF);}'| sed 's/[.]parm.*$//' | sed 's/kernel_version=//' | sed 's/[.]$//' | sed 's/.using_.*$//' | sed 's/.license.*$//'`
  		if [ "$iver" = "$rev" ] ; then
! 			echo $i | sed 's%/rtai$%%' | sed 's%/rtai.o$%%' | sed 's%/modules$%%'
  			exit 0
  		fi
--- 22,28 ----
  		iver=`objdump -s -j .modinfo $i | gawk '{printf("%s", $6)} END {printf("%s\n",$NF);}'| sed 's/[.]parm.*$//' | sed 's/kernel_version=//' | sed 's/[.]$//' | sed 's/.using_.*$//' | sed 's/.license.*$//'`
  		if [ "$iver" = "$rev" ] ; then
! 			RTAIDIR=`echo $i | sed 's%/rtai$%%' | sed 's%/rtai.o$%%' | sed 's%/modules$%%' |sed 's%/rtaidir$%%'  `
! 			export RTAIDIR
! 			echo $RTAIDIR
  			exit 0
  		fi
***************
*** 21,27 ****
  }
  
  for i in /usr/src/rtai* ; do
      if [ -d $i ] ; then
! 	rtaifiles=`find $i -name rtai.o -o -name rtai`
  	search_list
      fi
--- 31,42 ----
  }
  
+ rtaifiles=`find /usr/src/rtai/ -maxdepth 3 -type f  '(' -name rtai.o -o -name rtai ')'`
+ if test "x${rtaifiles}" != "x" ; then
+     search_list
+ fi
+ 
  for i in /usr/src/rtai* ; do
      if [ -d $i ] ; then
! 	rtaifiles=`find $i -maxdepth 3 -type f  '(' -name rtai.o -o -name rtai ')'`
  	search_list
      fi
***************
*** 34,38 ****
  
  
! rtaifiles=/usr/src/rtai/rtai `find /usr/src/ -name rtai -type f 2>/dev/null`
  search_list
  
--- 49,53 ----
  
  
! rtaifiles=/usr/src/rtai/rtai `find /usr/src/ -maxdepth 3 -type f '(' -name rtai -o -name rtai.o ')' 2>/dev/null`
  search_list
  

Index: testnml_internal.sh
===================================================================
RCS file: /cvsroot/emc/rcslib/etc/testnml_internal.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** testnml_internal.sh	6 May 2003 15:18:12 -0000	1.1
--- testnml_internal.sh	19 Jun 2003 15:39:58 -0000	1.2
***************
*** 25,29 ****
  
      if test "x${srcdir}" != "x" ; then
! 	if test ! -e ./etc -a -e "${srcdir}/etc" ; then
  	    cd "${srcdir}";
  	    echo "Directory changed to:"
--- 25,29 ----
  
      if test "x${srcdir}" != "x" ; then
! 	if test ! -d ./etc -a -d "${srcdir}/etc" ; then
  	    cd "${srcdir}";
  	    echo "Directory changed to:"
***************
*** 36,39 ****
--- 36,42 ----
  if test -f /tmp/test.nml ; then
      ${builddir}/nmlclean /tmp/test.nml
+     if test -f nmlclean.log ; then
+ 	mv nmlclean.log /tmp/nmlclean-1-$$.log
+     fi
      \rm -f /tmp/test.nml
  fi
***************
*** 58,62 ****
  echo "Testing nmlcfg  . . ."
  
! ${builddir}/nmlcfg src/test/test.nml2 -o /tmp/test.nml
  if test $? -ne 0 ; then
      echo "nmlcfg test failed"
--- 61,65 ----
  echo "Testing nmlcfg  . . ."
  
! ${builddir}/nmlcfg ${srcdir}/src/test/test.nml2 -o /tmp/test.nml
  if test $? -ne 0 ; then
      echo "nmlcfg test failed"
***************
*** 275,277 ****
--- 278,284 ----
  
  ${builddir}/nmlclean /tmp/test.nml
+ if test -f nmlclean.log ; then
+     mv nmlclean.log /tmp/nmlclean-1-$$.log
+ fi
+ 
  exit 0

Index: testnml.sh
===================================================================
RCS file: /cvsroot/emc/rcslib/etc/testnml.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** testnml.sh	6 May 2003 15:51:01 -0000	1.2
--- testnml.sh	19 Jun 2003 15:39:58 -0000	1.3
***************
*** 1,14 ****
  
  echo "If this test fails check /tmp/testnml.log and /tmp/testnml.err."
! echo "If it takes more than a minute or two, then it has hung and you should kill"
! echo "it and consider the test a failure."
  
! if test '!' -x etc/testnml_internal.sh ; then
!     if test x$srcdir != x ; then
! 	cd $srcdir
      fi
  fi
  
! 
! etc/testnml_internal.sh >/tmp/testnml.log 2>/tmp/testnml.err 
  exit $?
--- 1,14 ----
  
  echo "If this test fails check /tmp/testnml.log and /tmp/testnml.err."
! echo "If it takes more than about three minutes, then it has hung and"
! echo "you should kill it and consider the test a failure."
  
! if test ! -f etc/testnml_internal.sh ; then
!     if test "x${srcdir}" != "x" -a -f ${srcdir}/etc/testnml_internal.sh ; then
! 	. ${srcdir}/etc/testnml_internal.sh >/tmp/testnml.log 2>/tmp/testnml.err 
! 	exit $?
      fi
  fi
  
! . etc/testnml_internal.sh >/tmp/testnml.log 2>/tmp/testnml.err 
  exit $?

[Emc-commit] subscribe

[<emc...@li...>]

subscribe

[Emc-commit] rcslib/etc platname,1.29,1.30

[<emc...@li...>]

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

Modified Files:
	platname 
Log Message:
Fixed rcslib/etc/platname to work on the BDI 2.18

Index: platname
===================================================================
RCS file: /cvsroot/emc/rcslib/etc/platname,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** platname	9 Apr 2003 13:36:33 -0000	1.29
--- platname	19 Jun 2003 02:30:20 -0000	1.30
***************
*** 1,4 ****
--- 1,25 ----
  #!/bin/sh
  
+ # 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...
+ 
+ # Uncomment the next line to aid in troubleshooting this script
+ #set -x
+ 
+ # Save the original path and working directory
+ ORIGINAL_PATH=$PATH
+ ORIGINAL_DIR=`pwd`
+ 
+ # Change to the directory containing this script
+ cd $0/..
+ 
+ # Add this directory to the PATH environment variable
+ # so the the which `$PROGRAM_NAME...` command doesn't fail
+ # We'll restore the original path at the end of the file
+ PATH=$PATH:`pwd`
+ 
+ # Change back to the original directory
+ cd $ORIGINAL_DIR
+ 
  if test "0${PLAT}" != 0 ; then 
      echo ${PLAT}
***************
*** 162,167 ****
  fi
  
- 
- 
  if test 0$ORIG_PLAT != 0$PLAT ; then
  
--- 183,186 ----
***************
*** 207,216 ****
  fi
  
  
  
- 
- if test -f /etc/redhat-release ; then
-     REDHAT_VERSION=`cat /etc/redhat-release | awk '{print $5}'  | sed 'y/./_/'  | sed 'y/-/_/'`
-     REDHAT_PLAT=`echo "redhat_"$REDHAT_VERSION `
      if test -w $RCSLIB_ETC_DIR -a -d $RCSLIB_ETC_DIR -a ${LINK_FLAG} $RCSLIB_ETC_DIR/$REDHAT_PLAT.def ; then 
  	( cd $RCSLIB_ETC_DIR; rm $REDHAT_PLAT.def; );
--- 226,244 ----
  fi
  
+ if test -f /etc/redhat-release ; then
  
+ # /etc/redhat_relaese on a 2.18 BDI contains the following lines:
+ #   Realtime Linux for EMC
+ #   Based on RH 6.0 6.1, and 6.2 Linux
+ # MGS added an extra sed operation at the end of this line
+ # to remove the comma at the end of the fifth element - "6.1,".
+     REDHAT_VERSION=`cat /etc/redhat-release | awk '{print $5}'  | sed 'y/./_/'  | sed 'y/-/_/'  | sed 's/,//'`
+ # MGS also added an extra sed operation at the end of this line
+ # to remove the space between "redhat_" and "6_1".
+     REDHAT_PLAT=`echo "redhat_"$REDHAT_VERSION | sed 's/ //'`
+ # Uncomment these echo statements to see the result of the variable assignments:
+ #echo $REDHAT_VERSION
+ #echo $REDHAT_PLAT
  
      if test -w $RCSLIB_ETC_DIR -a -d $RCSLIB_ETC_DIR -a ${LINK_FLAG} $RCSLIB_ETC_DIR/$REDHAT_PLAT.def ; then 
  	( cd $RCSLIB_ETC_DIR; rm $REDHAT_PLAT.def; );
***************
*** 456,459 ****
--- 484,490 ----
      fi
  fi
+ 
+ # Here's where we restore the original path
+ PATH=$ORIGINAL_PATH
  
  export PLAT

[Emc-commit] documents scratch.txt,1.4,1.5

[<emc...@li...>]

Update of /cvsroot/emc/documents
In directory sc8-pr-cvs1:/tmp/cvs-serv18562

Modified Files:
	scratch.txt 
Log Message:
Testing a commit to scratch.txt

Index: scratch.txt
===================================================================
RCS file: /cvsroot/emc/documents/scratch.txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** scratch.txt	18 Jun 2003 22:26:50 -0000	1.4
--- scratch.txt	19 Jun 2003 02:28:25 -0000	1.5
***************
*** 8,9 ****
--- 8,10 ----
  3 - Paul_C added his marker.
  4 - Paul_C pays another visit to test the commit emailer works.
+ 5 - Matt Shaver was here 18 Jun 03 @ 21:00.
\ No newline at end of file

[Emc-commit] documents scratch.txt,1.3,1.4

[<emc...@li...>]

Update of /cvsroot/emc/documents
In directory sc8-pr-cvs1:/tmp/cvs-serv16635

Modified Files:
	scratch.txt 
Log Message:
another scat test

Index: scratch.txt
===================================================================
RCS file: /cvsroot/emc/documents/scratch.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** scratch.txt	15 May 2003 20:11:11 -0000	1.3
--- scratch.txt	18 Jun 2003 22:26:50 -0000	1.4
***************
*** 7,8 ****
--- 7,9 ----
  2 - John Kasunich was here.  Hey Ray, do you ^^^^^^^ ever sleep?
  3 - Paul_C added his marker.
+ 4 - Paul_C pays another visit to test the commit emailer works.