ANU News Patch Patch ID: 940816_newsbuild.com!wayne.westmoreland@srs.gov Date: 16-Aug-1994 Author: Wayne Westmoreland wayne.westmoreland@srs.gov News Version: 6.1beta9 News Files: NewsBuild.com Description: Fix the problem when doing a link only where the nntp servers don't get linked and also don't require the presence of header files when only linking. *** newsbuild.com Wed May 11 10:31:16 1994 --- newsbuild_new.com Tue Aug 16 16:47:25 1994 *************** *** 66,68 **** --- 66,72 ---- + $! V6.1b8 15-Aug-1994 wayne.westmoreland@srs.gov Wayne Westmoreland + $! - When doing a link only, don't skip linking the nntp servers and don't + $! require the presence of header files. + $! $! $! Usage: $! $ SET DEF [.NEWS_SRC] *************** *** 155,160 **** --- 159,189 ---- $ ENDIF $ ENDIF $! + $! Examine parameter 2 (Compile | Link | Both | Objects | Exes | empty) + $! + $ force = f$extract(0,1,p2) + $ skip_compile = 0 + $ skip_link = 0 + $ force_compile = 0 + $ force_link = 0 + $ IF force .EQS. "O" THEN $ skip_link = 1 + $ IF force .EQS. "E" THEN $ skip_compile = 1 + $ IF force .EQS. "C" + $ THEN + $ force_compile = 1 + $ skip_link = 1 + $ ENDIF + $ IF force .EQS. "L" + $ THEN + $ force_link = 1 + $ skip_compile = 1 + $ ENDIF + $ IF force .EQS. "B" + $ THEN + $ force_compile = 1 + $ force_link = 1 + $ ENDIF + $! $! Call in CMUTCP support $! $ IF use_cmu *************** *** 170,181 **** $ write sys$output "ANU-NEWS under UCXSOCKETS is not thoroughly tested," $ write sys$output "the use of UCXQIOS is recommended. Also the" $ write sys$output "NNTP_TCPUCXM server is not compiled under UCXSOCKETS." ! $ IF f$search("sys$library:ucx$inetdef.h") .EQS. "" $ THEN ! $ write sys$output "UCX support cannot be loaded - no library file" ! $ exit $ ENDIF - $ defsw = "/DEFINE=(UCXSOCKETS=1,UCX=1)" $ if axpflag $ then $ DEFINE link_opt [-.news_src]options_c_ucxlink_axp.opt --- 199,213 ---- $ write sys$output "ANU-NEWS under UCXSOCKETS is not thoroughly tested," $ write sys$output "the use of UCXQIOS is recommended. Also the" $ write sys$output "NNTP_TCPUCXM server is not compiled under UCXSOCKETS." ! $ IF skip_compile .eq. 0 $ THEN ! $ IF f$search("sys$library:ucx$inetdef.h") .EQS. "" ! $ THEN ! $ write sys$output "UCX support cannot be loaded - no library file" ! $ exit ! $ ENDIF ! $ defsw = "/DEFINE=(UCXSOCKETS=1,UCX=1)" $ ENDIF $ if axpflag $ then $ DEFINE link_opt [-.news_src]options_c_ucxlink_axp.opt *************** *** 189,200 **** $! $ IF use_ucxqios $ THEN ! $ IF f$search("sys$library:ucx$inetdef.h") .EQS. "" $ THEN ! $ write sys$output "UCX support cannot be loaded - no library file" ! $ exit $ ENDIF - $ defsw = "/DEFINE=(UCXQIOS=1,UCX=1)" $ if axpflag $ then $ DEFINE link_opt [-.news_src]options_c_ucxlink_axp.opt --- 221,235 ---- $! $ IF use_ucxqios $ THEN ! $ IF skip_compile .eq. 0 $ THEN ! $ IF f$search("sys$library:ucx$inetdef.h") .EQS. "" ! $ THEN ! $ write sys$output "UCX support cannot be loaded - no library file" ! $ exit ! $ ENDIF ! $ defsw = "/DEFINE=(UCXQIOS=1,UCX=1)" $ ENDIF $ if axpflag $ then $ DEFINE link_opt [-.news_src]options_c_ucxlink_axp.opt *************** *** 208,225 **** $! $ IF use_multinet $ THEN ! $ IF f$search("multinet_root:[multinet.include]*.h") .EQS. "" $ THEN ! $ write sys$output "MULTINET support cannot be loaded - no library files" ! $ exit ! $ ENDIF ! $ defsw = "/DEFINE=(MULTINET=1,__TYPES=1)" ! $ DEFINE vaxc$include multinet_root:[multinet.include],- multinet_root:[multinet.include.sys],- multinet_root:[multinet.include.arpa],- multinet_root:[multinet.include.netinet],- multinet_root:[multinet.include.vms],- sys$library $ if axpflag $ then $ DEFINE VMS MULTINET_ROOT:[MULTINET.INCLUDE.VMS] --- 243,263 ---- $! $ IF use_multinet $ THEN ! $ IF skip_compile .eq. 0 $ THEN ! $ IF f$search("multinet_root:[multinet.include]*.h") .EQS. "" ! $ THEN ! $ write sys$output "MULTINET support cannot be loaded - no library files" ! $ exit ! $ ENDIF ! $ defsw = "/DEFINE=(MULTINET=1,__TYPES=1)" ! $ DEFINE vaxc$include multinet_root:[multinet.include],- multinet_root:[multinet.include.sys],- multinet_root:[multinet.include.arpa],- multinet_root:[multinet.include.netinet],- multinet_root:[multinet.include.vms],- sys$library + $ ENDIF $ if axpflag $ then $ DEFINE VMS MULTINET_ROOT:[MULTINET.INCLUDE.VMS] *************** *** 237,250 **** $! $ IF use_tcpware $ THEN ! $ IF f$search("TCPWARE_INCLUDE:*.h") .EQS. "" $ THEN ! $ write sys$output "TCPware support cannot be loaded - no library files" ! $ exit $ ENDIF - $ defsw = "/DEFINE=(TCPWARE=1)" - $ DEFINE vaxc$include tcpware_include,- - sys$library $ if axpflag $ then $ DEFINE link_opt [-.news_src]options_c_tcpwarelink_axp.opt --- 275,291 ---- $! $ IF use_tcpware $ THEN ! $ IF skip_compile .eq. 0 $ THEN ! $ IF f$search("TCPWARE_INCLUDE:*.h") .EQS. "" ! $ THEN ! $ write sys$output "TCPware support cannot be loaded - no library files" ! $ exit ! $ ENDIF ! $ defsw = "/DEFINE=(TCPWARE=1)" ! $ DEFINE vaxc$include tcpware_include,- ! sys$library $ ENDIF $ if axpflag $ then $ DEFINE link_opt [-.news_src]options_c_tcpwarelink_axp.opt *************** *** 259,278 **** $! $ IF use_twg $ THEN ! $ IF f$search("TWG$TCP:[NETDIST.INCLUDE]*.H") .eqs. "" $ THEN ! $ write sys$output "WIN support cannot be loaded - no library files" ! $ exit $ ENDIF ! $ defsw = "/DEFINE=(TWG=1)" ! $ define vaxc$include sys$library,twg$tcp:[netdist.include],- ! twg$tcp:[netdist.include.sys],- ! twg$tcp:[netdist.include.vms],- ! twg$tcp:[netdist.include.netinet],- ! twg$tcp:[netdist.include.arpa],- ! sys$library ! $ define sys twg$tcp:[netdist.include.sys] ! $ If F$Search("Sys$Share:TWGLib.Exe").nes."" $ Then $ if axpflag $ then --- 300,323 ---- $! $ IF use_twg $ THEN ! $ IF skip_compile .eq. 0 $ THEN ! $ IF f$search("TWG$TCP:[NETDIST.INCLUDE]*.H") .eqs. "" ! $ THEN ! $ write sys$output "WIN support cannot be loaded - no library files" ! $ exit ! $ ENDIF ! $ defsw = "/DEFINE=(TWG=1)" ! $ define vaxc$include sys$library,twg$tcp:[netdist.include],- ! twg$tcp:[netdist.include.sys],- ! twg$tcp:[netdist.include.vms],- ! twg$tcp:[netdist.include.netinet],- ! twg$tcp:[netdist.include.arpa],- ! sys$library ! $ define sys twg$tcp:[netdist.include.sys] $ ENDIF ! $ If (F$Search("Sys$Share:TWGLib.Exe").nes."").and. - ! (F$Edit(F$Extract(0,4,p1),"Collapse,Upcase").nes."WINO") $ Then $ if axpflag $ then *************** *** 303,333 **** $ endif $ ENDIF $! - $! Examine parameter 2 (Compile | Link | Both | Objects | Exes | empty) - $! - $ force = f$extract(0,1,p2) - $ skip_compile = 0 - $ skip_link = 0 - $ force_compile = 0 - $ force_link = 0 - $ IF force .EQS. "O" THEN $ skip_link = 1 - $ IF force .EQS. "E" THEN $ skip_compile = 1 - $ IF force .EQS. "C" - $ THEN - $ force_compile = 1 - $ skip_link = 1 - $ ENDIF - $ IF force .EQS. "L" - $ THEN - $ force_link = 1 - $ skip_compile = 1 - $ ENDIF - $ IF force .EQS. "B" - $ THEN - $ force_compile = 1 - $ force_link = 1 - $ ENDIF - $! $! Examine parameter 3 (DEBUG | NODEBUG | empty) $! $ dbgtype = f$extract(0,1,p3) --- 348,353 ---- *************** *** 339,405 **** $! $! client-only means build NEWS.EXE and NEWS.HLB only; ignore the rest $ client_only = ( f$edit(f$extract(0,1,p4),"UPCASE") .eqs. "C" ) - $! Examine parameter 5 (Extra Compile Defines | empty) $! ! $ IF p5.nes."" $ THEN - $ IF defsw.eqs."" - $ THEN - $ defsw = "/DEFINE=("+p5+")" - $ ELSE - $ defsw = f$extract(0,f$length(defsw)-1,defsw)+p5+")" - $ ENDIF - $ ENDIF $! $! ! $ IF axpflag ! Probably ALPHA ! $ THEN ! $ IF USE_MULTINET ! $ THEN ! $ CC_AXP_SW = "/PREFIX=(ALL_ENTRIES,EXCEPT=(SOCKET,CONNECT,BIND,LISTEN,SOCKET_READ,SOCKET_WRITE,SOCKET_CLOSE,SELECT,ACCEPT,BCMP,BCOPY,BZERO,GETHOSTBYNAME," ! $ CC_AXP_SW = CC_AXP_SW + "GETSOCKOPT,SETSOCKOPT,GETHOSTBYADDR,GETPEERNAME,GETDTABLESIZE,HTONS,HTONL,NTOHS,NTOHL,SEND,SENDTO,RECV,RECVFROM))" ! $ ELSE CC_AXP_SW = "" ! ! $ ENDIF ! $ cc :== "cc''defsw'/NOMEMBER_ALIGN/STANDARD=VAXC/TIE''CC_AXP_SW'" ! $ ELSE ! $ cc :== "cc''defsw'" ! $ ENDIF ! $ show symb cc $! - $! Save the Compile Time "Defines" for this compile. $! ! $ open/write temp [-.news_build]compile.defines ! $ write temp defsw ! $ close temp ! $ if f$search("[-.news_build]compile.defines;-1").eqs."" ! $ then ! $ force_compile = 1 ! $ force_link = 1 ! $ else ! $ differences/output=nla0: [-.news_build]compile.defines ! $ if $severity.eq.3 ! $ then ! $ write sys$output "" ! $ if f$file_attributes("[-.news_build]compile.defines;-1","FFB").eqs.4 ! $ then ! $ write sys$output "Forcing a complete recompile due to specification compile time defines" ! $ else ! $ write sys$output "Forcing a complete recompile due to compile defines changing from:" ! $ type [-.news_build]compile.defines;-1 ! $ endif ! $ if f$length(defsw).eqs.0 ! $ then ! $ write sys$output "to compiling without any compile time defines." ! $ else ! $ write sys$output "To: ! $ type [-.news_build]compile.defines ! $ endif ! $ write sys$output "" ! $ force_compile = 1 ! $ force_link = 1 $ endif - $ purge [-.news_build]compile.defines $ endif $! $! Examine parameter 6 (Purge object,exe | do not purge) --- 359,430 ---- $! $! client-only means build NEWS.EXE and NEWS.HLB only; ignore the rest $ client_only = ( f$edit(f$extract(0,1,p4),"UPCASE") .eqs. "C" ) $! ! $ IF SKIP_COMPILE .EQ. 0 $ THEN $! + $! Examine parameter 5 (Extra Compile Defines | empty) $! ! $ IF p5.nes."" ! $ THEN ! $ IF defsw.eqs."" ! $ THEN ! $ defsw = "/DEFINE=("+p5+")" ! $ ELSE ! $ defsw = f$extract(0,f$length(defsw)-1,defsw)+p5+")" ! $ ENDIF ! $ ENDIF $! $! ! $ IF axpflag ! Probably ALPHA ! $ THEN ! $ IF USE_MULTINET ! $ THEN ! $ CC_AXP_SW = "/PREFIX=(ALL_ENTRIES,EXCEPT=(SOCKET,CONNECT,BIND,LISTEN,SOCKET_READ,SOCKET_WRITE,SOCKET_CLOSE,SELECT,ACCEPT,BCMP,BCOPY,BZERO,GETHOSTBYNAME," ! $ CC_AXP_SW = CC_AXP_SW + "GETSOCKOPT,SETSOCKOPT,GETHOSTBYADDR,GETPEERNAME,GETDTABLESIZE,HTONS,HTONL,NTOHS,NTOHL,SEND,SENDTO,RECV,RECVFROM))" ! $ ELSE CC_AXP_SW = "" ! ! $ ENDIF ! $ cc :== "cc''defsw'/NOMEMBER_ALIGN/STANDARD=VAXC/TIE''CC_AXP_SW'" ! $ ELSE ! $ cc :== "cc''defsw'" ! $ ENDIF ! $ show symb cc ! $! ! $! Save the Compile Time "Defines" for this compile. ! $! ! $ open/write temp [-.news_build]compile.defines ! $ write temp defsw ! $ close temp ! $ if f$search("[-.news_build]compile.defines;-1").eqs."" ! $ then ! $ force_compile = 1 ! $ force_link = 1 ! $ else ! $ differences/output=nla0: [-.news_build]compile.defines ! $ if $severity.eq.3 ! $ then ! $ write sys$output "" ! $ if f$file_attributes("[-.news_build]compile.defines;-1","FFB").eqs.4 ! $ then ! $ write sys$output "Forcing a complete recompile due to specification compile time defines" ! $ else ! $ write sys$output "Forcing a complete recompile due to compile defines changing from:" ! $ type [-.news_build]compile.defines;-1 ! $ endif ! $ if f$length(defsw).eqs.0 ! $ then ! $ write sys$output "to compiling without any compile time defines." ! $ else ! $ write sys$output "To: ! $ type [-.news_build]compile.defines ! $ endif ! $ write sys$output "" ! $ force_compile = 1 ! $ force_link = 1 ! $ endif ! $ purge [-.news_build]compile.defines $ endif $ endif $! $! Examine parameter 6 (Purge object,exe | do not purge) *************** *** 1032,1059 **** $! $! NNTP_TCPCMU $! ! $ IF (use_cmu) .and. (f$search("[-.NEWS_SRC]NNTP_TCPCMU.C") .nes. "") - ! .and. .not. client_only .and. .not. skip_compile $ THEN ! $ IF force_compile $ THEN ! $ iftest = 1 ! $ ELSE ! $ IF f$search("NNTP_TCPCMU.OBJ").eqs."" $ THEN $ iftest = 1 $ ELSE ! $ iftest = f$cvtime(f$file_attributes("[-.NEWS_SRC]NNTP_TCPCMU.C","rdt")).gts.- ! f$cvtime(f$file_attributes("NNTP_TCPCMU.OBJ","rdt")) $ ENDIF - $ ENDIF - $ IF iftest - $ THEN - $ set def [-.news_src] - $ write sys$output "$ cc nntp_tcpcmu" - $ cc/nolis/object=[-.news_build]nntp_tcpcmu nntp_tcpcmu - $ set def [-.news_build] - $ if purge_objs then purge nntp_tcpcmu.obj $ ENDIF $! $ IF (f$search("NNTP_TCPCMU.OBJ") .nes. "") .and. - --- 1057,1087 ---- $! $! NNTP_TCPCMU $! ! $ IF (use_cmu) $ THEN ! $ IF (f$search("[-.NEWS_SRC]NNTP_TCPCMU.C") .nes. "") - ! .and. .not. client_only .and. .not. skip_compile $ THEN ! $ IF force_compile $ THEN $ iftest = 1 $ ELSE ! $ IF f$search("NNTP_TCPCMU.OBJ").eqs."" ! $ THEN ! $ iftest = 1 ! $ ELSE ! $ iftest = f$cvtime(f$file_attributes("[-.NEWS_SRC]NNTP_TCPCMU.C","rdt")).gts.- ! f$cvtime(f$file_attributes("NNTP_TCPCMU.OBJ","rdt")) ! $ ENDIF ! $ ENDIF ! $ IF iftest ! $ THEN ! $ set def [-.news_src] ! $ write sys$output "$ cc nntp_tcpcmu" ! $ cc/nolis/object=[-.news_build]nntp_tcpcmu nntp_tcpcmu ! $ set def [-.news_build] ! $ if purge_objs then purge nntp_tcpcmu.obj $ ENDIF $ ENDIF $! $ IF (f$search("NNTP_TCPCMU.OBJ") .nes. "") .and. - *************** *** 1088,1115 **** $! $! NNTP_TCPWINMULTINET $! ! $ IF (use_twg .or. use_multinet .or. use_tcpware) .and. (f$search("[-.NEWS_SRC]NNTP_TCPWINMULTINET.C") .nes. "") - ! .and. .not. client_only .and. .not. skip_compile $ THEN ! $ IF force_compile $ THEN ! $ iftest = 1 ! $ ELSE ! $ IF f$search("NNTP_TCPWINMULTINET.OBJ").eqs."" $ THEN $ iftest = 1 $ ELSE ! $ iftest = f$cvtime(f$file_attributes("[-.NEWS_SRC]NNTP_TCPWINMULTINET.C","rdt")).gts.- ! f$cvtime(f$file_attributes("NNTP_TCPWINMULTINET.OBJ","rdt")) $ ENDIF - $ ENDIF - $ IF iftest - $ THEN - $ set def [-.news_src] - $ write sys$output "$ cc nntp_tcpwinmultinet" - $ cc/nolis/object=[-.news_build]nntp_tcpwinmultinet nntp_tcpwinmultinet - $ set def [-.news_build] - $ if purge_objs then purge nntp_tcpwinmultinet.obj $ ENDIF $! $ IF (f$search("NNTP_TCPWINMULTINET.OBJ") .nes. "") .and. - --- 1116,1146 ---- $! $! NNTP_TCPWINMULTINET $! ! $ IF (use_twg .or. use_multinet .or. use_tcpware) $ THEN ! $ IF (f$search("[-.NEWS_SRC]NNTP_TCPWINMULTINET.C") .nes. "") - ! .and. .not. client_only .and. .not. skip_compile $ THEN ! $ IF force_compile $ THEN $ iftest = 1 $ ELSE ! $ IF f$search("NNTP_TCPWINMULTINET.OBJ").eqs."" ! $ THEN ! $ iftest = 1 ! $ ELSE ! $ iftest = f$cvtime(f$file_attributes("[-.NEWS_SRC]NNTP_TCPWINMULTINET.C","rdt")).gts.- ! f$cvtime(f$file_attributes("NNTP_TCPWINMULTINET.OBJ","rdt")) ! $ ENDIF ! $ ENDIF ! $ IF iftest ! $ THEN ! $ set def [-.news_src] ! $ write sys$output "$ cc nntp_tcpwinmultinet" ! $ cc/nolis/object=[-.news_build]nntp_tcpwinmultinet nntp_tcpwinmultinet ! $ set def [-.news_build] ! $ if purge_objs then purge nntp_tcpwinmultinet.obj $ ENDIF $ ENDIF $! $ IF (f$search("NNTP_TCPWINMULTINET.OBJ") .nes. "") .and. - *************** *** 1145,1172 **** $! NNTP_TCPUCXM $! $!IF (use_ucxqios .or. use_multinet) - ! $ IF (use_ucxqios) - ! .and. (f$search("[-.NEWS_SRC]NNTP_TCPUCXM.C") .nes. "") .and. .not. client_only .and. .not. skip_compile $ THEN ! $ IF force_compile $ THEN ! $ iftest = 1 ! $ ELSE ! $ IF f$search("NNTP_TCPUCXM.OBJ").eqs."" $ THEN $ iftest = 1 $ ELSE ! $ iftest = f$cvtime(f$file_attributes("[-.NEWS_SRC]NNTP_TCPUCXM.C","rdt")).gts.- ! f$cvtime(f$file_attributes("NNTP_TCPUCXM.OBJ","rdt")) $ ENDIF - $ ENDIF - $ IF iftest - $ THEN - $ set def [-.news_src] - $ write sys$output "$ cc nntp_tcpucxm" - $ cc/nolis/object=[-.news_build]nntp_tcpucxm nntp_tcpucxm - $ set def [-.news_build] - $ if purge_objs then purge nntp_tcpucxm.obj $ ENDIF $! $ IF (f$search("NNTP_TCPUCXM.OBJ") .nes. "") .and. - --- 1176,1205 ---- $! NNTP_TCPUCXM $! $!IF (use_ucxqios .or. use_multinet) - ! $ IF (use_ucxqios) $ THEN ! IF (f$search("[-.NEWS_SRC]NNTP_TCPUCXM.C") .nes. "") .and. .not. client_only .and. .not. skip_compile $ THEN ! $ IF force_compile $ THEN $ iftest = 1 $ ELSE ! $ IF f$search("NNTP_TCPUCXM.OBJ").eqs."" ! $ THEN ! $ iftest = 1 ! $ ELSE ! $ iftest = f$cvtime(f$file_attributes("[-.NEWS_SRC]NNTP_TCPUCXM.C","rdt")).gts.- ! f$cvtime(f$file_attributes("NNTP_TCPUCXM.OBJ","rdt")) ! $ ENDIF ! $ ENDIF ! $ IF iftest ! $ THEN ! $ set def [-.news_src] ! $ write sys$output "$ cc nntp_tcpucxm" ! $ cc/nolis/object=[-.news_build]nntp_tcpucxm nntp_tcpucxm ! $ set def [-.news_build] ! $ if purge_objs then purge nntp_tcpucxm.obj $ ENDIF $ ENDIF $! $ IF (f$search("NNTP_TCPUCXM.OBJ") .nes. "") .and. - *** patchlist.h;-1 --- patchlist.h ************** *** 1,1 =+=+= End =+=+= --- 1,2 ----- + 940816_newsbuild.com!wayne.westmoreland@srs.gov =+=+= End =+=+=