fix Build.PL script to take --travis arg

PerlGameDev · Aug 13, 2013 · 44d6d13 · 44d6d13
1 parent c83314a
commit 44d6d13
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 14 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,6 +8,9 @@ perl:
 
 before_install:
 # install tiff
+  - sudo updatedb
+  - sudo locate zlib > /tmp/aa
+  - sudo cat /tmp/aa
   - sudo apt-get install automake
 #  - wget ftp://ftp.remotesensing.org/pub/libtiff/tiff-4.0.3.tar.gz
 #  - tar xvfz tiff-4.0.3.tar.gz
@@ -23,12 +26,12 @@ before_install:
   - dpkg -l
 
 install:
-  - perl ./Build.PL --default
+  - perl ./Build.PL --travis
   - ./Build
   - sudo ./Build install
 #  - ./Build install
 
-script: 
+script:
   - prove -v
   - prove
 

diff --git a/Build.PL b/Build.PL
@@ -6,12 +6,9 @@ use File::Spec::Functions qw(catdir catfile);
 use Config;
 use My::Utility qw(check_config_script check_prebuilt_binaries check_prereqs_libs check_prereqs_tools $source_packs);
 
-
-
 use Getopt::Long;
-my $ans   = '';
-GetOptions (  "default"  => \$ans)  ;
-
+my ($ans, $travis)   = '';
+GetOptions (  "travis"  => \$travis)  ;
 
 print "Welcome to Alien::SDL2 module installation\n";
 print "------------------------------------------\n";
@@ -193,11 +190,22 @@ else {
 
     $prompt_string .= "[" . $i++ . "] " . $c->{title} . "\n";
   }
-  $prompt_string .= "\nWhat way do you wanna go?";
-  $ans = $build->prompt($prompt_string, $recommended_candidate) unless $ans;
+
+  # select option '1' for travis
+  if ($travis == 1) {
+      $ans = 1;
+      #set 'travis' var for inc/My/Builder.pm
+      $build->notes( 'travis', '1' );
+  }
+
+  # or prompt user for build option
+  else {
+      $prompt_string .= "\nWhat way do you wanna go?";
+      $ans = $build->prompt( $prompt_string, $recommended_candidate );
+  }
 
   if($ans > 0 && $ans < scalar(@candidates)) {
-    $choice = $candidates[$ans - 1];
+      $choice = $candidates[$ans - 1];
   }
 
   $| = 0;

diff --git a/cpan-deps b/cpan-deps
@@ -13,6 +13,7 @@ File::ShareDir
 File::Spec
 File::Spec::Functions
 File::Which
+File::Temp
 Getopt::Long
 Module::Build
 Test::More

diff --git a/inc/My/Builder.pm b/inc/My/Builder.pm
@@ -40,7 +40,6 @@ sub ACTION_build {
   $self->SUPER::ACTION_build;
 }
 
-
 sub ACTION_install
 {
  my $self = shift;
@@ -106,9 +105,19 @@ sub ACTION_code {
       $self->set_config_data($build_out);
       $self->set_ld_config($build_out);
     }
-    elsif($bp->{buildtype} eq 'build_from_sources' ) {
-     # my $m = $self->prompt("\nDo you want to see all messages during configure/make (y/n)?", 'n');
-      my $m = 1;
+    elsif ( $bp->{buildtype} eq 'build_from_sources' ) {
+
+        my $m = undef;
+        if ( $self->notes('travis') == 1 ) {
+            $m = 1;
+        }
+        else {
+            $m = $self->prompt(
+"\nDo you want to see all messages during configure/make (y/n)?",
+                'n'
+            );
+        }
+
       $self->notes('build_msgs', lc($m) eq 'y' ? 1 : 0);
       # all the following functions die on error, no need to test ret values
       $self->fetch_sources($download);