moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2025-02-28 17:31:46 -05:00
Code Issues Releases Wiki Activity

Steven M. Schweda fixed:

Browse Source 
VMS builder bad behavior when used in a batch job.

Various ".LIS" and ".MAP" files created without being requested
by a "LIST" command-line option, and in the wrong place, too.

Some minor typographical changes.
This commit is contained in:
Yang Tse 2010-02-11 07:24:29 +00:00
parent 99f366adf9
commit 07fc7852d7
1 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
packages/vms/build_vms.com
View File

@ -137,6 +137,7 @@ $! Interpret command-line options.
$! $!
$ hpssl = 0 $ hpssl = 0
$ ldap = 0 $ ldap = 0
$ list = 0
$ nohpssl = 0 $ nohpssl = 0
$ nossl = 0 $ nossl = 0
$ openssl = 0 $ openssl = 0
@ -150,6 +151,7 @@ $ CURL_CCDEFS = f$edit( CURL_CCDEFS, "TRIM")
$ cc_defs = cc_defs+ ", "+ CURL_CCDEFS $ cc_defs = cc_defs+ ", "+ CURL_CCDEFS
$ endif $ endif
$ link_qual = "" $ link_qual = ""
$ msg_qual = "/object = ''objdir'"
$ ssl_opt = "" $ ssl_opt = ""
$! $!
$ arg = 1 $ arg = 1
@ -201,9 +203,8 @@ $ endif
$! $!
$ if (arg_val .eqs. "DEBUG") $ if (arg_val .eqs. "DEBUG")
$ then $ then
$ cc_qual1 = cc_qual1 + - $ cc_qual1 = cc_qual1+ " /debug /nooptimize"
" /debug /nooptimize" $ link_qual = link_qual+ " /debug"
$ link_qual = link_qual+ " /debug /map = ''lisdir'"
$ goto arg_loop_end $ goto arg_loop_end
$ endif $ endif
$! $!
@ -232,7 +233,10 @@ $ endif
$! $!
$ if (f$extract( 0, 4, arg_val) .eqs. "LIST") $ if (f$extract( 0, 4, arg_val) .eqs. "LIST")
$ then $ then
$ list = 1
$ cc_qual1 = cc_qual1+ " /list = ''lisdir' /show = (all, nomessages)" $ cc_qual1 = cc_qual1+ " /list = ''lisdir' /show = (all, nomessages)"
$ link_qual = link_qual+ " /map = ''lisdir'"
$ msg_qual = msg_qual+ " /list = ''lisdir'"
$ goto arg_loop_end $ goto arg_loop_end
$ endif $ endif
$! $!
@ -262,6 +266,16 @@ $ arg = arg+ 1
$ goto arg_loop $ goto arg_loop
$arg_loop_out: $arg_loop_out:
$! $!
$! CC /LIST, LINK /MAP, and MESSAGE /LIST are defaults in batch mode,
$! so be explicit when they're not desired.
$!
$ if (list .eq. 0)
$ then
$ cc_qual1 = cc_qual1+ " /nolist"
$ link_qual = link_qual+ " /nomap"
$ msg_qual = msg_qual+ " /nolist"
$ endif
$!
$! Create product directory, if needed. $! Create product directory, if needed.
$! $!
$ if (f$search( proc_dev_dir+ arch_name+ ".DIR;1") .eqs. "") $ if (f$search( proc_dev_dir+ arch_name+ ".DIR;1") .eqs. "")
@ -331,8 +345,6 @@ $ 'vo_c' "CC opts:", -
" ''cc_qual1'", - " ''cc_qual1'", -
" ''cc_qual2'" " ''cc_qual2'"
$! $!
$ msg_qual = "/object = ''objdir'"
$!
$! Inform the victim of our plans. $! Inform the victim of our plans.
$! $!
$ if (hpssl) $ if (hpssl)