[svn:parrot] r46786 - trunk/runtime/parrot/library

[fperrad at svn.parrot.org]

Author: fperrad
Date: Wed May 19 10:08:44 2010
New Revision: 46786
URL: https://trac.parrot.org/parrot/changeset/46786

Log:
[distutils] old NQP is gone

Modified:
   trunk/runtime/parrot/library/distutils.pir

Modified: trunk/runtime/parrot/library/distutils.pir
==============================================================================
--- trunk/runtime/parrot/library/distutils.pir	Wed May 19 09:59:54 2010	(r46785)
+++ trunk/runtime/parrot/library/distutils.pir	Wed May 19 10:08:44 2010	(r46786)
@@ -185,8 +185,6 @@
     register_step_after('build', _build_pir_pge)
     .const 'Sub' _build_pir_tge = '_build_pir_tge'
     register_step_after('build', _build_pir_tge)
-    .const 'Sub' _build_pir_nqp = '_build_pir_nqp'
-    register_step_after('build', _build_pir_nqp)
     .const 'Sub' _build_pir_nqp_rx = '_build_pir_nqp_rx'
     register_step_after('build', _build_pir_nqp_rx)
     .const 'Sub' _build_inc_pir = '_build_inc_pir'
@@ -214,8 +212,6 @@
     register_step_after('clean', _clean_pir_pge)
     .const 'Sub' _clean_pir_tge = '_clean_pir_tge'
     register_step_after('clean', _clean_pir_tge)
-    .const 'Sub' _clean_pir_nqp = '_clean_pir_nqp'
-    register_step_after('clean', _clean_pir_nqp)
     .const 'Sub' _clean_pir_nqp_rx = '_clean_pir_nqp_rx'
     register_step_after('clean', _clean_pir_nqp_rx)
     .const 'Sub' _clean_inc_pir = '_clean_inc_pir'
@@ -679,61 +675,7 @@
     .tailcall run_jobs(jobs)
 .end
 
-=item pir_nqp
-
-hash
-
-the key is the PIR pathname
-
-the value is the NQP pathname
-
-=item pir_nqp_flags
-
-=cut
-
-.sub '_build_pir_nqp' :anon
-    .param pmc kv :slurpy :named
-    $I0 = exists kv['pir_nqp']
-    unless $I0 goto L1
-    $P0 = kv['pir_nqp']
-    $S0 = get_value('pir_nqp_flags', '' :named('default'), kv :flat :named)
-    build_pir_nqp($P0, $S0)
-  L1:
-.end
-
-.sub 'build_pir_nqp'
-    .param pmc hash
-    .param string flags
-    .local pmc jobs
-    jobs = new 'ResizableStringArray'
-    $P0 = iter hash
-  L1:
-    unless $P0 goto L2
-    .local string pir, nqp
-    pir = shift $P0
-    nqp = hash[pir]
-    $I0 = newer(pir, nqp)
-    if $I0 goto L1
-    $S0 = dirname(pir)
-    mkpath($S0, 1 :named('verbose'))
-    .local string cmd
-    cmd = get_parrot()
-    cmd .= " "
-    $S0 = get_compiler('nqp/nqp.pbc')
-    cmd .= $S0
-    cmd .= " --target=pir --output="
-    cmd .= pir
-    cmd .= " "
-    cmd .= flags
-    cmd .= " "
-    cmd .= nqp
-    push jobs, cmd
-    goto L1
-  L2:
-    .tailcall run_jobs(jobs)
-.end
-
-=item pir_nqp-rx / pir_nqprx
+=item pir_nqp-rx / pir_nqprx / pir_nqp
 
 hash
 
@@ -759,6 +701,12 @@
     $S0 = get_value('pir_nqp_flags', '' :named('default'), kv :flat :named)
     build_pir_nqp_rx($P0, $S0)
   L2:
+    $I0 = exists kv['pir_nqp']
+    unless $I0 goto L3
+    $P0 = kv['pir_nqp']
+    $S0 = get_value('pir_nqp_flags', '' :named('default'), kv :flat :named)
+    build_pir_nqp_rx($P0, $S0)
+  L3:
 .end
 
 .sub 'build_pir_nqp_rx'
@@ -1646,20 +1594,7 @@
   L1:
 .end
 
-=item pir_nqp
-
-=cut
-
-.sub '_clean_pir_nqp' :anon
-    .param pmc kv :slurpy :named
-    $I0 = exists kv['pir_nqp']
-    unless $I0 goto L1
-    $P0 = kv['pir_nqp']
-    clean_key($P0)
-  L1:
-.end
-
-=item pir_nqp-rx / pir_nqprx
+=item pir_nqp-rx / pir_nqprx / pir_nqp
 
 =cut
 
@@ -1675,6 +1610,11 @@
     $P0 = kv['pir_nqprx']
     clean_key($P0)
   L2:
+    $I0 = exists kv['pir_nqp']
+    unless $I0 goto L3
+    $P0 = kv['pir_nqp']
+    clean_key($P0)
+  L3:
 .end
 
 =item pbc_pbc