I got cvs 1.10.8 and the most recent dev version compiling under NT with
only a few minor changes to the makefile (cvsnt.mak).  It generates a
lot of warnings and I haven't put it through extensive testing yet, but
it'll do 'cvs co' and 'cvs diff' ('cvs co' with the 1.10.8 grabbed ccvs
for me and 'cvs diff' with the same version generated this patch).  It
looks like the NT makefile could use some major tidying and
reorginization, but with these changes it works for both Debug and
Release version.

I'm working on getting sanity.sh to run using the cygwin tools.  I'll
post my findings.

Derek

--
Derek Price                      CVS Solutions Architect
mailto:[EMAIL PROTECTED]     OpenAvenue ( http://OpenAvenue.com )
--
125. The truth is out there? Anyone know the URL?


Index: cvsnt.mak
===================================================================
RCS file: /home2/cvsroot/ccvs/cvsnt.mak,v
retrieving revision 1.38
diff -r1.38 cvsnt.mak
199c199
<       ".\WinRel\1\diff.obj" \
---
>       "$(INTDIR)/2/diff.obj" \
223c223
<       ".\WinRel\2\diff.obj" \
---
>       "$(INTDIR)/1/diff.obj" \
227c227
<       ".\WinRel\2\version.obj" \
---
>       "$(INTDIR)/2/version.obj" \
267c267
<       ".\WinRel\1\version.obj" \
---
>       "$(INTDIR)/1/version.obj" \
309,314c309,314
<       -@erase ".\WinDebug\vc40.pdb"
<       -@erase ".\WinDebug\vc40.idb"
<       -@erase ".\WinDebug\1\vc40.pdb"
<       -@erase ".\WinDebug\1\vc40.idb"
<       -@erase ".\WinDebug\2\vc40.pdb"
<       -@erase ".\WinDebug\2\vc40.idb"
---
>       -@erase ".\WinDebug\vc60.pdb"
>       -@erase ".\WinDebug\vc60.idb"
>       -@erase ".\WinDebug\1\vc60.pdb"
>       -@erase ".\WinDebug\1\vc60.idb"
>       -@erase ".\WinDebug\2\vc60.pdb"
>       -@erase ".\WinDebug\2\vc60.idb"
471c471
<       ".\WinDebug\1\version.obj" \
---
>       "$(INTDIR)/1/version.obj" \
502c502
<       ".\WinDebug\1\diff.obj" \
---
>       "$(INTDIR)/2/diff.obj" \
530c530
<       ".\WinDebug\2\diff.obj" \
---
>       "$(INTDIR)/1/diff.obj" \
542c542
<       ".\WinDebug\2\version.obj" \
---
>       "$(INTDIR)/2/version.obj" \
771c771
< INTDIR_SRC=.\WinRel\1
---
> INTDIR_SRC=$(INTDIR)/1
1385c1385
< INTDIR_SRC=.\WinRel\1
---
> INTDIR_SRC=$(INTDIR)/1
2038c2038
<       ".\src\diffrun.h"\
---
>       ".\diff\diffrun.h"\
2048c2048
<  /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "HAVE_CONFIG_H"\
---
>  /I "diff" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "HAVE_CONFIG_H"\
3378,3380c3378,3380
< INTDIR_SRC=.\WinRel\2
< "$(INTDIR_SRC)" :
<     if not exist "$(INTDIR_SRC)/$(NULL)" mkdir "$(INTDIR_SRC)"
---
> INTDIR_DIFF=$(INTDIR)/2
> "$(INTDIR_DIFF)" :
>     if not exist "$(INTDIR_DIFF)/$(NULL)" mkdir "$(INTDIR_DIFF)"
3386c3386
< ".\WinRel\2\diff.obj" : $(SOURCE) $(DEP_CPP_DIFF_) "$(INTDIR_SRC)"
---
> ".\WinRel\2\diff.obj" : $(SOURCE) $(DEP_CPP_DIFF_) "$(INTDIR_DIFF)"
3389c3389
<  /YX /Fo"$(INTDIR_SRC)/" /c $(SOURCE)
---
>  /YX /Fo"$(INTDIR_DIFF)/" /c $(SOURCE)
3396c3396
< ".\WinDebug\2\diff.obj" : $(SOURCE) $(DEP_CPP_DIFF_) "$(INTDIR_SRC)"
---
> ".\WinDebug\2\diff.obj" : $(SOURCE) $(DEP_CPP_DIFF_) "$(INTDIR_DIFF)"
3399c3399
<  /Fp"WinDebug/cvsnt.pch" /YX /Fo"$(INTDIR_SRC)/" /Fd"$(INTDIR_SRC)/" /c\
---
>  /Fp"WinDebug/cvsnt.pch" /YX /Fo"$(INTDIR_DIFF)/" /Fd"$(INTDIR_DIFF)/" /c\
3573,3575c3573,3575
< INTDIR_SRC=.\WinRel\2
< "$(INTDIR_SRC)" :
<     if not exist "$(INTDIR_SRC)/$(NULL)" mkdir "$(INTDIR_SRC)"
---
> INTDIR_DIFF=$(INTDIR)/2
> "$(INTDIR_DIFF)" :
>     if not exist "$(INTDIR_DIFF)/$(NULL)" mkdir "$(INTDIR_DIFF)"
3581c3581
< ".\WinRel\2\version.obj" : $(SOURCE) $(DEP_CPP_VERSI) "$(INTDIR_SRC)"
---
> ".\WinRel\2\version.obj" : $(SOURCE) $(DEP_CPP_VERSI) "$(INTDIR_DIFF)"
3584c3584
<  /YX /Fo"$(INTDIR_SRC)/" /c $(SOURCE)
---
>  /YX /Fo"$(INTDIR_DIFF)/" /c $(SOURCE)
3591c3591
< ".\WinDebug\2\version.obj" : $(SOURCE) $(DEP_CPP_VERSI) "$(INTDIR_SRC)"
---
> ".\WinDebug\2\version.obj" : $(SOURCE) $(DEP_CPP_VERSI) "$(INTDIR_DIFF)"
3594c3594
<  /Fp"WinDebug/cvsnt.pch" /YX /Fo"$(INTDIR_SRC)/" /Fd"$(INTDIR_SRC)/" /c\
---
>  /Fp"WinDebug/cvsnt.pch" /YX /Fo"$(INTDIR_DIFF)/" /Fd"$(INTDIR_DIFF)/" /c\

Reply via email to