[Bps-public-commit] Shipwright branch, master, updated. 27c43614acd5816a8b3a59ef89f1cdd0b47ba696

[? sunnavy]

The branch, master has been updated
       via  27c43614acd5816a8b3a59ef89f1cdd0b47ba696 (commit)
       via  8719cd3f2c09185b4046986b5620d96cb0b21b85 (commit)
      from  852a2795c2f0ac9e9d7b2b769050622d94863615 (commit)

Summary of changes:
 lib/Shipwright/Script/Import.pm |   10 ++++++++++
 share/bin/shipwright-builder    |   11 +++++++++++
 2 files changed, 21 insertions(+), 0 deletions(-)

- Log -----------------------------------------------------------------
commit 8719cd3f2c09185b4046986b5620d96cb0b21b85
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Sun Jun 26 13:45:03 2011 +0800

    forgot the configure line

diff --git a/lib/Shipwright/Script/Import.pm b/lib/Shipwright/Script/Import.pm
index d692bcc..7b363a8 100644
--- a/lib/Shipwright/Script/Import.pm
+++ b/lib/Shipwright/Script/Import.pm
@@ -459,6 +459,7 @@ EOF
             '# Edit this file to specify commands for building this dist.',
             '# See the perldoc for Shipwright::Manual::CustomizeBuild for more',
             '# info.',
+            'configure: ',
             'make: ',
             'test: ',
             'install: ',

commit 27c43614acd5816a8b3a59ef89f1cdd0b47ba696
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Sun Jun 26 14:19:25 2011 +0800

    support cmake system

diff --git a/lib/Shipwright/Script/Import.pm b/lib/Shipwright/Script/Import.pm
index 7b363a8..5b18417 100644
--- a/lib/Shipwright/Script/Import.pm
+++ b/lib/Shipwright/Script/Import.pm
@@ -446,6 +446,15 @@ sub _generate_build {
             'clean: %%MAKE%% clean',
         );
     }
+    elsif ( -f catfile( $source_dir, 'configure.cmake' ) ) {
+        $self->log->info( 'detected cmake build system' );
+        @commands = (
+            'configure: cmake . -DCMAKE_INSTALL_PREFIX=%%INSTALL_BASE%%',
+            'make: %%MAKE%%',
+            'install: %%MAKE%% install',
+            'clean: %%MAKE%% clean',
+        );
+    }
     else {
         my ($name) = $source_dir =~ /([-\w.]+)$/;
         $self->log->warn(<<EOF);
diff --git a/share/bin/shipwright-builder b/share/bin/shipwright-builder
index 890bae2..586b02d 100755
--- a/share/bin/shipwright-builder
+++ b/share/bin/shipwright-builder
@@ -1001,6 +1001,17 @@ sub detect_cmds {
             ]
         );
     }
+    if ( -f catfile( $dir, 'configure.cmake' )) {
+        print $log "detected cmake build system\n";
+        return cmds(
+            [
+                'configure: cmake . -DCMAKE_INSTALL_PREFIX==%%INSTALL_BASE%%',
+                'make: %%MAKE%%',
+                'install: %%MAKE%% install',
+                'clean: %%MAKE%% clean',
+            ]
+        );
+    }
     else {
         die "unknown build system for $dir";
     }

-----------------------------------------------------------------------