RE: [Cvs-test-results] Build CVS (TRUNK) failed.

[Conrad T. Pino]

Hi Derek

> From: Derek Price
> 
> Is the script being run in lib?  It looks like you checked in a file
> with this path:
> 
> [oberon@courage ccvs-clean]$ grep basetsd * */*
> lib/libcvs.dep: "c:\program files\microsoft visual
> studio\vc98\include\basetsd.h"\
> lib/libcvs.dep: "c:\program files\microsoft visual
> studio\vc98\include\basetsd.h"\
> lib/libcvs.dep: "c:\program files\microsoft visual
> studio\vc98\include\basetsd.h"\
> windows-NT/fix-msvc-mak.pl:             if (/basetsd\.h/) {
> [oberon@courage ccvs-clean]$

Thank you, I was grepping for "basestd" and kept missing it.

No, the script does "basetsd" removal from "cvsnt.dep" only.
Would you suggest any improvements to the following patch?

> Regards,

Ditto,

> Derek

Conrad

Index: windows-NT/fix-msvc-mak.pl
===================================================================
RCS file: /cvsroot/cvs/ccvs/windows-NT/fix-msvc-mak.pl,v
retrieving revision 1.5
diff -u -p -r1.5 fix-msvc-mak.pl
--- windows-NT/fix-msvc-mak.pl  9 Mar 2005 19:55:51 -0000       1.5
+++ windows-NT/fix-msvc-mak.pl  21 Sep 2005 17:37:49 -0000
@@ -18,8 +18,8 @@ sub save_edit {
 
 
 
-sub fix_cvsnt_dep {
-       my $file_name = "cvsnt.dep";
+sub fix_basetsd_dep {
+       my ($file_name) = @_;
        my $temp_name = $file_name . ".tmp";
 
        open FINP, "< " . $file_name or die "open error: ", $file_name;
@@ -42,6 +42,12 @@ sub fix_cvsnt_dep {
 
 
 
+sub fix_cvsnt_dep {
+       fix_basetsd_dep "cvsnt.dep";
+}
+
+
+
 sub fix_cvsnt_mak {
        my $file_name = "cvsnt.mak";
        my $temp_name = $file_name . ".tmp";
@@ -68,6 +74,12 @@ sub fix_cvsnt_mak {
 
 
 
+sub fix_libcvs_dep {
+       fix_basetsd_dep "lib/libcvs.dep";
+}
+
+
+
 sub fix_libdiff_mak {
        my $file_name = "diff/libdiff.mak";
        my $temp_name = $file_name . ".tmp";
@@ -95,4 +107,5 @@ sub fix_libdiff_mak {
 
 fix_cvsnt_dep;
 fix_cvsnt_mak;
+fix_libcvs_dep;
 fix_libdiff_mak;