remove use of temp file for perlchunks.h, as in recent change to plperl GNUmakefile

adunstan · adunstan · commit ccaad191126f · 2010-01-11T14:16:18.000Z
diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
@@ -3,7 +3,7 @@ package Mkvcbuild;
 #
 # Package that generates build files for msvc build
 #
-# $PostgreSQL: pgsql/src/tools/msvc/Mkvcbuild.pm,v 1.45 2010/01/09 14:45:47 adunstan Exp $
+# $PostgreSQL: pgsql/src/tools/msvc/Mkvcbuild.pm,v 1.46 2010/01/11 14:16:18 adunstan Exp $
 #
 use Carp;
 use Win32;
@@ -117,18 +117,13 @@ sub mkvcbuild
                   . 'text2macro.pl '
                   . '--strip="^(\#.*|\s*)$$" '
                   . 'plc_perlboot.pl plc_safe_bad.pl plc_safe_ok.pl '
-                  .	'>perlchunks.htmp');
+                  .	'>perlchunks.h');
             chdir $basedir;
-            if ((!(-f 'src\pl\plperl\perlchunks.htmp')) || -z 'src\pl\plperl\perlchunks.htmp')
+            if ((!(-f 'src\pl\plperl\perlchunks.h')) || -z 'src\pl\plperl\perlchunks.h')
             {
-                unlink('src\pl\plperl\perlchunks.htmp'); # if zero size
+                unlink('src\pl\plperl\perlchunks.h'); # if zero size
                 die 'Failed to create perlchunks.h' . "\n";
             }
-            else
-            {
-                move('src\pl\plperl\perlchunks.htmp','src\pl\plperl\perlchunks.h');
-            }
-
         }
         $plperl->AddReference($postgres);
 		my @perl_libs = grep {/perl\d+.lib$/ }

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package Mkvcbuild;`
`3`	`3`	`#`
`4`	`4`	`# Package that generates build files for msvc build`
`5`	`5`	`#`
`6`		`-# $PostgreSQL: pgsql/src/tools/msvc/Mkvcbuild.pm,v 1.45 2010/01/09 14:45:47 adunstan Exp $`
	`6`	`+# $PostgreSQL: pgsql/src/tools/msvc/Mkvcbuild.pm,v 1.46 2010/01/11 14:16:18 adunstan Exp $`
`7`	`7`	`#`
`8`	`8`	`use Carp;`
`9`	`9`	`use Win32;`
`@@ -117,18 +117,13 @@ sub mkvcbuild`
`117`	`117`	`. 'text2macro.pl '`
`118`	`118`	`. '--strip="^(\#.\|\s)$$" '`
`119`	`119`	`. 'plc_perlboot.pl plc_safe_bad.pl plc_safe_ok.pl '`
`120`		`- . '>perlchunks.htmp');`
	`120`	`+ . '>perlchunks.h');`
`121`	`121`	`chdir $basedir;`
`122`		`- if ((!(-f 'src\pl\plperl\perlchunks.htmp')) \|\| -z 'src\pl\plperl\perlchunks.htmp')`
	`122`	`+ if ((!(-f 'src\pl\plperl\perlchunks.h')) \|\| -z 'src\pl\plperl\perlchunks.h')`
`123`	`123`	`{`
`124`		`- unlink('src\pl\plperl\perlchunks.htmp'); # if zero size`
	`124`	`+ unlink('src\pl\plperl\perlchunks.h'); # if zero size`
`125`	`125`	`die 'Failed to create perlchunks.h' . "\n";`
`126`	`126`	`}`
`127`		`- else`
`128`		`- {`
`129`		`- move('src\pl\plperl\perlchunks.htmp','src\pl\plperl\perlchunks.h');`
`130`		`- }`
`131`		`-`
`132`	`127`	`}`
`133`	`128`	`$plperl->AddReference($postgres);`
`134`	`129`	`my @perl_libs = grep {/perl\d+.lib$/ }`