[Bps-public-commit] r15226 - in Shipwright/branches/1.10: lib/Shipwright/Manual lib/Shipwright/Source

[sunnavy at bestpractical.com]

Author: sunnavy
Date: Mon Aug 18 11:35:41 2008
New Revision: 15226

Modified:
   Shipwright/branches/1.10/bin/shipwright
   Shipwright/branches/1.10/lib/Shipwright/Manual/Tutorial.pod
   Shipwright/branches/1.10/lib/Shipwright/Source/FTP.pm

Log:
merged 15790:15799 to 1.1

Modified: Shipwright/branches/1.10/bin/shipwright
==============================================================================
--- Shipwright/branches/1.10/bin/shipwright	(original)
+++ Shipwright/branches/1.10/bin/shipwright	Mon Aug 18 11:35:41 2008
@@ -4,6 +4,10 @@
 use warnings;
 use Shipwright;
 use Shipwright::Script;
+use Cwd;
 
 local $SIG{INT} = sub { warn "Stopped\n"; exit; };
+
+my $cwd = getcwd;
 Shipwright::Script->dispatch();
+chdir $cwd;

Modified: Shipwright/branches/1.10/lib/Shipwright/Manual/Tutorial.pod
==============================================================================
--- Shipwright/branches/1.10/lib/Shipwright/Manual/Tutorial.pod	(original)
+++ Shipwright/branches/1.10/lib/Shipwright/Manual/Tutorial.pod	Mon Aug 18 11:35:41 2008
@@ -92,10 +92,10 @@
 We'll import apache 2.2.9, perl 5.10, mod_perl 2.0, libxml and XML::LibXML
 in this tutorial one by one.
 
-    $ shipwright import -r svk://foo http://www.apache.org/dist/httpd/httpd-2.2.9.tar.gz
+    $ shipwright import -r svk://foo http://www.apache.org/dist/httpd/httpd-2.2.9.tar.gz --name apache
     $ shipwright import -r svk://foo http://www.cpan.org/authors/id/R/RG/RGARCIA/perl-5.10.0.tar.gz
-    $ shipwright import -r svk://foo http://perl.apache.org/dist/mod_perl-2.0-current.tar.gz
-    $ shipwright import -r svk://foo ftp://xmlsoft.org/libxml2/libxml2-2.6.32.tar.gz
+    $ shipwright import -r svk://foo http://perl.apache.org/dist/mod_perl-2.0-current.tar.gz --name mod_perl
+    $ shipwright import -r svk://foo ftp://xmlsoft.org/libxml2/libxml2-2.6.32.tar.gz --name libxml
     $ shipwright import -r svk://foo cpan:XML::LibXML
 
 Run I<shipwright help import> to see more options.
@@ -106,6 +106,13 @@
 L<Module::Build>), you would now need to edit F<scripts/DISTNAME/build> to tell
 Shipwright how to build that source.
 
+For our tutorial, e.g. perl 5.10, the build can't be created automitacally,
+so we need to edit the build file:
+
+  configure: ./Configure -des -Dprefix=%%INSTALL_BASE%%
+  test: make test
+  install: make install
+
 For more information on build scripts, see L<Shipwright::Manual::CustomizeBuild>.
 
 =head2 update

Modified: Shipwright/branches/1.10/lib/Shipwright/Source/FTP.pm
==============================================================================
--- Shipwright/branches/1.10/lib/Shipwright/Source/FTP.pm	(original)
+++ Shipwright/branches/1.10/lib/Shipwright/Source/FTP.pm	Mon Aug 18 11:35:41 2008
@@ -5,6 +5,7 @@
 use Carp;
 
 use Shipwright::Source::Compressed;
+use File::Spec::Functions qw/catfile/;
 
 use base qw/Shipwright::Source::Base/;