Changeset 8875 for lang/perl/Alien-MeCab

Timestamp:

04/04/08 17:41:34 (8 months ago)

Author:

daisuke

Message:

lang/perl/Alien-MeCab?; apply patch from osawa -- should work on windows. *should* work

Location:

lang/perl/Alien-MeCab/trunk

Files:

• Makefile.PL (modified) (4 diffs)
• lib/Alien/MeCab.pm (modified) (1 diff)
• src/fetchsrc.pl (modified) (3 diffs)

lang/perl/Alien-MeCab/trunk/Makefile.PL

@@ -21 +21 @@
 my $MECAB_BASENAME   = "mecab-$MECAB_VERSION.tar.gz";
 my $MECAB_SOURCE     = File::Spec->catfile("src", $MECAB_BASENAME);
+my $MECAB_EXE        = File::Spec->catfile("src", "mecab-$MECAB_VERSION.exe") if $^O eq 'MSWin32';
 
 eval {
@@ -46 +47 @@
 
 # Ask if we want to download the source.
-if (! -f $MECAB_SOURCE) {
-    my $yn = prompt("mecab source file $MECAB_SOURCE does not exist. Download it now?", "y");
+my $sourcefile;
+my $test;
+$sourcefile = ($^O eq 'MSWin32') ? $MECAB_EXE
+                                 : $MECAB_SOURCE;
+$test = ($^O eq 'MSWin32') ? "win\n"
+                           : "other\n";
+if (! -f $sourcefile) {
+    my $yn = prompt("mecab source file $sourcefile does not exist. Download it now?", "y");
     if ($yn =~ /^y(?:es)?$/i) {
         my @cmd = ($^X, File::Spec->catfile("src", "fetchsrc.pl"), "--version", $MECAB_VERSION);
@@ -55 +62 @@
 
 # If the source hasn't been expanded, then unpack it
-if (! -d $MECAB_SOURCE_DIR) {
-    my $yn = prompt("Mecab source directory has not been unpacked yet. Unpack it now?", "y");
-    if ($yn =~ /^y(?:es)?$/i) {
-        eval {
-            require Archive::Tar;
-            Archive::Tar->can_handle_compressed_files or die "No compression support :(";
-        };
-        if ($@) {
-            print STDERR "Archive extraction requires Archive::Tar (with IO::Zlib)\n";
-            exit 0;
+if ($^O ne 'MSWin32') {
+    if (! -d $MECAB_SOURCE_DIR) {
+        my $yn = prompt("Mecab source directory has not been unpacked yet. Unpack it now?", "y");
+        if ($yn =~ /^y(?:es)?$/i) {
+            eval {
+                require Archive::Tar;
+                Archive::Tar->can_handle_compressed_files or die "No compression support :(";
+            };
+            if ($@) {
+                print STDERR "Archive extraction requires Archive::Tar (with IO::Zlib)\n";
+                exit 0;
+            }
+
+            eval {
+                chdir File::Spec->catfile($CURDIR, 'src');
+
+                print "Unpacking... (please be patient)\n";
+                Archive::Tar->extract_archive( $MECAB_BASENAME, 1 );
+            };
+            if ($@) {
+                print STDERR "Failed to gunzip file $MECAB_SOURCE $IO::Compress::Gunzip::GunzipError\n";
+                chdir $CURDIR;
+                exit 0;
+            }
+            chdir $CURDIR;
+        }
+    }
+
+    {
+        print "\n";
+        my $run_configure;
+        if( -e File::Spec->catfile($MECAB_SOURCE_DIR, 'config.status')) {
+            $run_configure = prompt(
+                "Looks like MeCab has already been configured.\n".
+                "Do you want to re-run configure?",
+                "n"
+            );
+        } else {
+            $run_configure = prompt(
+                "No config.status found. Run MeCab's configure now?", 'y'
+            );
         }
 
-        eval {
-            chdir File::Spec->catfile($CURDIR, 'src');
+        if( $run_configure =~ /^y/i ) {
+            my $configure_args = prompt(
+                "\nWould you like to pass any arguments to configure?", 
+            );
 
-            print "Unpacking... (please be patient)\n";
-            Archive::Tar->extract_archive( $MECAB_BASENAME, 1 );
-        };
-        if ($@) {
-            print STDERR "Failed to gunzip file $MECAB_SOURCE $IO::Compress::Gunzip::GunzipError\n";
-            chdir $CURDIR;
-            exit 0;
-        }
-        chdir $CURDIR;
-    }
-}
+            print "\nMeCab will be configured with the following arguments:\n",
+                "  $configure_args\n";
 
-{
-    print "\n";
-    my $run_configure;
-    if( -e File::Spec->catfile($MECAB_SOURCE_DIR, 'config.status')) {
-        $run_configure = prompt(
-            "Looks like MeCab has already been configured.\n".
-            "Do you want to re-run configure?",
-            "n"
-        );
-    } else {
-        $run_configure = prompt(
-            "No config.status found. Run MeCab's configure now?", 'y'
-        );
-    }
-
-    if( $run_configure =~ /^y/i ) {
-        my $configure_args = prompt(
-            "\nWould you like to pass any arguments to configure?", 
-        );
-
-        print "\nMeCab will be configured with the following arguments:\n",
-            "  $configure_args\n";
-
-        chdir $MECAB_SOURCE_DIR;
-        my @cmd = (File::Spec->catfile($MECAB_SOURCE_DIR, "configure"),
-            split(/\s+/, $configure_args));
-        if (system(@cmd) != 0) {
-            print <<"END";
+            chdir $MECAB_SOURCE_DIR;
+            my @cmd = (File::Spec->catfile($MECAB_SOURCE_DIR, "configure"),
+                split(/\s+/, $configure_args));
+            if (system(@cmd) != 0) {
+                print <<"END";
 configure $configure_args failed: $!
     Something went wrong with the MeCab configuration.
     You should correct it and re-run Makefile.PL.
 END
+                chdir $CURDIR;
+                exit 0;
+            }
             chdir $CURDIR;
-            exit 0;
         }
-        chdir $CURDIR;
     }
 }
@@ -151 +160 @@
 
 sub postamble {
-    return <<'MAKE_FRAG'
+    my $make_str;
+
+        if ($^O eq 'MSWin32') {
+        $make_str = <<MAKE_FRAG;
+libmecab:
+        $MECAB_EXE
+
+MAKE_FRAG
+    } else {
+        $make_str = <<'MAKE_FRAG';
 libmecab:
         cd $(MECAB_SRC) && $(MAKE) all
 
+MAKE_FRAG
+    }
+
+    $make_str .= <<'MAKE_FRAG';
 fetchsrc:
         $(PERL) fetchsrc.pl
 
 MAKE_FRAG
+
+    return $make_str;
 }
 

lang/perl/Alien-MeCab/trunk/lib/Alien/MeCab.pm

@@ -14 +14 @@
 
 Alien::MeCab - Wrapper For Installing MeCab
+
+=head1 DESCRIPTION
+
+Alien::MeCab is a wrapper to install MeCab library. Modules that depend on
+MeCab can depend on Alien::MeCab and use the CPAN shell to install it for you
+
+Currently does not work on Win32
+
+=cut

lang/perl/Alien-MeCab/trunk/src/fetchsrc.pl

@@ -2 +2 @@
 use strict;
 use warnings;
+use File::Spec;
 use Getopt::Long;
 use LWP::UserAgent;
@@ -32 +33 @@
     }
 
-
     if( ! GetOptions(\%config, "version=s") ) {
         exit 1;
@@ -38 +38 @@
 
     my $tgz   = "mecab-$config{version}.tar.gz";
-    my $local = "src/$tgz";
-    my $url   = "$download_base_url/mecab/$tgz";
+    my $exe   = "mecab-$config{version}.exe";
+    
+    my ($local, $url);
+    if ($^O eq 'MSWin32') {
+        $local = File::Spec->catfile('src', $exe);
+        $url   = "$download_base_url/mecab/$exe";
+    }
+    else {
+        $local = File::Spec->catfile('src', $tgz);
+        $url   = "$download_base_url/mecab/$tgz";
+    }
 
     my $ua = LWP::UserAgent->new(