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

[fperrad at svn.parrot.org]

Author: fperrad
Date: Mon Nov 30 19:36:15 2009
New Revision: 42828
URL: https://trac.parrot.org/parrot/changeset/42828

Log:
[distutils] minor refactor

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

Modified: trunk/runtime/parrot/library/distutils.pir
==============================================================================
--- trunk/runtime/parrot/library/distutils.pir	Mon Nov 30 18:54:52 2009	(r42827)
+++ trunk/runtime/parrot/library/distutils.pir	Mon Nov 30 19:36:15 2009	(r42828)
@@ -2623,7 +2623,7 @@
     .param pmc kv :slurpy :named
     run_step('manifest', kv :flat :named)
 
-    $S0 = get_tarname(kv :flat :named)
+    $S0 = get_tarname('.tar', kv :flat :named)
 
     .local string cmd
     cmd = 'tar -cvf ' . $S0
@@ -2635,6 +2635,7 @@
 .end
 
 .sub 'get_tarname' :anon
+    .param string ext
     .param pmc kv :slurpy :named
     .local string name
     $S0 = cwd()
@@ -2655,7 +2656,7 @@
     $S0 = 'parrot-' . name
     $S0 .= '-'
     $S0 .= version
-    $S0 .= '.tar'
+    $S0 .= ext
     .return ($S0)
 .end
 
@@ -2667,7 +2668,7 @@
     .param pmc kv :slurpy :named
     run_step('manifest', kv :flat :named)
 
-    $S0 = get_zipname(kv :flat :named)
+    $S0 = get_tarname('.zip', kv :flat :named)
 
     .local string cmd
     cmd = 'cat'
@@ -2681,31 +2682,6 @@
     system(cmd)
 .end
 
-.sub 'get_zipname' :anon
-    .param pmc kv :slurpy :named
-    .local string name
-    $S0 = cwd()
-    name = basename($S0)
-    $I0 = exists kv['name']
-    unless $I0 goto L1
-    $S0 = kv['name']
-    name = downcase $S0
-  L1:
-
-    .local string version
-    version = 'HEAD'
-    $I0 = exists kv['version']
-    unless $I0 goto L2
-    version = kv['version']
-  L2:
-
-    $S0 = 'parrot-' . name
-    $S0 .= '-'
-    $S0 .= version
-    $S0 .= '.zip'
-    .return ($S0)
-.end
-
 =head3 Step win32-inno-installer
 
 Only on Windows.