[Module-build-checkins] Module-Build/lib/Module/Build Base.pm,1.542,1.543

[Ken W. <kwi...@us...>]

Update of /cvsroot/module-build/Module-Build/lib/Module/Build
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27427/lib/Module/Build

Modified Files:
	Base.pm 
Log Message:
Improve the way we react when the user renames/moves the build
directory, or executes the Build script from elsewhere.  We now
remember a "magic number" that we write to a file in _build/ , and if
that number is present, we don't need to check whether the cwd()
matches what it used to be.



Index: Base.pm
===================================================================
RCS file: /cvsroot/module-build/Module-Build/lib/Module/Build/Base.pm,v
retrieving revision 1.542
retrieving revision 1.543
diff -u -d -r1.542 -r1.543
--- Base.pm	22 Jan 2006 02:30:44 -0000	1.542
+++ Base.pm	23 Jan 2006 01:31:07 -0000	1.543
@@ -657,6 +657,7 @@
   install_base
   libdoc_dirs
   license
+  magic_number
   mb_version
   module_name
   orig_dir
@@ -861,13 +862,13 @@
   return scalar grep $self->{phash}{$_}->has_data(), qw(config_data features auto_features);
 }
 
-sub _write_dumper {
+sub _write_data {
   my ($self, $filename, $data) = @_;
   
   my $file = $self->config_file($filename);
   my $fh = IO::File->new("> $file") or die "Can't create '$file': $!";
   local $Data::Dumper::Terse = 1;
-  print $fh Data::Dumper::Dumper($data);
+  print $fh ref($data) ? Data::Dumper::Dumper($data) : $data;
 }
 
 sub write_config {
@@ -877,8 +878,11 @@
   -d $self->{properties}{config_dir} or die "Can't mkdir $self->{properties}{config_dir}: $!";
   
   my @items = @{ $self->prereq_action_types };
-  $self->_write_dumper('prereqs', { map { $_, $self->$_() } @items });
-  $self->_write_dumper('build_params', [$self->{args}, $self->{config}, $self->{properties}]);
+  $self->_write_data('prereqs', { map { $_, $self->$_() } @items });
+  $self->_write_data('build_params', [$self->{args}, $self->{config}, $self->{properties}]);
+
+  # Set a new magic number and write it to a file
+  $self->_write_data('magicnum', $self->magic_number(int rand 1_000_000));
 
   $self->{phash}{$_}->write() foreach qw(notes cleanup features auto_features config_data runtime_params);
 }
@@ -1164,15 +1168,17 @@
   my $case_tolerant = 0+(File::Spec->can('case_tolerant')
 			 && File::Spec->case_tolerant);
   $q{base_dir} = uc $q{base_dir} if $case_tolerant;
+  $q{magic_numfile} = $self->config_file('magicnum');
 
   my @myINC = $self->_added_to_INC;
   for (@myINC, values %q) {
-    $_ = File::Spec->canonpath( File::Spec->rel2abs($_) );
+    $_ = File::Spec->canonpath( $_ );
     s/([\\\'])/\\$1/g;
   }
 
   my $quoted_INC = join ",\n", map "     '$_'", @myINC;
   my $shebang = $self->_startperl;
+  my $magic_number = $self->magic_number;
 
   print $fh <<EOF;
 $shebang
@@ -1182,6 +1188,15 @@
 use File::Basename;
 use File::Spec;
 
+sub magic_number_matches {
+  return 0 unless -e '$q{magic_numfile}';
+  local *FH;
+  open FH, '$q{magic_numfile}' or return 0;
+  my \$filenum = <FH>;
+  close FH;
+  return \$filenum == $magic_number;
+}
+
 my \$progname;
 my \$orig_dir;
 BEGIN {
@@ -1189,8 +1204,13 @@
   \$progname = basename(\$0);
   \$orig_dir = Cwd::cwd();
   my \$base_dir = '$q{base_dir}';
-  unless (chdir(\$base_dir)) {
-    die ("Couldn't chdir(\$base_dir), aborting\\n");
+  if (!magic_number_matches()) {
+    unless (chdir(\$base_dir)) {
+      die ("Couldn't chdir(\$base_dir), aborting\\n");
+    }
+    unless (magic_number_matches()) {
+      die ("Configuration seems to be out of date, please re-run 'perl Build.PL' again.\\n");
+    }
   }
   unshift \@INC,
     (