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

[Mark D. Baushke]

address@hidden writes:

> 
> Microsoft (R) Program Maintenance Utility   Version 6.00.8168.0
> Copyright (C) Microsoft Corp 1988-1998. All rights reserved.
> 
>       cd ".\lib"
>       NMAKE /A                  /F ".\libcvs.mak" CFG="libcvs - Win32 Release"
> 
> Microsoft (R) Program Maintenance Utility   Version 6.00.8168.0
> Copyright (C) Microsoft Corp 1988-1998. All rights reserved.
> 
>       if not exist ".\WinRel/" mkdir ".\WinRel"
>       tempfile.bat 
>         1 file(s) copied.
>       tempfile.bat 
>         1 file(s) copied.
>       tempfile.bat 
>         1 file(s) copied.
>       tempfile.bat 
>         1 file(s) copied.
> NMAKE : fatal error U1073: don't know how to make '"..\windows-NT\ndir.h"'
> Stop.
> NMAKE : fatal error U1077: 'C:\PROGRA~1\MICROS~3\VC98\BIN\NMAKE.EXE' : return 
> code '0x2'
> Stop.

The following patch to the TRUNK might fix the compilation problems
because ndir.h was renamed to dirent.h recently. There are likely to be
other problems waiting for the unwary.

Especially with the new lib/close-stream.c and lib/snprintf.c files
which may need to be added to the lib/libcvs.dsp file.

        -- Mark

Index: diff/libdiff.dep
===================================================================
RCS file: /cvsroot/cvs/ccvs/diff/libdiff.dep,v
retrieving revision 1.19
diff -u -p -r1.19 libdiff.dep
--- diff/libdiff.dep    31 May 2005 04:13:19 -0000      1.19
+++ diff/libdiff.dep    19 Aug 2006 17:51:38 -0000
@@ -4,7 +4,7 @@
        "..\lib\regex.h"\
        "..\lib\timespec.h"\
        "..\windows-NT\config.h"\
-       "..\windows-NT\ndir.h"\
+       "..\windows-NT\dirent.h"\
        "..\windows-NT\unistd.h"\
        "..\windows-NT\woe32.h"\
        ".\cmpbuf.h"\
@@ -16,7 +16,7 @@
 .\cmpbuf.c : \
        "..\lib\timespec.h"\
        "..\windows-NT\config.h"\
-       "..\windows-NT\ndir.h"\
+       "..\windows-NT\dirent.h"\
        "..\windows-NT\unistd.h"\
        "..\windows-NT\woe32.h"\
        ".\cmpbuf.h"\
@@ -27,7 +27,7 @@
        "..\lib\regex.h"\
        "..\lib\timespec.h"\
        "..\windows-NT\config.h"\
-       "..\windows-NT\ndir.h"\
+       "..\windows-NT\dirent.h"\
        "..\windows-NT\unistd.h"\
        "..\windows-NT\woe32.h"\
        ".\diff.h"\
@@ -41,7 +41,7 @@
        "..\lib\regex.h"\
        "..\lib\timespec.h"\
        "..\windows-NT\config.h"\
-       "..\windows-NT\ndir.h"\
+       "..\windows-NT\dirent.h"\
        "..\windows-NT\unistd.h"\
        "..\windows-NT\woe32.h"\
        ".\diff.h"\
@@ -53,7 +53,7 @@
        "..\lib\getopt.h"\
        "..\lib\timespec.h"\
        "..\windows-NT\config.h"\
-       "..\windows-NT\ndir.h"\
+       "..\windows-NT\dirent.h"\
        "..\windows-NT\unistd.h"\
        "..\windows-NT\woe32.h"\
        ".\diffrun.h"\
@@ -64,7 +64,7 @@
        "..\lib\regex.h"\
        "..\lib\timespec.h"\
        "..\windows-NT\config.h"\
-       "..\windows-NT\ndir.h"\
+       "..\windows-NT\dirent.h"\
        "..\windows-NT\unistd.h"\
        "..\windows-NT\woe32.h"\
        ".\diff.h"\
@@ -76,7 +76,7 @@
        "..\lib\regex.h"\
        "..\lib\timespec.h"\
        "..\windows-NT\config.h"\
-       "..\windows-NT\ndir.h"\
+       "..\windows-NT\dirent.h"\
        "..\windows-NT\unistd.h"\
        "..\windows-NT\woe32.h"\
        ".\diff.h"\
@@ -88,7 +88,7 @@
        "..\lib\regex.h"\
        "..\lib\timespec.h"\
        "..\windows-NT\config.h"\
-       "..\windows-NT\ndir.h"\
+       "..\windows-NT\dirent.h"\
        "..\windows-NT\unistd.h"\
        "..\windows-NT\woe32.h"\
        ".\diff.h"\
@@ -100,7 +100,7 @@
        "..\lib\regex.h"\
        "..\lib\timespec.h"\
        "..\windows-NT\config.h"\
-       "..\windows-NT\ndir.h"\
+       "..\windows-NT\dirent.h"\
        "..\windows-NT\unistd.h"\
        "..\windows-NT\woe32.h"\
        ".\diff.h"\
@@ -112,7 +112,7 @@
        "..\lib\regex.h"\
        "..\lib\timespec.h"\
        "..\windows-NT\config.h"\
-       "..\windows-NT\ndir.h"\
+       "..\windows-NT\dirent.h"\
        "..\windows-NT\unistd.h"\
        "..\windows-NT\woe32.h"\
        ".\diff.h"\
@@ -124,7 +124,7 @@
        "..\lib\regex.h"\
        "..\lib\timespec.h"\
        "..\windows-NT\config.h"\
-       "..\windows-NT\ndir.h"\
+       "..\windows-NT\dirent.h"\
        "..\windows-NT\unistd.h"\
        "..\windows-NT\woe32.h"\
        ".\diff.h"\
@@ -136,7 +136,7 @@
        "..\lib\regex.h"\
        "..\lib\timespec.h"\
        "..\windows-NT\config.h"\
-       "..\windows-NT\ndir.h"\
+       "..\windows-NT\dirent.h"\
        "..\windows-NT\unistd.h"\
        "..\windows-NT\woe32.h"\
        ".\diff.h"\
Index: diff/libdiff.dsp
===================================================================
RCS file: /cvsroot/cvs/ccvs/diff/libdiff.dsp,v
retrieving revision 1.9
diff -u -p -r1.9 libdiff.dsp
--- diff/libdiff.dsp    31 May 2005 11:01:16 -0000      1.9
+++ diff/libdiff.dsp    19 Aug 2006 17:51:38 -0000
@@ -165,7 +165,7 @@ SOURCE=..\lib\getopt.h
 # End Source File
 # Begin Source File
 
-SOURCE="..\windows-NT\ndir.h"
+SOURCE="..\windows-NT\dirent.h"
 # End Source File
 # Begin Source File
 
Index: lib/libcvs.dep
===================================================================
RCS file: /cvsroot/cvs/ccvs/lib/libcvs.dep,v
retrieving revision 1.36
diff -u -p -r1.36 libcvs.dep
--- lib/libcvs.dep      10 Jul 2006 20:09:40 -0000      1.36
+++ lib/libcvs.dep      19 Aug 2006 17:51:38 -0000
@@ -66,6 +66,13 @@
        ".\timespec.h"\
        
 
+.\dirent.c : \
+       "..\windows-NT\config.h"\
+       "..\windows-NT\dirent.h"\
+       "..\windows-NT\woe32.h"\
+       ".\xalloc.h"\
+       
+
 .\dirname.c : \
        "..\windows-NT\config.h"\
        "..\windows-NT\stdbool.h"\
@@ -101,7 +108,7 @@
 
 .\fncase.c : \
        "..\windows-NT\config.h"\
-       "..\windows-NT\ndir.h"\
+       "..\windows-NT\dirent.h"\
        "..\windows-NT\pwd.h"\
        "..\windows-NT\stdbool.h"\
        "..\windows-NT\stdint.h"\
@@ -226,7 +233,7 @@
 
 .\glob.c : \
        "..\windows-NT\config.h"\
-       "..\windows-NT\ndir.h"\
+       "..\windows-NT\dirent.h"\
        "..\windows-NT\pwd.h"\
        "..\windows-NT\stdbool.h"\
        "..\windows-NT\unistd.h"\
@@ -381,7 +388,7 @@
 
 .\sighandle.c : \
        "..\windows-NT\config.h"\
-       "..\windows-NT\ndir.h"\
+       "..\windows-NT\dirent.h"\
        "..\windows-NT\pwd.h"\
        "..\windows-NT\stdbool.h"\
        "..\windows-NT\stdint.h"\
Index: vms/build_vms.com
===================================================================
RCS file: /cvsroot/cvs/ccvs/vms/build_vms.com,v
retrieving revision 1.4
diff -u -p -r1.4 build_vms.com
--- vms/build_vms.com   7 Aug 2001 15:36:57 -0000       1.4
+++ vms/build_vms.com   19 Aug 2006 17:51:42 -0000
@@ -6,7 +6,7 @@ $ CC filutils.c
 $ CC getpass.c
 $ CC getwd.c
 $ CC misc.c
-$ CC ndir.c
+$ CC dirent.c
 $ CC pipe.c
 $ CC piped_child.c
 $ CC pwd.c
@@ -20,7 +20,7 @@ $ CC utime.c
 $ CC /NOSTANDARD vmsmunch.c
 $ CC waitpid.c
 $ library/create openvmslib.olb filesubr.obj,-
-filutils.obj,getpass.obj,getwd.obj,misc.obj,ndir.obj,pipe.obj,-
+filutils.obj,getpass.obj,getwd.obj,misc.obj,dirent.obj,pipe.obj,-
 pwd.obj,rcmd.obj,readlink.obj,rmdir.obj,stat.obj,startserver.obj,-
 unlink.obj,utime.obj,vmsmunch.obj,waitpid.obj
 $ set noverify