CPAN Release 0.27

- Add CppGuess support. - Probably a temporary solution.
ingydotnet · Dec 21, 2014 · 43cf473 · 43cf473
1 parent c02d961
commit 43cf473
Show file tree

Hide file tree

Showing 6 changed files with 60 additions and 33 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -21,6 +21,8 @@ perl:
 install:
 - cpanm --quiet --notest
   Devel::Cover::Report::Coveralls
+  ExtUtils::CppGuess
+  File::Share
   Inline
   Inline::C
 

diff --git a/About b/About
@@ -68,6 +68,7 @@ This repoository contains the following top level files and directories:
   .git/       - Git repository data.
   lib/        - All the source code libraries (modules).
   note/       - Random note files. To-Do lists, specs, etc.
+  share/      - Shared files for the release package.
 
 Resources
 ---------

diff --git a/Changes b/Changes
@@ -1,4 +1,10 @@
 ---
+version: 0.27
+date:    Sun Dec 21 00:28:22 EST 2014
+changes:
+- Add CppGuess support.
+- Probably a temporary solution.
+---
 version: 0.26
 date:    Thu Dec 18 18:04:08 PST 2014
 changes:

diff --git a/Meta b/Meta
@@ -1,7 +1,7 @@
 =meta: 0.0.1
 
 name: Inline-Module
-version: 0.26
+version: 0.27
 abstract: Support for Inline-based CPAN Extension Modules
 homepage: https://metacpan.org/release/Inline-Module
 
@@ -17,6 +17,7 @@ author:
 
 requires:
   perl: 5.8.1
+  ExtUtils::CppGuess: 0     # For Inline::CPP. For now.
   File::Share: 0
   Inline: 0
   Inline::C: 0

diff --git a/lib/Inline/Module.pm b/lib/Inline/Module.pm
@@ -1,6 +1,6 @@
 use strict; use warnings;
 package Inline::Module;
-our $VERSION = '0.26';
+our $VERSION = '0.27';
 our $API_VERSION = 'v2';
 
 use Carp 'croak';
@@ -285,11 +285,14 @@ sub included_modules {
             'Inline::C::Parser::RegExp';
     }
     if (grep /:CPP$/, @$ilsm) {
-        push @$include,
+        push @$include, (
             'Inline::C',
             'Inline::CPP::Config',
             'Inline::CPP::Parser::RecDescent',
-            'Parse::RecDescent';
+            'Parse::RecDescent',
+            'ExtUtils::CppGuess',
+            'Capture::Tiny',
+        );
     }
     return $include;
 }
@@ -392,6 +395,8 @@ bootstrap $module;
 sub write_module {
     my ($class, $dest, $module, $code) = @_;
 
+    $code =~ s/\n+__END__\n.*//s;
+
     my $filepath = $module;
     $filepath =~ s!::!/!g;
     $filepath = "$dest/$filepath.pm";

diff --git a/share/CPPConfig.pm b/share/CPPConfig.pm
@@ -4,48 +4,60 @@ use strict; use warnings;
 package Inline::CPP::Config;
 
 use Config;
-# use ExtUtils::CppGuess;
+use ExtUtils::CppGuess;
 
-our ($compiler, $libs, $iostream_fn, $cpp_flavor_defs) = cpp_guess();
+our ($compiler, $libs, $iostream_fn, $cpp_flavor_defs) = guess();
 
-my $cpp_info;
-BEGIN {
-    my $default_headers = <<'.';
+sub guess {
+    my ($compiler, $libs, $iostream_fn, $cpp_flavor_defs);
+    $iostream_fn = 'iostream';
+    $cpp_flavor_defs = <<'.';
 #define __INLINE_CPP_STANDARD_HEADERS 1
 #define __INLINE_CPP_NAMESPACE_STD 1
 .
-    my @default_info = (
-        'g++ -xc++',
-        '-lstdc++',
-        'iostream',
-        $default_headers,
-    );
-    $cpp_info = {
-        'cygwin' => [ @default_info ],
-        'darwin' => [ @default_info ],
-        'linux' => [ @default_info ],
-        'MSWin32' => [ @default_info ],
-    };
-}
 
-sub throw;
-sub cpp_guess {
-    my $key = $Config::Config{osname};
-    if (my $config = $cpp_info->{$key}) {
-        $config->[0] .= ' -D_FILE_OFFSET_BITS=64',
-            if $Config::Config{ccflags} =~ /-D_FILE_OFFSET_BITS=64/;
-        return @$config;
+    if ($Config::Config{osname} eq 'freebsd'
+        && $Config::Config{osvers} =~ /^(\d+)/
+        && $1 >= 10
+    ) {
+        $compiler = 'clang++';
+        $libs = '-lc++';
     }
-
-    throw "Unsupported OS/Compiler for Inline::Module+Inline::CPP '$key'";
+    else {
+        my $guesser = ExtUtils::CppGuess->new;
+        my %configuration = $guesser->module_build_options;
+        if( $guesser->is_gcc ) {
+            $compiler = 'g++';
+        }
+        elsif ( $guesser->is_msvc ) {
+            $compiler = 'cl';
+        }
+
+        $compiler .= $configuration{extra_compiler_flags};
+        $libs = $configuration{extra_linker_flags};
+
+        ($compiler, $libs) = map {
+            _trim_whitespace($_)
+        } ($compiler, $libs);
+    }
+    return ($compiler, $libs, $iostream_fn, $cpp_flavor_defs);
 }
 
 sub throw {
-    die "@_" unless
+    my $os = $^O;
+    my $msg = "Unsupported OS/Compiler for Inline::Module+Inline::CPP '$os'";
+    die $msg unless
         $ENV{PERL5_MINISMOKEBOX} ||
         $ENV{PERL_CR_SMOKER_CURRENT};
     eval 'use lib "inc"; use Inline::Module; 1' or die $@;
-    Inline::Module->smoke_system_info_dump();
+    Inline::Module->smoke_system_info_dump($msg);
+}
+
+sub _trim_whitespace {
+    my $string = shift;
+    $string =~ s/^\s+|\s+$//g;
+    $string =~ s/\s+/ /g;
+    return $string;
 }
 
 1;