Changeset 10460

Timestamp:

02/02/10 01:09:20 (2 years ago)

Author:

CSJewell

Message:

1) Make a bit more self-documenting
2) Change branding
3) Get modules list correct.

Location:

trunk/Perl-Dist-Padre

Files:

• lib/Perl/Dist/Padre.pm (modified) (19 diffs)
• share/Main.wxs.tt (modified) (6 diffs)

trunk/Perl-Dist-Padre/lib/Perl/Dist/Padre.pm

@@ -19 +19 @@
 
 
-
 ######################################################################
 # Configuration
@@ -26 +25 @@
     my $dist_dir = File::ShareDir::dist_dir('Perl-Dist-Padre');
 
-
     return shift->SUPER::new(
+        # Define the distribution information and where it goes.
         app_id            => 'padre',
         app_name          => 'Strawberry Perl plus Padre',
@@ -38 +37 @@
         perl_config_cf_email => 'padre-dev@perlide.org',
 
+        # The MSI stuff.
         msi_product_icon => catfile( $dist_dir, 'padre.ico' ),
         msi_help_url     => undef,
@@ -52 +52 @@
         trace => 1,
 
-        # Build both exe and zip versions
+        # Build both exe and zip versions.
         msi => 1,
         zip => 1,
@@ -59 +59 @@
         msm_to_use => 'http://strawberryperl.com/download/strawberry-msm/strawberry-perl-5.10.1.1.msm',
         msm_zip    => 'http://strawberryperl.com/download/strawberry-perl-5.10.1.1.zip',
-        msm_code   => '12345678-1111-122345678-1111-1111-1111',
-
-        # Tasks to complete to create Strawberry
+        msm_code   => '25668C6A-4ECB-3842-B85F-6F663B4E3A38',
+
+        # Tasks to complete to create Strawberry + Padre.
         tasklist => [
             'final_initialization',
@@ -72 +72 @@
             'install_padre_extras',
             'remove_waste',
-            'add_forgotten_files',
             'regenerate_fragments',
             'write',
         ],
 
+        # Other parameters passed in override the ones 
+        # here and in Strawberrry. 
         @_,
     );
@@ -82 +83 @@
 } ## end sub new
 
+
+
 sub output_base_filename {
-    return 'padre-strawberry-0.56';
+    return 'strawberry-plus-padre-0.56';
 }
+
+
 
 #####################################################################
@@ -95 +100 @@
 }
 
+
+
 sub install_perl_589 {
     my $self = shift;
@@ -101 +108 @@
 }
 
+
+
 sub install_perl_5100 {
     my $self = shift;
@@ -106 +115 @@
     return;
 }
+
+
 
 sub install_padre_prereq_modules_1 {
@@ -136 +147 @@
 
 
+
 sub install_padre_prereq_modules_2 {
     my $self = shift;
@@ -141 +153 @@
     # Manually install our non-Wx dependencies first to isolate
     # them from the Wx problems
-    # Note: ORLite::Migrate goes after ORLite once they don't clone it privately.
+    # NOTE: ORLite::Migrate goes after ORLite once they don't clone it privately.
+    # NOTE: Test::Exception goes before Test::Most when it's not in Strawberry.
     $self->install_modules( qw{
           Test::SubCalls
@@ -163 +176 @@
           Class::Data::Inheritable
           Exception::Class
-          Test::Exception
           Test::Most
           Parse::ExuberantCTags
@@ -195 +207 @@
 } ## end sub install_padre_prereq_modules_2
 
+
+
 sub install_padre_modules {
     my $self = shift;
 
     # The rest of the modules are order-specific,
-    # for reasons maybe involving CPAN.pm but not fully understodd.
+    # for reasons maybe involving CPAN.pm but not fully understood.
 
     # Install the Alien::wxWidgets module from a precompiled .par
@@ -261 +275 @@
 } ## end sub install_padre_extras
 
+
+
 sub dist_dir {
     my $self = shift;
@@ -295 +311 @@
 =head1 NAME
 
-Perl::Dist::Padre - Padre Standalone for Win32 builder
+Perl::Dist::Padre - Strawberry + Padre for Win32 builder
 
 =head1 VERSION
@@ -305 +321 @@
 =head1 DESCRIPTION
 
-This is the distribution builder used to create Padre Standalone for Win32.
+This is the distribution builder used to create Strawberry + Padre Standalone for Win32.
 
 =begin readme
@@ -324 +340 @@
 =head1 SYNOPSIS
 
-    # This module is only used to build Padre Standalone. 
+    # This module is only used to build Strawberry + Padre. 
     # See below if you want to try it yourself.
 
 =head2 Building Padre Standalone
 
-Unlike Strawberry, Padre Standalone does not have a standalone build script.
-
-To build Padre Standalone, run the following.
+Unlike Strawberry, Strawberry + Padre does not have a standalone build script.
+
+To build Strawberry + Padre, run the following.
 
     perldist_w Padre
@@ -404 +420 @@
 =head1 COPYRIGHT AND LICENSE
 
-Copyright (c) 2009 Adam Kennedy and Curtis Jewell.
+Copyright 2009 - 2010 Adam Kennedy and Curtis Jewell.
 
 This module is free software; you can redistribute it and/or

trunk/Perl-Dist-Padre/share/Main.wxs.tt

@@ -7 +7 @@
     Name="[% dist.app_name %]"
     UpgradeCode="[% dist.msi_upgrade_code %]"
-    Version="0.45.0" >
+    Version="0.56.0" >
 
     [% IF dist.msi_debug %]
@@ -19 +19 @@
     [% END %]
 
-    <Media Id="1" Cabinet="Perl.cab" CompressionLevel="high" EmbedCab="yes" />
+    <Media Id="1" Cabinet="Padre.cab" CompressionLevel="high" EmbedCab="yes" />
     
     [%# Upgrade Support %]
@@ -27 +27 @@
     <Upgrade Id="[% dist.msi_upgrade_code %]">
       <UpgradeVersion
-        Minimum="0.45.0"
+        Minimum="0.56.0"
         IncludeMinimum="yes"
         OnlyDetect="yes"
@@ -35 +35 @@
         Minimum="0.0.0"
         IncludeMinimum="yes"
-        Maximum="0.45.0"
+        Maximum="0.56.0"
         IncludeMaximum="no"
         Language="1033"
@@ -80 +80 @@
 [% dist.icons.as_string %]
 
-<CustomAction Id='CA_ClearFolder' BinaryKey='B_ClearFolder' DllEntry='ClearFolder' />
+    <CustomAction Id='CA_ClearSiteFolder' BinaryKey='B_ClearFolder' DllEntry='ClearSiteFolder' />
+    <InstallExecuteSequence>
+      <Custom Action='CA_ClearSiteFolder' Before='InstallInitialize'>
+        <![CDATA[UNINSTALL_SITE OR (Installed AND NOT OLDERVERSIONBEINGUPGRADED)]]>
+      </Custom>
+    </InstallExecuteSequence>
 
-<InstallExecuteSequence>
-  <Custom Action='CA_ClearFolder' Before='InstallInitialize'>REMOVE="ALL"</Custom>
-  <ScheduleReboot After="InstallFinalize"/>
-</InstallExecuteSequence>
-
-<Binary Id='B_ClearFolder' SourceFile='[% dist.wix_dist_dir %]\ClearFolderCA.dll' />
-<UI><ProgressText Action="CA_ClearFolder">Scanning for added files to delete... (please wait a minute)</ProgressText></UI>
+    <Binary Id='B_ClearFolder' SourceFile='[% dist.wix_dist_dir %]\ClearFolderCA.dll' />
+    <UI>
+      <ProgressText Action="CA_ClearSiteFolder">Preparing the site folder for cleaning... (please wait a while)</ProgressText>
+    </UI>
 
 [% IF dist.msi_feature_tree.defined %]
@@ -94 +96 @@
 [% END %]
     <Property Id='ARPNOREPAIR'>1</Property>
+    <Property Id='MSIFASTINSTALL'>1</Property>
+    <!-- Property Id='MSIDEPLOYMENTCOMPLIANT'>1</Property -->
+    <Property Id='PerlModuleID'>[% dist.msm_code_property %]</Property>
     <Property Id='ALLUSERS'>1</Property>
-    <Property Id='ARPCOMMENTS'>[% dist.app_name %] 0.41 on Perl 5.10.0</Property>
+    <Property Id='ARPCOMMENTS'>[% dist.app_name %] 0.56 on Perl 5.10.1</Property>
     <Property Id='ARPCONTACT'>[% dist.app_publisher %]</Property>
     <Property Id='ARPURLINFOABOUT'>[% dist.app_publisher_url %]</Property>