r19388 - in /branches/upstream/libalien-wxwidgets-perl/current: Build.PL Changes META.yml inc/My/Build/Base.pm inc/My/Build/Win32.pm inc/My/Build/Win32_MSVC_Bakefile.pm inc/My/Build/Win32_MinGW_Bakefile.pm lib/Alien/wxWidgets.pm
roberto at users.alioth.debian.org
roberto at users.alioth.debian.org
Sun May 4 20:51:47 UTC 2008
Author: roberto
Date: Sun May 4 20:51:46 2008
New Revision: 19388
URL: http://svn.debian.org/wsvn/?sc=1&rev=19388
Log:
[svn-upgrade] Integrating new upstream version, libalien-wxwidgets-perl (0.35)
Modified:
branches/upstream/libalien-wxwidgets-perl/current/Build.PL
branches/upstream/libalien-wxwidgets-perl/current/Changes
branches/upstream/libalien-wxwidgets-perl/current/META.yml
branches/upstream/libalien-wxwidgets-perl/current/inc/My/Build/Base.pm
branches/upstream/libalien-wxwidgets-perl/current/inc/My/Build/Win32.pm
branches/upstream/libalien-wxwidgets-perl/current/inc/My/Build/Win32_MSVC_Bakefile.pm
branches/upstream/libalien-wxwidgets-perl/current/inc/My/Build/Win32_MinGW_Bakefile.pm
branches/upstream/libalien-wxwidgets-perl/current/lib/Alien/wxWidgets.pm
Modified: branches/upstream/libalien-wxwidgets-perl/current/Build.PL
URL: http://svn.debian.org/wsvn/branches/upstream/libalien-wxwidgets-perl/current/Build.PL?rev=19388&op=diff
==============================================================================
--- branches/upstream/libalien-wxwidgets-perl/current/Build.PL (original)
+++ branches/upstream/libalien-wxwidgets-perl/current/Build.PL Sun May 4 20:51:46 2008
@@ -34,6 +34,7 @@
monolithic => { type => '!' },
universal => { type => '!' },
build_wx => { type => '!' },
+ mk_portable => { type => '!' },
build_wx_opengl => { type => '!' },
source => { type => '=s' },
},
@@ -59,6 +60,7 @@
my $build_wx = _askyn( $build, 'build_wx',
'Do you want to build wxWidgets?', $build_wx_dflt );
$build->notes( 'build_wx' => $build_wx );
+$build->notes( 'mk_portable' => $build->args('mk_portable') );
if( $build_wx ) {
$TYPE = _ask( $build, 'source', 'Which archive type?', 'tar.gz' );
$build->notes( 'build_data' => do 'patches/data' );
Modified: branches/upstream/libalien-wxwidgets-perl/current/Changes
URL: http://svn.debian.org/wsvn/branches/upstream/libalien-wxwidgets-perl/current/Changes?rev=19388&op=diff
==============================================================================
--- branches/upstream/libalien-wxwidgets-perl/current/Changes (original)
+++ branches/upstream/libalien-wxwidgets-perl/current/Changes Sun May 4 20:51:46 2008
@@ -1,4 +1,10 @@
Revision history for Perl extension Alien::wxWidgets.
+
+0.35 Thu May 1 16:25:04 CEST 2008
+ - Correctly handle monolithic build on Win32. (patch by Mark Dootson)
+ - Add mk_portable (Win32-only) build option to create a self-contained
+ wxWidgets+Alien::wxWidgets installation even when not building
+ wxWidgets together with Alien::wxWidgets. (patch by Mark Dootson)
0.34 Sun Apr 13 12:40:08 CEST 2008
- Correctly detect GCC 4.3. (patch by Roberto C. Sánchez)
Modified: branches/upstream/libalien-wxwidgets-perl/current/META.yml
URL: http://svn.debian.org/wsvn/branches/upstream/libalien-wxwidgets-perl/current/META.yml?rev=19388&op=diff
==============================================================================
--- branches/upstream/libalien-wxwidgets-perl/current/META.yml (original)
+++ branches/upstream/libalien-wxwidgets-perl/current/META.yml Sun May 4 20:51:46 2008
@@ -1,6 +1,6 @@
---
name: Alien-wxWidgets
-version: 0.34
+version: 0.35
author:
- 'Mattia Barbon <mbarbon at cpan.org>'
abstract: 'building, finding and using wxWidgets binaries'
@@ -15,7 +15,7 @@
provides:
Alien::wxWidgets:
file: lib/Alien/wxWidgets.pm
- version: 0.34
+ version: 0.35
Alien::wxWidgets::Utility:
file: lib/Alien/wxWidgets/Utility.pm
generated_by: Module::Build version 0.2808
Modified: branches/upstream/libalien-wxwidgets-perl/current/inc/My/Build/Base.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libalien-wxwidgets-perl/current/inc/My/Build/Base.pm?rev=19388&op=diff
==============================================================================
--- branches/upstream/libalien-wxwidgets-perl/current/inc/My/Build/Base.pm (original)
+++ branches/upstream/libalien-wxwidgets-perl/current/inc/My/Build/Base.pm Sun May 4 20:51:46 2008
@@ -185,6 +185,35 @@
}
my $key = substr __PACKAGE__, 1 + rindex __PACKAGE__, ':';
+EOT
+
+ print $fh <<'EOT' if $self->notes( 'mk_portable' ) && ( $^O =~ /^MSWin/ );
+
+my ($portablebase);
+my $wxwidgetspath = __PACKAGE__ . '.pm';
+$wxwidgetspath =~ s/::/\//g;
+
+for (@INC) {
+ if( -f qq($_/$wxwidgetspath ) ) {
+ $portablebase = qq($_/Alien/wxWidgets/$key);
+ last;
+ }
+}
+
+if( $portablebase ) {
+ $portablebase =~ s{/}{\\}g;
+ my $portablelibpath = qq($portablebase\\lib);
+ my $portableincpath = qq($portablebase\\include);
+
+ $VALUES{include_path} = qq{-I$portablelibpath -I$portableincpath};
+ $VALUES{link_libraries} =~ s{-L\S+\s}{-L$portablelibpath };
+ $VALUES{shared_library_path} = $portablelibpath;
+ $VALUES{wx_base_directory} = $portablebase;
+ $VALUES{prefix} = $portablebase;
+}
+EOT
+
+ print $fh <<'EOT';
sub values { %VALUES, key => $key }
@@ -286,7 +315,7 @@
$config{config}{debug} = $self->awx_is_debug;
$config{config}{unicode} = $self->awx_is_unicode;
$config{config}{mslu} = $self->awx_is_mslu;
- $config{config}{build} = 'multi';
+ $config{config}{build} = $self->awx_is_monolithic ? 'mono' : 'multi';
$config{link_flags} = '';
$config{c_flags} = '';
Modified: branches/upstream/libalien-wxwidgets-perl/current/inc/My/Build/Win32.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libalien-wxwidgets-perl/current/inc/My/Build/Win32.pm?rev=19388&op=diff
==============================================================================
--- branches/upstream/libalien-wxwidgets-perl/current/inc/My/Build/Win32.pm (original)
+++ branches/upstream/libalien-wxwidgets-perl/current/inc/My/Build/Win32.pm Sun May 4 20:51:46 2008
@@ -152,17 +152,21 @@
$files{$lib} = awx_arch_file( "rEpLaCe/lib/$base" );
}
- if( $self->notes( 'build_wx' ) ) {
+ if( $self->notes( 'build_wx' ) || $self->notes( 'mk_portable' ) ) {
require File::Find;
my $no_platform = join '|', qw(unix gtk x11 motif mac cocoa
- os2 palmos univ mgl msdos);
+ os2 palmos univ mgl msdos gtk1
+ dfb);
my $wx_base = $self->awx_wx_config_data->{wxdir_build};
foreach my $find_base ( File::Spec->catdir( $wx_base, qw(include wx) ),
File::Spec->catdir( $wx_base, qw(contrib
include wx) ) ) {
+ next unless -d $find_base;
my $wanted = sub {
- $File::Find::prune =
+ $File::Find::prune ||=
-d $_ && $_ =~ m{include[/\\]wx[/\\](?:$no_platform)$};
+ $File::Find::prune ||=
+ -d $_ && $_ =~ m{[/\\]\.svn$};
return unless -f $_;
my $rel = File::Spec->abs2rel( $_, $find_base );
$files{$_} = awx_arch_file( "rEpLaCe/include/wx/$rel" );
Modified: branches/upstream/libalien-wxwidgets-perl/current/inc/My/Build/Win32_MSVC_Bakefile.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libalien-wxwidgets-perl/current/inc/My/Build/Win32_MSVC_Bakefile.pm?rev=19388&op=diff
==============================================================================
--- branches/upstream/libalien-wxwidgets-perl/current/inc/My/Build/Win32_MSVC_Bakefile.pm (original)
+++ branches/upstream/libalien-wxwidgets-perl/current/inc/My/Build/Win32_MSVC_Bakefile.pm Sun May 4 20:51:46 2008
@@ -69,7 +69,7 @@
chdir $dir;
die 'Could not find wxWidgets lib directory' unless $libdir;
- $data{dlls} = $self->awx_grep_dlls( $orig_libdir, $digits );
+ $data{dlls} = $self->awx_grep_dlls( $orig_libdir, $digits, $self->awx_is_monolithic );
$data{version} = $digits;
$self->{awx_data} = \%data;
Modified: branches/upstream/libalien-wxwidgets-perl/current/inc/My/Build/Win32_MinGW_Bakefile.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libalien-wxwidgets-perl/current/inc/My/Build/Win32_MinGW_Bakefile.pm?rev=19388&op=diff
==============================================================================
--- branches/upstream/libalien-wxwidgets-perl/current/inc/My/Build/Win32_MinGW_Bakefile.pm (original)
+++ branches/upstream/libalien-wxwidgets-perl/current/inc/My/Build/Win32_MinGW_Bakefile.pm Sun May 4 20:51:46 2008
@@ -57,7 +57,7 @@
chdir $dir;
die 'Could not find wxWidgets lib directory' unless $libdir;
- $data{dlls} = $self->awx_grep_dlls( $orig_libdir, $digits );
+ $data{dlls} = $self->awx_grep_dlls( $orig_libdir, $digits, $self->awx_is_monolithic );
$data{version} = $digits;
$self->{awx_data} = \%data;
Modified: branches/upstream/libalien-wxwidgets-perl/current/lib/Alien/wxWidgets.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libalien-wxwidgets-perl/current/lib/Alien/wxWidgets.pm?rev=19388&op=diff
==============================================================================
--- branches/upstream/libalien-wxwidgets-perl/current/lib/Alien/wxWidgets.pm (original)
+++ branches/upstream/libalien-wxwidgets-perl/current/lib/Alien/wxWidgets.pm Sun May 4 20:51:46 2008
@@ -43,7 +43,7 @@
instantiate => 'config';
our $AUTOLOAD;
-our $VERSION = '0.34';
+our $VERSION = '0.35';
our %VALUES;
our $dont_remap;
More information about the Pkg-perl-cvs-commits
mailing list