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

[fperrad at svn.parrot.org]

Author: fperrad
Date: Mon Nov 30 21:48:27 2009
New Revision: 42829
URL: https://trac.parrot.org/parrot/changeset/42829

Log:
[distutils] add a step bdist, and win32-inno-installer becomes bdist_wininst

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

Modified: trunk/runtime/parrot/library/distutils.pir
==============================================================================
--- trunk/runtime/parrot/library/distutils.pir	Mon Nov 30 19:36:15 2009	(r42828)
+++ trunk/runtime/parrot/library/distutils.pir	Mon Nov 30 21:48:27 2009	(r42829)
@@ -69,6 +69,10 @@
 
 Create a source distribution
 
+=item bdist, bdist_wininst
+
+Create a binary package or Windows Installer.
+
 =item help
 
 Print this help message.
@@ -228,13 +232,16 @@
     .const 'Sub' _manifest = '_manifest'
     register_step('manifest', _manifest)
 
+    .const 'Sub' _bdist = '_bdist'
+    register_step('bdist', _bdist)
+
     $P0 = get_config()
     $S0 = $P0['osname']
     unless $S0 == 'MSWin32' goto L1
-    .const 'Sub' _win32_inno_installer = '_win32_inno_installer'
-    register_step('win32-inno-installer', _win32_inno_installer)
-    .const 'Sub' _clean_win32_installer = '_clean_win32_installer'
-    register_step_after('clean', _clean_win32_installer)
+    .const 'Sub' _bdist_wininst = '_bdist_wininst'
+    register_step('bdist_wininst', _bdist_wininst)
+    .const 'Sub' _clean_wininst = '_clean_wininst'
+    register_step_after('clean', _clean_wininst)
   L1:
 .end
 
@@ -395,6 +402,8 @@
 
         sdist:          Create a source distribution
 
+        bdist:          Create a binary distribution
+
         help:           Print this help message.
 USAGE
     $I0 = exists kv['usage']
@@ -2682,9 +2691,25 @@
     system(cmd)
 .end
 
-=head3 Step win32-inno-installer
+=head3 Step bdist
+
+On Windows calls bdist_wininst, otherwise ...
+
+=cut
+
+.sub '_bdist' :anon
+    .param pmc kv :slurpy :named
+    $P0 = get_config()
+    $S0 = $P0['osname']
+    unless $S0 == 'MSWin32' goto L1
+    .tailcall run_step('bdist_wininst', kv :flat :named)
+  L1:
+    die "no bdist"
+.end
+
+=head3 Step bdist_wininst
 
-Only on Windows.
+Build an installer with Inno Setup.
 
 =over 4
 
@@ -2704,7 +2729,7 @@
 
 =cut
 
-.sub '_win32_inno_installer' :anon
+.sub '_bdist_wininst' :anon
     .param pmc kv :slurpy :named
     run_step('build', kv :flat :named)
 
@@ -2896,7 +2921,7 @@
     .return ($S0)
 .end
 
-.sub '_clean_win32_installer' :anon
+.sub '_clean_wininst' :anon
     .param pmc kv :slurpy :named
 
     $I0 = exists kv['installable_pbc']