r20228 - in /trunk/libalien-wxwidgets-perl: ./ debian/ inc/My/Build/ lib/Alien/

roberto at users.alioth.debian.org roberto at users.alioth.debian.org
Tue May 20 20:12:42 UTC 2008


Author: roberto
Date: Tue May 20 20:12:42 2008
New Revision: 20228

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=20228
Log:
New upstream release.

Modified:
    trunk/libalien-wxwidgets-perl/Changes
    trunk/libalien-wxwidgets-perl/META.yml
    trunk/libalien-wxwidgets-perl/debian/changelog
    trunk/libalien-wxwidgets-perl/inc/My/Build/Any_wx_config.pm
    trunk/libalien-wxwidgets-perl/inc/My/Build/Utility.pm
    trunk/libalien-wxwidgets-perl/inc/My/Build/Win32.pm
    trunk/libalien-wxwidgets-perl/inc/My/Build/Win32_MSVC.pm
    trunk/libalien-wxwidgets-perl/inc/My/Build/Win32_MSVC_Bakefile.pm
    trunk/libalien-wxwidgets-perl/inc/My/Build/Win32_MSVC_Tmake.pm
    trunk/libalien-wxwidgets-perl/inc/My/Build/Win32_MinGW.pm
    trunk/libalien-wxwidgets-perl/inc/My/Build/Win32_MinGW_Bakefile.pm
    trunk/libalien-wxwidgets-perl/inc/My/Build/Win32_MinGW_Tmake.pm
    trunk/libalien-wxwidgets-perl/lib/Alien/wxWidgets.pm

Modified: trunk/libalien-wxwidgets-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libalien-wxwidgets-perl/Changes?rev=20228&op=diff
==============================================================================
--- trunk/libalien-wxwidgets-perl/Changes (original)
+++ trunk/libalien-wxwidgets-perl/Changes Tue May 20 20:12:42 2008
@@ -1,4 +1,11 @@
 Revision history for Perl extension Alien::wxWidgets.
+
+0.36  Mon May 19 22:35:46 CEST 2008
+	- Renamed 0.35_01 to 0.36.
+
+0.35_01  Mon May 12 23:43:02 CEST 2008
+	- Handle --install_base correctly when building wxWidgets
+	  during Alien::wxWidgets build.
 
 0.35  Thu May  1 16:25:04 CEST 2008
 	- Correctly handle monolithic build on Win32. (patch by Mark Dootson)

Modified: trunk/libalien-wxwidgets-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libalien-wxwidgets-perl/META.yml?rev=20228&op=diff
==============================================================================
--- trunk/libalien-wxwidgets-perl/META.yml (original)
+++ trunk/libalien-wxwidgets-perl/META.yml Tue May 20 20:12:42 2008
@@ -1,6 +1,6 @@
 ---
 name: Alien-wxWidgets
-version: 0.35
+version: 0.36
 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.35
+    version: 0.36
   Alien::wxWidgets::Utility:
     file: lib/Alien/wxWidgets/Utility.pm
 generated_by: Module::Build version 0.2808

Modified: trunk/libalien-wxwidgets-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libalien-wxwidgets-perl/debian/changelog?rev=20228&op=diff
==============================================================================
--- trunk/libalien-wxwidgets-perl/debian/changelog (original)
+++ trunk/libalien-wxwidgets-perl/debian/changelog Tue May 20 20:12:42 2008
@@ -1,3 +1,9 @@
+libalien-wxwidgets-perl (0.36-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Roberto C. Sanchez <roberto at connexer.com>  Tue, 20 May 2008 16:11:33 -0400
+
 libalien-wxwidgets-perl (0.35-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/libalien-wxwidgets-perl/inc/My/Build/Any_wx_config.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libalien-wxwidgets-perl/inc/My/Build/Any_wx_config.pm?rev=20228&op=diff
==============================================================================
--- trunk/libalien-wxwidgets-perl/inc/My/Build/Any_wx_config.pm (original)
+++ trunk/libalien-wxwidgets-perl/inc/My/Build/Any_wx_config.pm Tue May 20 20:12:42 2008
@@ -204,7 +204,7 @@
 sub build_wxwidgets {
     my $self = shift;
     my $prefix_dir = $self->_key;
-    my $prefix = awx_install_arch_dir( $prefix_dir );
+    my $prefix = awx_install_arch_dir( $self, $prefix_dir );
     my $opengl = $self->notes( 'build_wx_opengl' );
     my $args = sprintf '--with-%s %s--disable-compat24',
                        $self->awx_build_toolkit,
@@ -225,6 +225,7 @@
     # do not reconfigure unless necessary
     mkdir 'bld' unless -d 'bld';
     chdir 'bld';
+    # print $cmd, "\n";
     $self->_system( $cmd ) unless -f 'Makefile';
     $self->_system( 'make all' );
     chdir 'contrib/src/stc';

Modified: trunk/libalien-wxwidgets-perl/inc/My/Build/Utility.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libalien-wxwidgets-perl/inc/My/Build/Utility.pm?rev=20228&op=diff
==============================================================================
--- trunk/libalien-wxwidgets-perl/inc/My/Build/Utility.pm (original)
+++ trunk/libalien-wxwidgets-perl/inc/My/Build/Utility.pm Tue May 20 20:12:42 2008
@@ -22,20 +22,23 @@
 }
 
 sub awx_install_arch_file {
-    my( $vol, $dir, $file ) = File::Spec->splitpath( $_[0] || '' );
-    File::Spec->catfile( $Config{sitearchexp}, 'Alien', 'wxWidgets',
+    my( $build, $p ) = @_;
+    my( $vol, $dir, $file ) = File::Spec->splitpath( $p || '' );
+    File::Spec->catfile( $build->install_destination( 'arch' ), 'Alien', 'wxWidgets',
                          File::Spec->splitdir( $dir ), $file );
 }
 
 sub awx_install_arch_dir {
-    my( $vol, $dir, $file ) = File::Spec->splitpath( $_[0] || '' );
-    File::Spec->catdir( $Config{sitearchexp}, 'Alien', 'wxWidgets',
+    my( $build, $p ) = @_;
+    my( $vol, $dir, $file ) = File::Spec->splitpath( $p || '' );
+    File::Spec->catdir( $build->install_destination( 'arch' ), 'Alien', 'wxWidgets',
                         File::Spec->splitdir( $dir ), $file );
 }
 
 sub awx_install_arch_auto_file {
-    my( $vol, $dir, $file ) = File::Spec->splitpath( $_[0] || '' );
-    File::Spec->catfile( $Config{sitearchexp}, 'auto', 'Alien', 'wxWidgets',
+    my( $build, $p ) = @_;
+    my( $vol, $dir, $file ) = File::Spec->splitpath( $p || '' );
+    File::Spec->catfile( $build->install_destination( 'arch' ), 'auto', 'Alien', 'wxWidgets',
                          File::Spec->splitdir( $dir ), $file );
 }
 

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=20228&op=diff
==============================================================================
--- trunk/libalien-wxwidgets-perl/inc/My/Build/Win32.pm (original)
+++ trunk/libalien-wxwidgets-perl/inc/My/Build/Win32.pm Tue May 20 20:12:42 2008
@@ -82,7 +82,7 @@
     my $self = shift;
     my $wxdir_b = $ENV{WXDIR};
     my $wxdir = $self->notes( 'build_wx' ) ?
-      awx_install_arch_dir( 'rEpLaCe' ) : $wxdir_b;
+      awx_install_arch_dir( $self, 'rEpLaCe' ) : $wxdir_b;
 
     return { 'wxdir'       => $wxdir,
              'wxdir_build' => $wxdir_b,
@@ -98,7 +98,7 @@
 
     $config{prefix} = $self->wx_config( 'wxdir' );
     $config{config}{toolkit} = $self->is_wince ? 'wce' : 'msw';
-    $config{shared_library_path} = awx_install_arch_file( "rEpLaCe/lib" );
+    $config{shared_library_path} = awx_install_arch_file( $self, "rEpLaCe/lib" );
 
     die "Unable to find setup.h directory"
       unless $self->wx_config( 'cxxflags' )

Modified: trunk/libalien-wxwidgets-perl/inc/My/Build/Win32_MSVC.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libalien-wxwidgets-perl/inc/My/Build/Win32_MSVC.pm?rev=20228&op=diff
==============================================================================
--- trunk/libalien-wxwidgets-perl/inc/My/Build/Win32_MSVC.pm (original)
+++ trunk/libalien-wxwidgets-perl/inc/My/Build/Win32_MSVC.pm Tue May 20 20:12:42 2008
@@ -20,7 +20,7 @@
     my $libs = $self->wx_config( 'libs' );
     my $incdir = $self->awx_wx_config_data->{wxinc};
     my $cincdir = $self->awx_wx_config_data->{wxcontrinc};
-    my $iincdir = awx_install_arch_dir( 'rEpLaCe/include' );
+    my $iincdir = awx_install_arch_dir( $self, 'rEpLaCe/include' );
 
     foreach ( split /\s+/, $cccflags ) {
         m(^-DSTRICT) && next;
@@ -32,7 +32,7 @@
             }
             if( $_ =~ /-I\Q$self->{awx_setup_dir}\E/ && !$self->is_wince ) {
                 $config{include_path} .=
-                  '-I' . awx_install_arch_file( 'rEpLaCe/lib' ) . ' ';
+                  '-I' . awx_install_arch_file( $self, 'rEpLaCe/lib' ) . ' ';
             } else {
                 $config{include_path} .= "$_ ";
             }

Modified: trunk/libalien-wxwidgets-perl/inc/My/Build/Win32_MSVC_Bakefile.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libalien-wxwidgets-perl/inc/My/Build/Win32_MSVC_Bakefile.pm?rev=20228&op=diff
==============================================================================
--- trunk/libalien-wxwidgets-perl/inc/My/Build/Win32_MSVC_Bakefile.pm (original)
+++ trunk/libalien-wxwidgets-perl/inc/My/Build/Win32_MSVC_Bakefile.pm Tue May 20 20:12:42 2008
@@ -53,7 +53,7 @@
             s{[-/]LIBPATH:(\S+)}
              {$orig_libdir = File::Spec->canonpath
                                  ( File::Spec->rel2abs( $1 ) );
-              '-L' . ( $libdir = awx_install_arch_file( 'rEpLaCe/lib' ) )}egi;
+              '-L' . ( $libdir = awx_install_arch_file( $self, 'rEpLaCe/lib' ) )}egi;
             $data{libs} = $_;
         } elsif( s/^\s*cl\s+// ) {
             s/\s+\S+\.(cpp|pdb|obj)/ /g;

Modified: trunk/libalien-wxwidgets-perl/inc/My/Build/Win32_MSVC_Tmake.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libalien-wxwidgets-perl/inc/My/Build/Win32_MSVC_Tmake.pm?rev=20228&op=diff
==============================================================================
--- trunk/libalien-wxwidgets-perl/inc/My/Build/Win32_MSVC_Tmake.pm (original)
+++ trunk/libalien-wxwidgets-perl/inc/My/Build/Win32_MSVC_Tmake.pm Tue May 20 20:12:42 2008
@@ -49,11 +49,11 @@
     };
 
     my $lib_link = sub {
-        awx_install_arch_file( 'rEpLaCe/lib/' . $_[0] .
+        awx_install_arch_file( $self, 'rEpLaCe/lib/' . $_[0] .
                                ( $self->awx_debug ? 'h' : '' ) . $Config{_a} );
     };
     my $link_implib = awx_install_arch_file
-      ( 'rEpLaCe/lib/'. File::Basename::basename( $implib ) );
+      ( $self, 'rEpLaCe/lib/' . File::Basename::basename( $implib ) );
 
     $data{dlls} = { core => { dll  => $dll,
                               lib  => $implib,

Modified: trunk/libalien-wxwidgets-perl/inc/My/Build/Win32_MinGW.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libalien-wxwidgets-perl/inc/My/Build/Win32_MinGW.pm?rev=20228&op=diff
==============================================================================
--- trunk/libalien-wxwidgets-perl/inc/My/Build/Win32_MinGW.pm (original)
+++ trunk/libalien-wxwidgets-perl/inc/My/Build/Win32_MinGW.pm Tue May 20 20:12:42 2008
@@ -35,7 +35,7 @@
     my $libs = $self->wx_config( 'libs' );
     my $incdir = $self->awx_wx_config_data->{wxinc};
     my $cincdir = $self->awx_wx_config_data->{wxcontrinc};
-    my $iincdir = awx_install_arch_dir( 'rEpLaCe/include' );
+    my $iincdir = awx_install_arch_dir( $self, 'rEpLaCe/include' );
 
     foreach ( split /\s+/, $cccflags ) {
         m(^-DSTRICT) && next;
@@ -49,7 +49,7 @@
             }
             if( $_ =~ /-I\Q$self->{awx_setup_dir}\E/ ) {
                 $config{include_path} .=
-                  '-I' . awx_install_arch_file( 'rEpLaCe/lib' ) . ' ';
+                  '-I' . awx_install_arch_file( $self, 'rEpLaCe/lib' ) . ' ';
             } else {
                 $config{include_path} .= "$_ ";
             }

Modified: trunk/libalien-wxwidgets-perl/inc/My/Build/Win32_MinGW_Bakefile.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libalien-wxwidgets-perl/inc/My/Build/Win32_MinGW_Bakefile.pm?rev=20228&op=diff
==============================================================================
--- trunk/libalien-wxwidgets-perl/inc/My/Build/Win32_MinGW_Bakefile.pm (original)
+++ trunk/libalien-wxwidgets-perl/inc/My/Build/Win32_MinGW_Bakefile.pm Tue May 20 20:12:42 2008
@@ -40,7 +40,7 @@
             s{-L(\S+)}
              {$orig_libdir = File::Spec->canonpath
                                  ( File::Spec->rel2abs( $1 ) );
-              '-L' . ( $libdir = awx_install_arch_file( 'rEpLaCe/lib' ) )}eg;
+              '-L' . ( $libdir = awx_install_arch_file( $self, 'rEpLaCe/lib' ) )}eg;
             $data{libs} = $_;
         } elsif( s/^\s*g\+\+\s+// ) {
             s/\s+\S+\.(cpp|o|d)/ /g;

Modified: trunk/libalien-wxwidgets-perl/inc/My/Build/Win32_MinGW_Tmake.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libalien-wxwidgets-perl/inc/My/Build/Win32_MinGW_Tmake.pm?rev=20228&op=diff
==============================================================================
--- trunk/libalien-wxwidgets-perl/inc/My/Build/Win32_MinGW_Tmake.pm (original)
+++ trunk/libalien-wxwidgets-perl/inc/My/Build/Win32_MinGW_Tmake.pm Tue May 20 20:12:42 2008
@@ -49,10 +49,10 @@
     };
 
     my $lib_link = sub {
-        awx_install_arch_file( 'rEpLaCe/lib/' . 'lib' . $_[0] . $Config{_a} );
+        awx_install_arch_file( $self, 'rEpLaCe/lib/' . 'lib' . $_[0] . $Config{_a} );
     };
     my $link_implib = awx_install_arch_file
-      ( 'rEpLaCe/lib/'. File::Basename::basename( $implib ) );
+      ( $self, 'rEpLaCe/lib/' . File::Basename::basename( $implib ) );
 
     $data{dlls} = { core => { dll  => $dll,
                               lib  => $implib,

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=20228&op=diff
==============================================================================
--- trunk/libalien-wxwidgets-perl/lib/Alien/wxWidgets.pm (original)
+++ trunk/libalien-wxwidgets-perl/lib/Alien/wxWidgets.pm Tue May 20 20:12:42 2008
@@ -43,7 +43,7 @@
                       instantiate   => 'config';
 
 our $AUTOLOAD;
-our $VERSION = '0.35';
+our $VERSION = '0.36';
 our %VALUES;
 our $dont_remap;
 




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