Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

cleanup

  • Loading branch information...
commit 02ce9aa5fe367cbe8ff6b819a22cd1c58f0fb6b5 1 parent d8898d5
@FROGGS FROGGS authored
Showing with 15 additions and 28 deletions.
  1. +1 −13 Changes
  2. +0 −3  TODO
  3. +14 −12 inc/My/Builder/Unix.pm
View
14 Changes
@@ -33,21 +33,13 @@ Revision history for Perl module Alien::SDL
1.423 Tue Jan 25 2011
- now '--with-sdl-config' is the same as '--with-sdl-config=sdl-config' [kmx]
-
-1.422_1 Tue Jan 25 2011
- added Build.PL option --with-sdl-config=... [madsen,kmx]
1.422 Wed Jan 19 2011
- the same as latest dev release
-
-1.421_3 Sun Dec 19 2010
- added paths /usr/pkg/include and /usr/pkg/lib for dragonfly [FROGGS]
- patch for SDL's configure script, -Wl,-rpath,LIBDIR for openbsd [FROGGS]
-
-1.421_2 Sun Oct 31 2010
- updated check_header() to use gcc on cygwin [FROGGS]
-
-1.421_1 Sun Oct 31 2010
- building libjpeg-v8b[FROGGS]
- setting cc to gcc on cygwin [FROGGS]
@@ -64,13 +56,9 @@ Revision history for Perl module Alien::SDL
- fixed bug: passing '--without-x' only to package SDL [FROGGS]
- added sub check_prereqs_tools, checking for pkg-config to build SDL_Pango [FROGGS]
- printing config.log for packages that failed to run configure [FROGGS]
-
-1.418_2 Mon Oct 18 2010
- patch for ldconfig on BSD [FROGGS]
- experimental test for X11/Xlib.h on darwin, disable X if missing [FROGGS]
- disabling any warning for file_find() for perl-5.6.2 [FROGGS]
-
-1.418_1 Fri Oct 15 2010
- fixed 'invalid version'-error for libtiff [FROGGS]
- experimental test for X11/Xlib.h on darwin [FROGGS]
- experimental disabling any warning for file_find() for perl-5.6.2 [FROGGS]
@@ -154,7 +142,7 @@ Revision history for Perl module Alien::SDL
1.3 Fri Apr 23 2010
- additional libs can be specyfied via Alien::SDL->config('libs', [-lAdd_Lib]) [FROGGS]
- checking for required shared libs, disabling options if missing [FROGGS]
- - png, jpeg and tiff are build always [FROGGS]
+ - png, jpeg and tiff are build always [FROGGS]
- building zlib-1.2.5 instead of 1.2.4 [FROGGS]
- making the RECOMMENDED option default [FROGGS]
View
3  TODO
@@ -1,9 +1,6 @@
TODO list for Perl module Alien::SDL
- move prebuilt binaries to http://sdl.perl.org/
-- give option to use old sources
- give app to update and manage source code see below
- use a json file which we can update off site (not hard coded) to link to new SHA sum and packs
- when checking for prereq. libs, use pkg-config if available
-- build only libs like png or tiff in case they are not already installed on the system
-- printing missing libs when calling Build
View
26 inc/My/Builder/Unix.pm
@@ -44,7 +44,7 @@ sub get_additional_libs {
my @list = ();
my %rv; # putting detected dir into hash to avoid duplicates
for (keys %$inc_lib_candidates) {
- my $ld = $inc_lib_candidates->{$_};
+ my $ld = $inc_lib_candidates->{$_};
$rv{"-L$ld"} = 1 if ((-d $_) && (-d $ld));
}
push @list, (keys %rv);
@@ -76,14 +76,16 @@ sub build_binaries {
}
else {
print "BUILDING package '" . $pack->{dirname} . "'...\n";
- my $srcdir = catfile($build_src, $pack->{dirname});
+ my $srcdir = catfile($build_src, $pack->{dirname});
my $prefixdir = rel2abs($build_out);
$self->config_data('build_prefix', $prefixdir); # save it for future Alien::SDL::ConfigData
chdir $srcdir;
- $self->do_system('cp ../../patches/SDL-1.2.14-configure configure') if $pack->{pack} eq 'SDL' && $^O eq 'cygwin';
- $self->do_system('cp ../../patches/SDL-1.2.14-ltmain_sh build-scripts/ltmain.sh') if $pack->{pack} eq 'SDL' && $^O eq 'cygwin';
+ if($pack->{pack} eq 'SDL' && $^O eq 'cygwin') {
+ $self->do_system('cp ../../patches/SDL-1.2.14-configure configure');
+ $self->do_system('cp ../../patches/SDL-1.2.14-ltmain_sh build-scripts/ltmain.sh');
+ }
# setting environments PATH
my $extra_PATH = "";
@@ -98,7 +100,7 @@ sub build_binaries {
# do './configure ...'
my $run_configure = 'y';
- $run_configure = $self->prompt("Run ./configure for '$pack->{pack}' again?", "y") if (-f "config.status");
+ $run_configure = $self->prompt("Run ./configure for '$pack->{pack}' again?", "y") if (-f "config.status");
if (lc($run_configure) eq 'y') {
my $cmd = $self->_get_configure_cmd($pack->{pack}, $prefixdir);
print "Configuring package '$pack->{pack}'...\n";
@@ -113,7 +115,7 @@ sub build_binaries {
}
}
- $self->do_system('cp ../SDL-1.2.14/libtool libtool') if $pack->{pack} eq 'SDL_Pango';
+ $self->do_system('cp ../SDL-1.2.14/libtool libtool') if $pack->{pack} eq 'SDL_Pango';
# do 'make install'
my @cmd = ($self->_get_make, 'install');
@@ -141,7 +143,7 @@ sub _get_configure_cmd {
my $cmd;
($stdout, $stderr) = Capture::Tiny::capture { print `uname -a`; };
- $uname .= " $stdout" if $stdout;
+ $uname .= " $stdout" if $stdout;
# NOTE: all ugly IFs concerning ./configure params have to go here
@@ -230,7 +232,7 @@ sub _get_configure_cmd {
sub _get_make {
my ($self) = @_;
- my @try = ('make', 'gmake', $Config{gmake}, $Config{make});
+ my @try = ('make', 'gmake', $Config{gmake}, $Config{make});
my %tested;
print "Gonna detect GNU make:\n";
foreach my $name ( @try ) {
@@ -238,7 +240,7 @@ sub _get_make {
next if $tested{$name};
$tested{$name} = 1;
print "- testing: '$name'\n";
- if ($self->_is_gnu_make($name)) {
+ if($self->_is_gnu_make($name)) {
print "- found: '$name'\n";
return $name
}
@@ -249,9 +251,9 @@ sub _get_make {
sub _is_gnu_make {
my ($self, $name) = @_;
- my $devnull = File::Spec->devnull();
- my $ver = `$name --version 2> $devnull`;
- if ($ver =~ /GNU Make/i) {
+ my $devnull = File::Spec->devnull();
+ my $ver = `$name --version 2> $devnull`;
+ if($ver =~ /GNU Make/i) {
return 1;
}
return 0;
Please sign in to comment.
Something went wrong with that request. Please try again.