From:	MERC::"uunet!VM1.NODAK.EDU!OWNER-ANU-NEWS" 10-MAR-1993 09:19:30.57
To:	Multiple recipients of list ANU-NEWS <ANU-NEWS@VM1.NoDak.EDU>
CC:	
Subj:	NewsBuild.Com patch: minor fixes for link-only run

ANU News Patch
Patch ID: 930304_newsbuild.com!bailey@genetics.upenn.edu
Date: 04-Mar-1993
Author: Charles Bailey  bailey@genetics.upenn.edu
News Version: 6.1beta6
News Files: NewsBuild.Com
Description: Corrects Goto in makeobj subroutine to use makedun, not compdun.
Moves linking of News.Exe outside If-Then which handles compilation, so that
link-only option functions correctly.
*** newsbuild.com
--- newsbuild_new.com
**************
*** 48,50
  $!
  $!  Usage:
  $!    $ SET DEF [.NEWS_SRC]
--- 48,52 -----
+ $!    V6.1b6   4-Mar-1993  Charles Bailey  bailey@genetics.upenn.edu
+ $!      - fixed minor bugs in makeobj subroutine and News.Exe generation
  $!
  $!  Usage:
  $!    $ SET DEF [.NEWS_SRC]
**************
*** 477,482
  $     set def [-.news_build]
  $     purge news.obj
  $   ENDIF
  $!
  $   IF (f$search("NEWS.OBJ") .nes. "") .and. (f$search("NEWS_LIBRARY.OLB") .ne
s. "") .and. .not. skip_link
  $   THEN
--- 479,485 -----
  $     set def [-.news_build]
  $     purge news.obj
  $   ENDIF
+ $ ENDIF
  $!
  $ IF (f$search("NEWS.OBJ") .nes. "") .and. (f$search("NEWS_LIBRARY.OLB") .nes.
 "") .and. .not. skip_link
  $ THEN
**************
*** 478,484
  $     purge news.obj
  $   ENDIF
  $!
! $   IF (f$search("NEWS.OBJ") .nes. "") .and. (f$search("NEWS_LIBRARY.OLB") .ne
s. "") .and. .not. skip_link
  $   THEN
  $     IF force_link
  $     THEN
--- 481,489 -----
  $   ENDIF
  $ ENDIF
  $!
! $ IF (f$search("NEWS.OBJ") .nes. "") .and. (f$search("NEWS_LIBRARY.OLB") .nes.
 "") .and. .not. skip_link
! $ THEN
! $   IF force_link
  $   THEN
  $     iftest = 1
  $   ELSE
**************
*** 480,486
  $!
  $   IF (f$search("NEWS.OBJ") .nes. "") .and. (f$search("NEWS_LIBRARY.OLB") .ne
s. "") .and. .not. skip_link
  $   THEN
! $     IF force_link
  $     THEN
  $       iftest = 1
  $     ELSE
--- 485,493 -----
  $ THEN
  $   IF force_link
  $   THEN
! $     iftest = 1
! $   ELSE
! $     IF f$search("[-.NEWS_DIST]NEWS.EXE") .eqs. ""
  $     THEN
  $       iftest = 1
  $     ELSE
**************
*** 484,498
  $     THEN
  $       iftest = 1
  $     ELSE
! $       IF f$search("[-.NEWS_DIST]NEWS.EXE") .eqs. ""
! $       THEN
! $         iftest = 1
! $       ELSE
! $         iftest =     f$cvtime(f$file_attributes("NEWS_LIBRARY.OLB","rdt")).g
ts.-
!                         f$cvtime(f$file_attributes("[-.NEWS_DIST]NEWS.EXE","rd
t")) -
!                   .or. f$cvtime(f$file_attributes("NEWS.OBJ","rdt")).gts.-
!                         f$cvtime(f$file_attributes("[-.NEWS_DIST]NEWS.EXE","rd
t"))
! $       ENDIF
  $     ENDIF
  $     IF iftest
  $     THEN
--- 491,500 -----
  $     THEN
  $       iftest = 1
  $     ELSE
! $       iftest =     f$cvtime(f$file_attributes("NEWS_LIBRARY.OLB","rdt")).gts
.-
!                       f$cvtime(f$file_attributes("[-.NEWS_DIST]NEWS.EXE","rdt"
)) -
!                 .or. f$cvtime(f$file_attributes("NEWS.OBJ","rdt")).gts.-
!                       f$cvtime(f$file_attributes("[-.NEWS_DIST]NEWS.EXE","rdt"
))
  $     ENDIF
  $   ENDIF
  $   IF iftest
**************
*** 494,505
                          f$cvtime(f$file_attributes("[-.NEWS_DIST]NEWS.EXE","rd
t"))
  $       ENDIF
  $     ENDIF
- $     IF iftest
- $     THEN
- $       write sys$output "$ link news,news_library/library"
- $       link/notrace/nodebug/nomap/exe=[-.news_dist]news.exe news,news_library
/library,link_opt/opt
- $       purge [-.news_dist]news.exe
- $     ENDIF
  $   ENDIF
  $ ENDIF
  $!









--- 496,501 -----
                  .or. f$cvtime(f$file_attributes("NEWS.OBJ","rdt")).gts.-
                        f$cvtime(f$file_attributes("[-.NEWS_DIST]NEWS.EXE","rdt"
))
  $     ENDIF
  $   ENDIF
  $   IF iftest
  $   THEN
**************
*** 501,506
  $       purge [-.news_dist]news.exe
  $     ENDIF
  $   ENDIF
  $ ENDIF
  $!









  $!  NEWSDBG
--- 497,508 -----
                        f$cvtime(f$file_attributes("[-.NEWS_DIST]NEWS.EXE","rdt"
))
  $     ENDIF
  $   ENDIF
+ $   IF iftest
+ $   THEN
+ $     write sys$output "$ link news,news_library/library"
+ $     link/notrace/nodebug/nomap/exe=[-.news_dist]news.exe news,news_library/l
ibrary,link_opt/opt
+ $     purge [-.news_dist]news.exe
+ $   ENDIF
  $ ENDIF
  $!









  $!  NEWSDBG
**************
*** 1553,1559
  $!
  $makeobj: subroutine
  $   on control_y THEN $ stop
! $   IF skip_compile THEN $  goto compdun
  $   extn = ".C"
  $   if p2 .eqs. "MACRO" THEN $ extn = ".MAR"
  $   srcname = "[-.news_src]" + p1 + extn
--- 1555,1561 -----
  $!
  $makeobj: subroutine
  $   on control_y THEN $ stop
! $   IF skip_compile THEN $  goto makedun
  $   extn = ".C"
  $   if p2 .eqs. "MACRO" THEN $ extn = ".MAR"
  $   srcname = "[-.news_src]" + p1 + extn
*** patchlist.h;-1
--- patchlist.h
**************
*** 1,1
  =+=+= End =+=+=
--- 1,2 -----
+ 930304_newsbuild.com!bailey@genetics.upenn.edu
  =+=+= End =+=+=
