Re: Build CVS (TRUNK) failed.

[Jim Hyslop]

Mark D. Baushke wrote:
> Hi Folks,
> I suspect that something like the following patch is needed, but I don't
> actually have any Windows box or development environment to test it.

Almost there - you need to add dup-safer as well.  For some reason, if I 
added the "SOURCE=" section for dup-safer in libcvs.mak, nmake couldn't 
build it - I have no clue why.

ccvs\lib>nmake -f libcvs.mak

Microsoft (R) Program Maintenance Utility   Version 6.00.8168.0
Copyright (C) Microsoft Corp 1988-1998. All rights reserved.

No configuration specified. Defaulting to libcvs - Win32 Debug.
NMAKE : fatal error U1073: don't know how to make '\'
Stop.

I could not get it to build. I even backed out all my changes, reverted 
to your patch and did a sed s/fd-safer/dup-safer/g and it *still* didn't 
build. Weird.

Anyway, here's a revised patch that compiles and links (I haven't tested 
it at all):

Index: lib/libcvs.dep
===================================================================
RCS file: /cvs/ccvs/lib/libcvs.dep,v
retrieving revision 1.19
diff -u -r1.19 libcvs.dep
--- lib/libcvs.dep      8 Mar 2005 05:16:29 -0000       1.19
+++ lib/libcvs.dep      6 May 2005 18:34:59 -0000
@@ -32,13 +32,23 @@
        "..\windows-NT\stdbool.h"\
        ".\dirname.h"\
        ".\xalloc.h"\
-       
+
+.\dup-safer.c : \      
+       "..\windows-NT\config.h"\
+       "..\windows-NT\stdbool.h"

 .\exitfail.c : \
        "..\windows-NT\config.h"\
        ".\exit.h"\
        ".\exitfail.h"\
        
+".\fd-safer.c" : \
+       "..\windows-NT\config.h"\
+       "..\windows-NT\stdbool.h"\
+       "..\windows-NT\unistd.h"\
+       ".\unistd-safer.h"\
+       ".\error.h"\
+       

 .\fncase.c : \
        "..\windows-NT\config.h"\
Index: lib/libcvs.dsp
===================================================================
RCS file: /cvs/ccvs/lib/libcvs.dsp,v
retrieving revision 1.20
diff -u -r1.20 libcvs.dsp
--- lib/libcvs.dsp      8 Mar 2005 05:16:29 -0000       1.20
+++ lib/libcvs.dsp      6 May 2005 18:35:00 -0000
@@ -105,10 +105,18 @@
 # End Source File
 # Begin Source File

+SOURCE=.\dup-safer.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\exitfail.c
 # End Source File
 # Begin Source File

+SOURCE=".\fd-safer.c"
+# End Source File
+# Begin Source File
+
 SOURCE=.\fncase.c
 # End Source File
 # Begin Source File
Index: lib/libcvs.mak
===================================================================
RCS file: /cvs/ccvs/lib/libcvs.mak,v
retrieving revision 1.21
diff -u -r1.21 libcvs.mak
--- lib/libcvs.mak      8 Mar 2005 05:16:29 -0000       1.21
+++ lib/libcvs.mak      6 May 2005 18:35:01 -0000
@@ -45,7 +45,9 @@
        -@erase "$(INTDIR)\basename.obj"
        -@erase "$(INTDIR)\closeout.obj"
        -@erase "$(INTDIR)\dirname.obj"
+       -@erase "$(INTDIR)\dup-safer.obj"
        -@erase "$(INTDIR)\exitfail.obj"
+       -@erase "$(INTDIR)\fd-safer.obj"
        -@erase "$(INTDIR)\fncase.obj"
        -@erase "$(INTDIR)\fnmatch.obj"
        -@erase "$(INTDIR)\fseeko.obj"
@@ -101,8 +103,10 @@
        "$(INTDIR)\asnprintf.obj" \
        "$(INTDIR)\basename.obj" \
        "$(INTDIR)\dirname.obj" \
+       "$(INTDIR)\dup-safer.obj" \
        "$(INTDIR)\exitfail.obj" \
        "$(INTDIR)\fncase.obj" \
+       "$(INTDIR)\fd-safer.obj" \
        "$(INTDIR)\fnmatch.obj" \
        "$(INTDIR)\fseeko.obj" \
        "$(INTDIR)\ftello.obj" \
@@ -162,7 +166,9 @@
        -@erase "$(INTDIR)\basename.obj"
        -@erase "$(INTDIR)\closeout.obj"
        -@erase "$(INTDIR)\dirname.obj"
+       -@erase "$(INTDIR)\dup-safer.obj"
        -@erase "$(INTDIR)\exitfail.obj"
+       -@erase "$(INTDIR)\fd-safer.obj"
        -@erase "$(INTDIR)\fncase.obj"
        -@erase "$(INTDIR)\fnmatch.obj"
        -@erase "$(INTDIR)\fseeko.obj"
@@ -216,7 +222,9 @@
        "$(INTDIR)\asnprintf.obj" \
        "$(INTDIR)\basename.obj" \
        "$(INTDIR)\dirname.obj" \
+       "$(INTDIR)\dup-safer.obj" \
        "$(INTDIR)\exitfail.obj" \
+       "$(INTDIR)\fd-safer.obj" \
        "$(INTDIR)\fncase.obj" \
        "$(INTDIR)\fnmatch.obj" \
        "$(INTDIR)\fseeko.obj" \
@@ -333,6 +341,11 @@
 "$(INTDIR)\exitfail.obj" : $(SOURCE) "$(INTDIR)"


+SOURCE=.\fd-safer.c
+
+"$(INTDIR)\fd-safer.obj" : $(SOURCE) "$(INTDIR)"
+
+
 SOURCE=.\fncase.c

 "$(INTDIR)\fncase.obj" : $(SOURCE) "$(INTDIR)"




--
Jim