[svn:parrot] r42865 - trunk/runtime/parrot/library
fperrad at svn.parrot.org
fperrad at svn.parrot.org
Wed Dec 2 18:21:46 UTC 2009
Author: fperrad
Date: Wed Dec 2 18:21:44 2009
New Revision: 42865
URL: https://trac.parrot.org/parrot/changeset/42865
Log:
[distutils] add a named parameter 'verbose' to some OS utilities
Modified:
trunk/runtime/parrot/library/distutils.pir
Modified: trunk/runtime/parrot/library/distutils.pir
==============================================================================
--- trunk/runtime/parrot/library/distutils.pir Wed Dec 2 17:19:35 2009 (r42864)
+++ trunk/runtime/parrot/library/distutils.pir Wed Dec 2 18:21:44 2009 (r42865)
@@ -472,7 +472,7 @@
cmd .= pbc
cmd .= " "
cmd .= src
- system(cmd)
+ system(cmd, 1 :named('verbose'))
goto L1
L2:
.end
@@ -536,7 +536,7 @@
cmd .= flags
cmd .= " "
cmd .= src
- system(cmd)
+ system(cmd, 1 :named('verbose'))
goto L1
L2:
.end
@@ -579,7 +579,7 @@
cmd .= pir
cmd .= " "
cmd .= tge
- system(cmd)
+ system(cmd, 1 :named('verbose'))
goto L1
L2:
.end
@@ -633,7 +633,7 @@
cmd .= flags
cmd .= " "
cmd .= nqp
- system(cmd)
+ system(cmd, 1 :named('verbose'))
goto L1
L2:
.end
@@ -673,7 +673,7 @@
cmd .= pir
cmd .= " "
cmd .= nqp
- system(cmd)
+ system(cmd, 1 :named('verbose'))
goto L1
L2:
.end
@@ -719,7 +719,7 @@
cmd .= exe
cmd .= " "
cmd .= pbc
- system(cmd)
+ system(cmd, 1 :named('verbose'))
goto L1
L2:
.end
@@ -769,10 +769,10 @@
cmd .= " "
cmd .= pbc
cmd .= " --install"
- system(cmd)
+ system(cmd, 1 :named('verbose'))
unless has_strip goto L1
cmd = "strip " . $S1
- system(cmd)
+ system(cmd, 1 :named('verbose'))
goto L1
L2:
.end
@@ -811,7 +811,7 @@
.param pmc kv :slurpy :named
$I0 = exists kv['dynops']
unless $I0 goto L1
- mkpath('dynext')
+ mkpath('dynext', 1 :named('verbose'))
.local string cflags, ldflags
cflags = ''
$I0 = exists kv['dynops_cflags']
@@ -876,7 +876,7 @@
cmd .= core
cmd .= " --dynamic "
cmd .= src
- system(cmd)
+ system(cmd, 1 :named('verbose'))
$S0 = config['o']
$S1 = _mk_path_gen_dynops(src, ops, suffix, $S0)
@@ -909,12 +909,12 @@
cmd .= " "
L1:
cmd .= ldflags
- system(cmd)
+ system(cmd, 1 :named('verbose'))
$I0 = _has_strip(cflags)
unless $I0 goto L2
cmd = "strip " . dynext
- system(cmd)
+ system(cmd, 1 :named('verbose'))
L2:
.end
@@ -946,7 +946,7 @@
cmd .= cflags
cmd .= " "
cmd .= src
- system(cmd)
+ system(cmd, 1 :named('verbose'))
.end
.sub '_mk_path_dynops' :anon
@@ -999,7 +999,7 @@
.param pmc kv :slurpy :named
$I0 = exists kv['dynpmc']
unless $I0 goto L1
- mkpath('dynext')
+ mkpath('dynext', 1 :named('verbose'))
.local string cflags, ldflags
cflags = ''
$I0 = exists kv['dynpmc_cflags']
@@ -1081,7 +1081,7 @@
# cmd .= src
$S0 = basename(src)
cmd .= $S0
- system(cmd)
+ system(cmd, 1 :named('verbose'))
cmd = clone pmc2c
cmd .= " --c "
@@ -1090,7 +1090,7 @@
# cmd .= src
$S0 = basename(src)
cmd .= $S0
- system(cmd)
+ system(cmd, 1 :named('verbose'))
chdir(current_dir)
@@ -1137,7 +1137,7 @@
cmd .= " "
goto L1
L2:
- system(cmd)
+ system(cmd, 1 :named('verbose'))
chdir(current_dir)
@@ -1179,12 +1179,12 @@
cmd .= " "
L5:
cmd .= ldflags
- system(cmd)
+ system(cmd, 1 :named('verbose'))
$I0 = _has_strip(cflags)
unless $I0 goto L6
cmd = "strip " . dynext
- system(cmd)
+ system(cmd, 1 :named('verbose'))
L6:
.end
@@ -1257,7 +1257,7 @@
cmd .= pod
cmd .= " --outfile "
cmd .= html
- system(cmd)
+ system(cmd, 1 :named('verbose'))
unlink("pod2htmd.tmp")
unlink("pod2htmi.tmp")
goto L1
@@ -1289,7 +1289,7 @@
L1:
unless $P0 goto L2
$S0 = shift $P0
- unlink($S0)
+ unlink($S0, 1 :named('verbose'))
goto L1
L2:
.end
@@ -1373,11 +1373,11 @@
$I0 -= 4
$S0 = substr pbc, 0, $I0
$S1 = $S0 . exe
- unlink($S1)
+ unlink($S1, 1 :named('verbose'))
$S1 = $S0 . '.c'
- unlink($S1)
+ unlink($S1, 1 :named('verbose'))
$S1 = $S0 . obj
- unlink($S1)
+ unlink($S1, 1 :named('verbose'))
goto L1
L2:
.end
@@ -1410,11 +1410,11 @@
$S0 = substr pbc, 0, $I0
$S1 = 'installable_' . $S0
$S1 .= exe
- unlink($S1)
+ unlink($S1, 1 :named('verbose'))
$S1 = $S0 . '.c'
- unlink($S1)
+ unlink($S1, 1 :named('verbose'))
$S1 = $S0 . obj
- unlink($S1)
+ unlink($S1, 1 :named('verbose'))
goto L1
L2:
.end
@@ -1452,13 +1452,13 @@
core = shift $P1
suffix = cores[core]
$S0 = _mk_path_dynops(ops, suffix, load_ext)
- unlink($S0)
+ unlink($S0, 1 :named('verbose'))
$S0 = _mk_path_gen_dynops(src, ops, suffix, '.c')
- unlink($S0)
+ unlink($S0, 1 :named('verbose'))
$S0 = _mk_path_gen_dynops(src, ops, suffix, '.h')
- unlink($S0)
+ unlink($S0, 1 :named('verbose'))
$S0 = _mk_path_gen_dynops(src, ops, suffix, obj)
- unlink($S0)
+ unlink($S0, 1 :named('verbose'))
goto L3
L4:
goto L1
@@ -1491,29 +1491,29 @@
.local pmc srcs
srcs = hash[group]
$S0 = _mk_path_dynpmc(group, load_ext)
- unlink($S0)
+ unlink($S0, 1 :named('verbose'))
$P1 = iter srcs
L3:
unless $P1 goto L4
.local string src
src = shift $P1
$S0 = _mk_path_gen_dynpmc(src, '.c')
- unlink($S0)
+ unlink($S0, 1 :named('verbose'))
$S0 = _mk_path_gen_dynpmc(src, '.h')
- unlink($S0)
+ unlink($S0, 1 :named('verbose'))
$S0 = _mk_path_gen_dynpmc(src, '.dump')
- unlink($S0)
+ unlink($S0, 1 :named('verbose'))
$S0 = _mk_path_gen_dynpmc(src, obj)
- unlink($S0)
+ unlink($S0, 1 :named('verbose'))
goto L3
L4:
src = srcs[0]
$S0 = _mk_path_gen_dynpmc_group(src, group, '.c')
- unlink($S0)
+ unlink($S0, 1 :named('verbose'))
$S0 = _mk_path_gen_dynpmc_group(src, group, '.h')
- unlink($S0)
+ unlink($S0, 1 :named('verbose'))
$S0 = _mk_path_gen_dynpmc_group(src, group, obj)
- unlink($S0)
+ unlink($S0, 1 :named('verbose'))
goto L1
L2:
.end
@@ -1565,7 +1565,7 @@
.sub '_update_cvs' :anon
.param pmc kv :slurpy :named
- system('cvs update')
+ system('cvs update', 1 :named('verbose'))
.end
=item Git
@@ -1574,7 +1574,7 @@
.sub '_update_git' :anon
.param pmc kv :slurpy :named
- system('git pull')
+ system('git pull', 1 :named('verbose'))
.end
=item Mercurial
@@ -1583,7 +1583,7 @@
.sub '_update_hg' :anon
.param pmc kv :slurpy :named
- system('hg pull')
+ system('hg pull', 1 :named('verbose'))
.end
=item SVN
@@ -1592,7 +1592,7 @@
.sub '_update_svn' :anon
.param pmc kv :slurpy :named
- system('svn update')
+ system('svn update', 1 :named('verbose'))
.end
=back
@@ -1647,7 +1647,7 @@
$S0 = kv['harness_files']
L3:
cmd .= $S0
- system(cmd)
+ system(cmd, 1 :named('verbose'))
.end
=item prove_exec
@@ -1685,7 +1685,7 @@
$S0 = kv['prove_files']
L3:
cmd .= $S0
- system(cmd)
+ system(cmd, 1 :named('verbose'))
.end
=head3 Step smoke
@@ -1707,7 +1707,7 @@
.sub '_clean_smoke' :anon
.param pmc kv :slurpy :named
$S0 = get_prove_archive(kv :flat :named)
- unlink($S0)
+ unlink($S0, 1 :named('verbose'))
.end
=over 4
@@ -1763,7 +1763,7 @@
.local string archive
archive = get_prove_archive(kv :flat :named)
cmd .= archive
- system(cmd)
+ system(cmd, 1 :named('verbose'))
$I0 = exists kv['smolder_url']
unless $I0 goto L5
@@ -1797,7 +1797,7 @@
cmd .= " "
$S0 = kv['smolder_url']
cmd .= $S0
- system(cmd)
+ system(cmd, 1 :named('verbose'))
L5:
.end
@@ -1864,7 +1864,7 @@
if $I0 goto L0
$S0 = array
$S2 = $S1 . $S0
- install($S0, $S2, 0)
+ install($S0, $S2, 1 :named('verbose'))
goto L2
L0:
$P0 = iter array
@@ -1872,7 +1872,7 @@
unless $P0 goto L2
$S0 = shift $P0
$S2 = $S1 . $S0
- install($S0, $S2, 0)
+ install($S0, $S2, 1 :named('verbose'))
goto L1
L2:
.end
@@ -1888,7 +1888,7 @@
if $I0 goto L0
$S0 = array
$S2 = $S1 . $S0
- install($S0, $S2, 0)
+ install($S0, $S2, 1 :named('verbose'))
goto L2
L0:
$P0 = iter array
@@ -1896,7 +1896,7 @@
unless $P0 goto L2
$S0 = shift $P0
$S2 = $S1 . $S0
- install($S0, $S2, 0)
+ install($S0, $S2, 1 :named('verbose'))
goto L1
L2:
.end
@@ -1932,7 +1932,7 @@
$S2 = bindir . '/'
$S2 .= bin
$S2 .= exe
- install($S1, $S2, 1)
+ install($S1, $S2, 1 :named('exe'), 1 :named('verbose'))
goto L1
L2:
.end
@@ -1969,7 +1969,7 @@
$S1 = _mk_path_dynops(ops, suffix, load_ext)
$S2 = libdir . "/"
$S2 .= $S1
- install($S1, $S2, 1)
+ install($S1, $S2, 1 :named('exe'), 1 :named('verbose'))
goto L3
L4:
goto L1
@@ -2001,7 +2001,7 @@
$S1 = _mk_path_dynpmc($S0, load_ext)
$S2 = libdir . "/"
$S2 .= $S1
- install($S1, $S2, 1)
+ install($S1, $S2, 1 :named('exe'), 1 :named('verbose'))
goto L1
L2:
.end
@@ -2051,7 +2051,7 @@
if $I0 goto L0
$S0 = array
$S2 = $S1 . $S0
- unlink($S2)
+ unlink($S2, 1 :named('verbose'))
goto L2
L0:
$P0 = iter array
@@ -2059,7 +2059,7 @@
unless $P0 goto L2
$S0 = shift $P0
$S2 = $S1 . $S0
- unlink($S2)
+ unlink($S2, 1 :named('verbose'))
goto L1
L2:
.end
@@ -2075,7 +2075,7 @@
if $I0 goto L0
$S0 = array
$S2 = $S1 . $S0
- unlink($S2)
+ unlink($S2, 1 :named('verbose'))
goto L2
L0:
$P0 = iter array
@@ -2083,7 +2083,7 @@
unless $P0 goto L2
$S0 = shift $P0
$S2 = $S1 . $S0
- unlink($S2)
+ unlink($S2, 1 :named('verbose'))
goto L1
L2:
.end
@@ -2109,7 +2109,7 @@
$S1 = bindir . '/'
$S1 .= bin
$S1 .= exe
- unlink($S1)
+ unlink($S1, 1 :named('verbose'))
goto L1
L2:
.end
@@ -2142,7 +2142,7 @@
$S0 = _mk_path_dynops(ops, suffix, load_ext)
$S1 = libdir . "/"
$S1 .= $S0
- unlink($S1)
+ unlink($S1, 1 :named('verbose'))
goto L3
L4:
goto L1
@@ -2170,7 +2170,7 @@
$S0 = _mk_path_dynpmc($S0, load_ext)
$S1 = libdir . "/"
$S1 .= $S0
- unlink($S1)
+ unlink($S1, 1 :named('verbose'))
goto L1
L2:
.end
@@ -2586,18 +2586,18 @@
.local string cmd
cmd = 'tar -cvf ' . $S0
cmd .= ' -T MANIFEST'
- system(cmd)
+ system(cmd, 1 :named('verbose'))
cmd = 'gzip --best ' . $S0
- system(cmd)
+ system(cmd, 1 :named('verbose'))
.end
.sub '_clean_gztar' :anon
.param pmc kv :slurpy :named
$S0 = get_tarname('.tar.gz', kv :flat :named)
- unlink($S0)
- unlink('MANIFEST')
+ unlink($S0, 1 :named('verbose'))
+ unlink('MANIFEST', 1 :named('verbose'))
.end
.sub 'get_tarname' :anon
@@ -2633,15 +2633,15 @@
L1:
cmd .= ' MANIFEST | zip -9 -@ '
cmd .= $S0
- system(cmd)
+ system(cmd, 1 :named('verbose'))
.end
.sub '_clean_zip' :anon
.param pmc kv :slurpy :named
$S0 = get_tarname('.zip', kv :flat :named)
- unlink($S0)
- unlink('MANIFEST')
+ unlink($S0, 1 :named('verbose'))
+ unlink('MANIFEST', 1 :named('verbose'))
.end
=head3 Step bdist
@@ -2704,14 +2704,14 @@
$S2 = bin . exe
$I0 = newer($S2, $S1)
if $I0 goto L2
- cp($S1, $S2)
+ cp($S1, $S2, 1 :named('verbose'))
goto L2
L1:
$S0 = mk_inno_script(kv :flat :named)
spew('inno.iss', $S0)
- system("iscc inno.iss")
+ system("iscc inno.iss", 1 :named('verbose'))
.end
.include 'tm.pasm'
@@ -2908,13 +2908,13 @@
unless $P1 goto L1
bin = shift $P1
$S0 = bin . exe
- unlink($S0)
+ unlink($S0, 1 :named('verbose'))
goto L2
L1:
- unlink('inno.iss')
+ unlink('inno.iss', 1 :named('verbose'))
$S0 = get_setupname('.exe', kv :flat :named)
- unlink($S0)
+ unlink($S0, 1 :named('verbose'))
.end
=head3 Configuration Helpers
@@ -3220,7 +3220,12 @@
.sub 'system'
.param string cmd
+ .param int verbose :named('verbose') :optional
+ .param int has_verbose :opt_flag
+ unless has_verbose goto L1
+ unless verbose goto L1
say cmd
+ L1:
$I0 = spawnw cmd
.end
@@ -3275,6 +3280,7 @@
.sub 'mkpath'
.param string pathname
+ .param int verbose :named('verbose') :optional
$I1 = 1
L1:
$I1 = index pathname, '/', $I1
@@ -3283,12 +3289,12 @@
inc $I1
$I0 = stat $S0, .STAT_EXISTS
if $I0 goto L1
- mkdir($S0)
+ mkdir($S0, verbose :named('verbose'))
goto L1
L2:
$I0 = stat pathname, .STAT_EXISTS
if $I0 goto L3
- mkdir(pathname)
+ mkdir(pathname, verbose :named('verbose'))
L3:
.end
@@ -3298,8 +3304,13 @@
.sub 'mkdir'
.param string dirname
+ .param int verbose :named('verbose') :optional
+ .param int has_verbose :opt_flag
+ unless has_verbose goto L1
+ unless verbose goto L1
print "mkdir "
say dirname
+ L1:
$P0 = new 'OS'
$I1 = 0o775
$P0.'mkdir'(dirname, $I1)
@@ -3312,8 +3323,9 @@
.sub 'install'
.param string src
.param string dst
- .param int exe :optional
- .param int has_exe :opt_flag
+ .param int exe :named('exe') :optional
+ .param int has_exe :opt_flag
+ .param int verbose :named('verbose') :optional
# mkpath
$I1 = 1
L1:
@@ -3323,15 +3335,15 @@
inc $I1
$I0 = stat $S0, .STAT_EXISTS
if $I0 goto L1
- mkdir($S0)
+ mkdir($S0, verbose :named('verbose'))
goto L1
L2:
$I0 = newer(dst, src)
if $I0 goto L3
- cp(src, dst)
+ cp(src, dst, verbose :named('verbose'))
unless has_exe goto L3
unless exe goto L3
- chmod(dst, 0o755)
+ chmod(dst, 0o755, verbose :named('verbose'))
L3:
.end
@@ -3342,10 +3354,15 @@
.sub 'cp'
.param string src
.param string dst
+ .param int verbose :named('verbose') :optional
+ .param int has_verbose :opt_flag
+ unless has_verbose goto L1
+ unless verbose goto L1
print "cp "
print src
print " "
say dst
+ L1:
$P0 = new 'FileHandle'
$S0 = $P0.'readall'(src)
$P0.'open'(dst, 'w')
@@ -3360,6 +3377,7 @@
.sub 'chmod'
.param string filename
.param int mode
+ .param int verbose :named('verbose') :optional
$P0 = get_config()
.local string cmd
cmd = $P0['perl']
@@ -3371,7 +3389,7 @@
cmd .= $S0
cmd .= " "
cmd .= filename
- system(cmd)
+ system(cmd, verbose :named('verbose'))
.end
=item unlink
@@ -3380,12 +3398,17 @@
.sub 'unlink'
.param string filename
+ .param int verbose :named('verbose') :optional
+ .param int has_verbose :opt_flag
$I0 = stat filename, .STAT_EXISTS
unless $I0 goto L1
$I0 = stat filename, .STAT_ISREG
unless $I0 goto L1
+ unless has_verbose goto L2
+ unless verbose goto L2
print "unlink "
say filename
+ L2:
new $P0, 'OS'
$P0.'rm'(filename)
L1:
@@ -3449,6 +3472,13 @@
.sub 'chdir'
.param string dirname
+ .param int verbose :named('verbose') :optional
+ .param int has_verbose :opt_flag
+ unless has_verbose goto L1
+ unless verbose goto L1
+ print "cd "
+ say dirname
+ L1:
new $P0, 'OS'
$P0.'chdir'(dirname)
.end
More information about the parrot-commits
mailing list