emc-commit — CVS commit notification list.

[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.