X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/273cf8d1f309172b4416e78e4a8e80c12d941254..HEAD:/win32/config_h.PL

diff --git a/win32/config_h.PL b/win32/config_h.PL
index 17f3fc2..afff8ac 100644
--- a/win32/config_h.PL
+++ b/win32/config_h.PL
@@ -1,9 +1,18 @@
-#
-use Config;
+#!perl -w
+use strict;
+
+BEGIN { warn "Running ".__FILE__."\n" };
+BEGIN 
+ {
+  require "Config.pm";
+  die "Config.pm:$@" if $@;
+  Config->import;
+ }
 use File::Compare qw(compare);
 use File::Copy qw(copy);
-my $OBJ   = 1 if $Config{'ccflags'} =~ /PERL_OBJECT/i;
-my $name = $0;
+use File::Basename qw(fileparse);
+
+my ($name, $dir) = fileparse($0);
 $name =~ s#^(.*)\.PL$#../$1.SH#;
 my %opt;
 while (@ARGV && $ARGV[0] =~ /^([\w_]+)=(.*)$/)
@@ -11,18 +20,21 @@ while (@ARGV && $ARGV[0] =~ /^([\w_]+)=(.*)$/)
   $opt{$1}=$2;
   shift(@ARGV);
  }
-my $patchlevel = $opt{INST_VER};
-$patchlevel =~ s|^[\\/]||;
-$patchlevel =~ s|~VERSION~|$Config{version}|g;
-$patchlevel ||= $Config{version};
-$patchlevel = qq["$patchlevel"];
 
-open(SH,"<$name") || die "Cannot open $name:$!";
+$opt{CONFIG_H} ||= 'config.h';
+$opt{CORE_DIR} ||= '../lib/CORE';
+$opt{CORE_CONFIG_H} ||= $opt{CORE_DIR} . '/config.h';
+
+warn "Writing $opt{CONFIG_H}\n";
+
+open(SH, "<", $name) || die "Cannot open $name:$!";
 while (<SH>)
  {
-  last if /^sed/;
+  last if /^\s*sed/;
  }
-($term,$file,$pat) = /^sed\s+<<(\S+)\s+>(\S+)\s+(.*)$/;
+my($term,$file,$pat) = /^\s*sed\s+<<(\S+)\s+>(\S+)\s+(.*)$/;
+
+$file =~ s/^\$(\w+)$/$opt{$1}/g;
 
 my $str = "sub munge\n{\n";
 
@@ -39,8 +51,8 @@ eval $str;
 
 die "$str:$@" if $@;
 
-open(H,">$file.new") || die "Cannot open $file.new:$!";
-binmode H;		# no CRs (which cause a spurious rebuild)
+open(H, ">", "$file.new") || die "Cannot open $file.new:$!";
+binmode(H);
 while (<SH>)
  {
   last if /^$term$/o;
@@ -49,38 +61,48 @@ while (<SH>)
   munge();
   s/\\\$/\$/g;
   s#/[ *\*]*\*/#/**/#;
-  if (/^\s*#define\s+(PRIVLIB|SITELIB)_EXP/)
+  s#(.)/\*\*/#$1/ **/# if(/^\/\*/); #avoid "/*" inside comments
+  if (/^\s*#define\s+(PRIVLIB|SITELIB|VENDORLIB)_EXP/)
    {
-     $_ = "#define ". $1 . "_EXP (win32_get_". lc($1) . "($patchlevel))\t/**/\n";
+     $_ = '#define '. $1 . '_EXP ('.(
+       $1 eq 'PRIVLIB' ? 'PerlEnv_lib_path' :
+       $1 eq 'SITELIB' ? 'PerlEnv_sitelib_path' :
+       $1 eq 'VENDORLIB' ? 'PerlEnv_vendorlib_path' :
+       die "unknown *LIB_EXP define \"$1\""
+       ). "(PERL_VERSION_STRING, NULL))\t/**/\n";
    }
   # incpush() handles archlibs, so disable them
-  elsif (/^\s*#define\s+(ARCHLIB|SITEARCH)_EXP/)
+  elsif (/^\s*#define\s+(ARCHLIB|SITEARCH|VENDORARCH)_EXP/)
+   {
+     $_ = "/*#define ". $1 . "_EXP \"\"\t/ **/\n";
+   }
+  elsif (/^\s*#define\s+CPP(STDIN|RUN)\s+"gcc(.*)"\s*$/)
    {
-     $_ = "/*#define ". $1 . "_EXP \"\"\t/**/\n";
+     $_ = "#define CPP" . $1 . " \"" . $opt{ARCHPREFIX} . "gcc" . $2 . "\"\n";
    }
   print H;
  }
 close(H);
 close(SH);
 
+my $core_config_h = $opt{CORE_CONFIG_H};
+if (compare("$file.new", $core_config_h)) {
+    mkdir $opt{CORE_DIR} unless -d $opt{CORE_DIR};
+    chmod(0666,$core_config_h);
+    copy("$file.new",$core_config_h) || die "Cannot copy $file.new $core_config_h:$!";
+    chmod(0444,$core_config_h);
+}
 
-chmod(0666,"../lib/CORE/config.h");
-copy("$file.new","../lib/CORE/config.h") || die "Cannot copy:$!";
-chmod(0444,"../lib/CORE/config.h");
-
-if (!$OBJ && compare("$file.new",$file))
+if (compare("$file.new",$file))
  {
   warn "$file has changed\n";
   chmod(0666,$file);
   unlink($file);
-  rename("$file.new",$file);
-  #chmod(0444,$file);
-  exit(1);
+  rename("$file.new",$file) || die "Cannot rename:$!";
  }
 else
  {
   unlink ("$file.new");
-  exit(0);
  }
 
 sub Config
@@ -97,7 +119,7 @@ sub BackTick
  my $cmd = shift;
  if ($cmd =~ /^echo\s+(.*?)\s*\|\s+sed\s+'(.*)'\s*$/)
   {
-   local ($data,$pat) = ($1,$2);
+   my($data,$pat) = ($1,$2);
    $data =~ s/\s+/ /g;
    eval "\$data =~ $pat";
    return $data;