Changeset 5307

Timestamp:

06/18/09 07:38:42 (3 years ago)

Author:

szabgab

Message:

factor out mode code to the lib/Tools.pm file and fix the release script to work with the Perl6 plugin as well

Location:

trunk

Files:

• Padre/dev.pl (modified) (2 diffs)
• tools/lib/Tools.pm (modified) (3 diffs)
• tools/release.pl (modified) (4 diffs)

trunk/Padre/dev.pl

@@ -10 +10 @@
 # No need to distribute it
 use FindBin;
-use File::Which    ();
 use File::Basename ();
-use Probe::Perl    ();
 $ENV{PADRE_DEV}  = 1;
 $ENV{PADRE_HOME} = $FindBin::Bin;
@@ -28 +26 @@
 convert_po_to_mo($FindBin::Bin);
 
+my $perl = get_perl();
 
-my $perl = Probe::Perl->find_perl_interpreter;
-if ( $^O eq 'darwin' ) {
-    # I presume there's a proper way to do this?
-    $perl = scalar File::Which::which('wxPerl');
-    chomp($perl);
-    unless ( -e $perl ) {
-        error("padre needs to run using wxPerl on OSX");
-    }
-}
 my @cmd = (
     qq[$perl],

trunk/tools/lib/Tools.pm

@@ -4 +4 @@
 
 use base 'Exporter';
-our @EXPORT = qw(convert_po_to_mo);
+our @EXPORT = qw(convert_po_to_mo get_perl);
+
+use File::Which    ();
+use Probe::Perl    ();
+use File::Basename ();
+if ( $^O eq 'MSWin32' ) {
+    # "Default glob() will misinterpret spaces in folder names as seperators, install File::Glob::Windows to fix this behavior!");
+    require File::Glob::Windows;
+}
 
 sub convert_po_to_mo {
@@ -37 +45 @@
         $msgfmt = scalar File::Which::which('msgfmt');
     } elsif ( $^O eq 'MSWin32' ) {
-        eval {
-            require File::Glob::Windows;
-        };
-        if( $@ ) {
-            die("Default glob() will misinterpret spaces in folder names as seperators, install File::Glob::Windows to fix this behavior!");
-        }
         my $p = "C:/Program Files/GnuWin32/bin/msgfmt.exe";
         if ( -e $p ) {
@@ -54 +56 @@
 }
 
+sub get_perl {
+    my $perl = Probe::Perl->find_perl_interpreter;
+    if ( $^O eq 'darwin' ) {
+        # I presume there's a proper way to do this?
+        $perl = scalar File::Which::which('wxPerl');
+        chomp($perl);
+        unless ( -e $perl ) {
+            error("padre needs to run using wxPerl on OSX");
+        }
+    }
+}
+
 1;

trunk/tools/release.pl

@@ -15 +15 @@
 use File::Slurp    qw(read_file write_file);
 use File::Temp     ();
+use FindBin;
+
+use lib $FindBin::Bin;
+use lib::Tools;
 
 my $SVN     = "http://svn.perlide.org/padre";
@@ -54 +58 @@
 }
 
-my $dir = File::Temp::tempdir( CLEANUP => 1 );
+my $dir = File::Temp::tempdir( CLEANUP => 0 );
 chdir $dir;
 print "DIR $dir\n";
@@ -61 +65 @@
 chdir 'src';
 
-if ($name eq 'Padre') {
-    my @LOCALES = map { substr(File::Basename::basename($_), 0, -3) } glob "share/locale/*.po";
-    for my $locale ( @LOCALES ) {
-        _system("msgfmt -o share/locale/$locale.mo share/locale/$locale.po");
+my $locale_path;
+if (-d 'share/locale') {
+    $locale_path = Cwd::cwd();
+} else {
+    (my $path = $name) =~ s{-}{/}g;
+    if (-d "lib/$path/share/locale") {
+        $locale_path = Cwd::cwd() . "/lib/$path";
     }
+}
+
+if ($locale_path) {
+    print "locale path: '$locale_path'\n";
+    convert_po_to_mo($locale_path);
 }
 
@@ -72 +84 @@
 die if $error;
 
-my $make = $^O eq 'freebsd' ? 'HARNESS_DEBUG=1 gmake' : 'make';
-my $makefile_pl;
+my $make         = $^O eq 'freebsd' ? 'HARNESS_DEBUG=1 gmake' : 'make';
+my $makefile_pl  = "Makefile.PL";
 if(-f "Build.PL") {
     $makefile_pl = "Build.PL";
     $make = "./Build";
-} else {
-    $makefile_pl = "Makefile.PL";
 }
 _system("$^X $makefile_pl");