r43065 - in /trunk/libalien-wxwidgets-perl: Build.PL Changes META.yml Makefile.PL README.txt debian/changelog inc/My/Build/Base.pm inc/My/Build/Win32.pm lib/Alien/wxWidgets.pm patches/data

jawnsy-guest at users.alioth.debian.org jawnsy-guest at users.alioth.debian.org
Thu Aug 27 23:47:54 UTC 2009


Author: jawnsy-guest
Date: Thu Aug 27 23:47:43 2009
New Revision: 43065

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=43065
Log:
Rename command-line options to avoid clashing with
Module::Build options

Modified:
    trunk/libalien-wxwidgets-perl/Build.PL
    trunk/libalien-wxwidgets-perl/Changes
    trunk/libalien-wxwidgets-perl/META.yml
    trunk/libalien-wxwidgets-perl/Makefile.PL
    trunk/libalien-wxwidgets-perl/README.txt
    trunk/libalien-wxwidgets-perl/debian/changelog
    trunk/libalien-wxwidgets-perl/inc/My/Build/Base.pm
    trunk/libalien-wxwidgets-perl/inc/My/Build/Win32.pm
    trunk/libalien-wxwidgets-perl/lib/Alien/wxWidgets.pm
    trunk/libalien-wxwidgets-perl/patches/data

Modified: trunk/libalien-wxwidgets-perl/Build.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libalien-wxwidgets-perl/Build.PL?rev=43065&op=diff
==============================================================================
--- trunk/libalien-wxwidgets-perl/Build.PL (original)
+++ trunk/libalien-wxwidgets-perl/Build.PL Thu Aug 27 23:47:43 2009
@@ -6,7 +6,7 @@
 use lib "lib", "inc";
 use My::Build;
 
-our $TYPE;
+our( $TYPE, $URL );
 
 # new_from_context is broken: it does not restore
 # @INC set in Build.PL before trying to load a base class not
@@ -30,20 +30,22 @@
                          },
     configure_requires => { 'Module::Build'               => '0.28',
                             },
-    get_options     => { debug      => { type => '!' },
-                         unicode    => { type => '!' },
-                         mslu       => { type => '!' },
-                         static     => { type => '!' },
-                         monolithic => { type => '!' },
-                         universal  => { type => '!' },
-                         build_wx   => { type => '!' },
-                         mk_portable => { type => '!' },
-                         build_wx_opengl => { type => '!' },
-                         source     => { type => '=s' },
+    get_options     => { 'wxWidgets-debug'         => { type => '!' },
+                         'wxWidgets-unicode'       => { type => '!' },
+                         'wxWidgets-mslu'          => { type => '!' },
+                         'wxWidgets-static'        => { type => '!' },
+                         'wxWidgets-monolithic'    => { type => '!' },
+                         'wxWidgets-universal'     => { type => '!' },
+                         'wxWidgets-build'         => { type => '!' },
+                         'wxWidgets-portable'      => { type => '!' },
+                         'wxWidgets-build-opengl'  => { type => '!' },
+                         'wxWidgets-source'        => { type => '=s' },
                          },
     create_makefile_pl => 'passthrough',
   );
 
+my $accept_defaults = $ENV{PERL5_CPANPLUS_IS_RUNNING}
+                   || $ENV{CPAN_SHELL_LEVEL}; 
 my $build_wx_dflt = 'yes';
 my $build_wx_opengl_dflt = 'yes';
 my $build_prompt = 'Do you want to fetch and build wxWidgets from sources?';
@@ -76,6 +78,9 @@
 if( $^O ne 'darwin' && $^O ne 'MSWin32' ) {
     $build_wx_opengl_dflt = 'no';
 }
+if( $ENV{AWX_URL} ) {
+    $build_wx_dflt = 'yes';
+}
 if( $ENV{AUTOMATED_TESTING} ) {
     if( $^O ne 'darwin' && $^O ne 'MSWin32' ) {
         my $pkg_config = $ENV{PKG_CONFIG} || 'pkg-config';
@@ -92,22 +97,23 @@
     }
 }
 chomp $build_prompt;
-my $build_wx = _askyn( $build, 'build_wx',
+my $build_wx = _askyn( $build, 'wxWidgets-build',
                        $build_prompt, $build_wx_dflt );
 $build->notes( 'build_wx' => $build_wx );
-$build->notes( 'mk_portable' => $build->args('mk_portable') );
+$build->notes( 'mk_portable' => $build->args('wxWidgets-portable') );
 if( $build_wx ) {
-    $TYPE = _ask( $build, 'source', 'Which archive type?', 'tar.gz' );
+    $TYPE = _ask( $build, 'wxWidgets-source', 'Which archive type?', 'tar.gz' );
+    $URL = $ENV{AWX_URL};
     $build->notes( 'build_data' => do 'patches/data' );
 }
 if( $build_wx ) {
-    my $build_wx_unicode = _askyn( $build, 'unicode',
+    my $build_wx_unicode = _askyn( $build, 'wxWidgets-unicode',
                                    'Do you want to enable Unicode support',
                                    'yes' );
     $build->notes( 'build_wx_unicode' => $build_wx_unicode );
 }
 if( $build_wx ) {
-    my $build_wx_opengl = _askyn( $build, 'build_wx_opengl',
+    my $build_wx_opengl = _askyn( $build, 'wxWidgets-build-opengl',
                                   'Do you want to include OpenGL support',
                                   $build_wx_opengl_dflt );
     $build->notes( 'build_wx_opengl' => $build_wx_opengl );
@@ -117,18 +123,22 @@
 
 sub _askyn {
     my( $build, $arg, $question, $default ) = @_;
-    my $res = defined $build->args( $arg )
-                  ? $build->args( $arg )
-                  : $build->y_n( $question, $default );
+    my $res =
+      defined $build->args( $arg ) ? $build->args( $arg ) :
+      exists $ENV{"AWX_\U$arg"}    ? $ENV{"AWX_\U$arg"} :
+      $accept_defaults             ? $default :
+                                     $build->y_n( $question, $default );
 
     return $res
 }
 
 sub _ask {
     my( $build, $arg, $question, $default ) = @_;
-    my $res = defined $build->args( $arg )
-                  ? $build->args( $arg )
-                  : $build->prompt( $question, $default );
+    my $res =
+      defined $build->args( $arg ) ? $build->args( $arg ) :
+      exists $ENV{"AWX_\U$arg"}    ? $ENV{"AWX_\U$arg"} :
+      $accept_defaults             ? $default :
+                                     $build->prompt( $question, $default );
 
     return $res
 }

Modified: trunk/libalien-wxwidgets-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libalien-wxwidgets-perl/Changes?rev=43065&op=diff
==============================================================================
--- trunk/libalien-wxwidgets-perl/Changes (original)
+++ trunk/libalien-wxwidgets-perl/Changes Thu Aug 27 23:47:43 2009
@@ -1,4 +1,8 @@
 Revision history for Perl extension Alien::wxWidgets.
+
+0.44  Sun Aug  9 12:56:05 CEST 2009
+	- Rename all command line options to avoid clashing with
+	  Module::Build options.
 
 0.43  Sun May 10 09:46:05 CEST 2009
 	- Fix building under recent FreeBSD versions (patch by Cezary Morga).

Modified: trunk/libalien-wxwidgets-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libalien-wxwidgets-perl/META.yml?rev=43065&op=diff
==============================================================================
--- trunk/libalien-wxwidgets-perl/META.yml (original)
+++ trunk/libalien-wxwidgets-perl/META.yml Thu Aug 27 23:47:43 2009
@@ -1,27 +1,27 @@
 ---
 name: Alien-wxWidgets
-version: 0.43
+version: 0.44
 author:
   - 'Mattia Barbon <mbarbon at cpan.org>'
 abstract: 'building, finding and using wxWidgets binaries'
 license: perl
 resources:
   license: http://dev.perl.org/licenses/
-configure_requires:
+build_requires:
+  ExtUtils::CBuilder: 0.24
   Module::Build: 0.28
 requires:
   Module::Pluggable: 2.6
   perl: 5.006
-build_requires:
-  ExtUtils::CBuilder: 0.24
+configure_requires:
   Module::Build: 0.28
 provides:
   Alien::wxWidgets:
     file: lib/Alien/wxWidgets.pm
-    version: 0.43
+    version: 0.44
   Alien::wxWidgets::Utility:
     file: lib/Alien/wxWidgets/Utility.pm
-generated_by: Module::Build version 0.32
+generated_by: Module::Build version 0.34
 meta-spec:
-  url: http://module-build.sourceforge.net/META-spec-v1.2.html
-  version: 1.2
+  url: http://module-build.sourceforge.net/META-spec-v1.4.html
+  version: 1.4

Modified: trunk/libalien-wxwidgets-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libalien-wxwidgets-perl/Makefile.PL?rev=43065&op=diff
==============================================================================
--- trunk/libalien-wxwidgets-perl/Makefile.PL (original)
+++ trunk/libalien-wxwidgets-perl/Makefile.PL Thu Aug 27 23:47:43 2009
@@ -1,4 +1,4 @@
-# Note: this file was auto-generated by Module::Build::Compat version 0.32
+# Note: this file was auto-generated by Module::Build::Compat version 0.34
 require 5.006;
     
     unless (eval "use Module::Build::Compat 0.02; 1" ) {
@@ -28,6 +28,8 @@
     eval "use Module::Build::Compat 0.02; 1" or die $@;
     use lib '_build/lib';
     Module::Build::Compat->run_build_pl(args => \@ARGV);
-    exit(0) unless(-e 'Build'); # cpantesters convention
+    my $build_script = 'Build';  
+    $build_script .= '.com' if $^O eq 'VMS';
+    exit(0) unless(-e $build_script); # cpantesters convention
     require My::Build::new_from_context_is_broken;
     Module::Build::Compat->write_makefile(build_class => 'My::Build::new_from_context_is_broken');

Modified: trunk/libalien-wxwidgets-perl/README.txt
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libalien-wxwidgets-perl/README.txt?rev=43065&op=diff
==============================================================================
--- trunk/libalien-wxwidgets-perl/README.txt (original)
+++ trunk/libalien-wxwidgets-perl/README.txt Thu Aug 27 23:47:43 2009
@@ -38,7 +38,7 @@
     <add your compiler to the path>
     <build wxWidgets>
     set WXDIR=C:\Path\to\wxWidgets
-    perl Build.PL [--debug] [--unicode] [--mslu]
+    perl Build.PL [--wxWidgets-debug] [--wxWidgets-unicode] [--wxWidgets-mslu]
     perl Build
     perl Build test
     perl Build install

Modified: trunk/libalien-wxwidgets-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libalien-wxwidgets-perl/debian/changelog?rev=43065&op=diff
==============================================================================
--- trunk/libalien-wxwidgets-perl/debian/changelog (original)
+++ trunk/libalien-wxwidgets-perl/debian/changelog Thu Aug 27 23:47:43 2009
@@ -1,11 +1,10 @@
-libalien-wxwidgets-perl (0.43+dfsg-1) UNRELEASED; urgency=low
-
-  Build system fixes only, does not affect Debian afaict
-  IGNORE-VERSION: 0.43+dfsg-1
+libalien-wxwidgets-perl (0.44+dfsg-1) UNRELEASED; urgency=low
 
   * New upstream release
+    + Rename command-line options to avoid clashing with
+      Module::Build options
 
- -- Jonathan Yu <frequency at cpan.org>  Wed, 05 Aug 2009 06:57:33 -0400
+ -- Jonathan Yu <frequency at cpan.org>  Thu, 27 Aug 2009 15:18:02 -0400
 
 libalien-wxwidgets-perl (0.42+dfsg-1) unstable; urgency=low
 

Modified: trunk/libalien-wxwidgets-perl/inc/My/Build/Base.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libalien-wxwidgets-perl/inc/My/Build/Base.pm?rev=43065&op=diff
==============================================================================
--- trunk/libalien-wxwidgets-perl/inc/My/Build/Base.pm (original)
+++ trunk/libalien-wxwidgets-perl/inc/My/Build/Base.pm Thu Aug 27 23:47:43 2009
@@ -333,18 +333,18 @@
     return @{$data}{@_};
 }
 
-sub awx_monolithic { $_[0]->args( 'monolithic' ) ? 1 : 0 }
+sub awx_monolithic { $_[0]->args( 'wxWidgets-monolithic' ) ? 1 : 0 }
 sub awx_is_monolithic { $_[0]->awx_monolithic }
-sub awx_debug { $_[0]->args( 'debug' ) ? 1 : 0 }
+sub awx_debug { $_[0]->args( 'wxWidgets-debug' ) ? 1 : 0 }
 sub awx_is_debug { $_[0]->awx_debug }
 sub awx_unicode { $_[0]->notes( 'build_wx_unicode' )
-                    || $_[0]->args( 'unicode' ) ? 1 : 0 }
+                    || $_[0]->args( 'wxWidgets-unicode' ) ? 1 : 0 }
 sub awx_is_unicode { $_[0]->awx_unicode }
 sub awx_mslu { 0 }
 sub awx_is_mslu { $_[0]->awx_mslu }
-sub awx_static { $_[0]->args( 'static' ) ? 1 : 0 }
+sub awx_static { $_[0]->args( 'wxWidgets-static' ) ? 1 : 0 }
 sub awx_is_static { $_[0]->awx_static }
-sub awx_universal { $_[0]->args( 'universal' ) ? 1 : 0 }
+sub awx_universal { $_[0]->args( 'wxWidgets-universal' ) ? 1 : 0 }
 sub awx_is_universal { $_[0]->awx_universal }
 sub awx_get_package { local $_ = $_[0]; s/^My::Build:://; return $_ }
 

Modified: trunk/libalien-wxwidgets-perl/inc/My/Build/Win32.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libalien-wxwidgets-perl/inc/My/Build/Win32.pm?rev=43065&op=diff
==============================================================================
--- trunk/libalien-wxwidgets-perl/inc/My/Build/Win32.pm (original)
+++ trunk/libalien-wxwidgets-perl/inc/My/Build/Win32.pm Thu Aug 27 23:47:43 2009
@@ -230,8 +230,9 @@
 # MSLU is default when using Unicode *and* it has not
 # been explicitly disabled
 sub awx_mslu {
-    return $_[0]->args( 'mslu' ) if defined $_[0]->args( 'mslu' );
-    return $_[0]->args( 'unicode' );
+    return $_[0]->args( 'wxWidgets-mslu' )
+      if defined $_[0]->args( 'wxWidgets-mslu' );
+    return $_[0]->args( 'wxWidgets-unicode' );
 }
 
 sub massage_environment {

Modified: trunk/libalien-wxwidgets-perl/lib/Alien/wxWidgets.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libalien-wxwidgets-perl/lib/Alien/wxWidgets.pm?rev=43065&op=diff
==============================================================================
--- trunk/libalien-wxwidgets-perl/lib/Alien/wxWidgets.pm (original)
+++ trunk/libalien-wxwidgets-perl/lib/Alien/wxWidgets.pm Thu Aug 27 23:47:43 2009
@@ -43,7 +43,7 @@
                       instantiate   => 'config';
 
 our $AUTOLOAD;
-our $VERSION = '0.43';
+our $VERSION = '0.44';
 our %VALUES;
 our $dont_remap;
 

Modified: trunk/libalien-wxwidgets-perl/patches/data
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libalien-wxwidgets-perl/patches/data?rev=43065&op=diff
==============================================================================
--- trunk/libalien-wxwidgets-perl/patches/data (original)
+++ trunk/libalien-wxwidgets-perl/patches/data Thu Aug 27 23:47:43 2009
@@ -1,5 +1,5 @@
 my $VERSION = '2.8.10';
-my $URL     = "http://prdownloads.sourceforge.net/wxwindows";
+   $URL   ||= "http://prdownloads.sourceforge.net/wxwindows";
 my $BASE    = 'wxWidgets';
 # $TYPE from Build.PL
 




More information about the Pkg-perl-cvs-commits mailing list