bug-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Patch: Stable Branch Windows VC6 Build


From: Conrad T. Pino
Subject: Patch: Stable Branch Windows VC6 Build
Date: Wed, 12 May 2004 12:55:11 -0700

Hi Derek,

Here is the patch you requested.
====================================
Files not included here but needed and should be same as feature
branch as long as both branches are built with same tool chain:

        windows-NT/fix-msvc-mak-head.pl
        windows-NT/fix-msvc-mak.pl

i.e. VC6 since this script is fixing VC6 .dep/.mak output.
====================================
File attachment "Patch-stable.txt" contains patches for:

        cvsnt.dep (new)
        cvsnt.dsp
        cvsnt.dsw
        cvsnt.mak

        diff/.cvsignore
        diff/libdiff.dep (new)
        diff/libdiff.dsp
        diff/libdiff.mak (new)

        lib/.cvsignore
        lib/libcvs.dep (new)
        lib/libcvs.dsp (new)
        lib/libcvs.mak (new)

        zlib/.cvsignore
        zlib/libz.dep (new)
        zlib/libz.dsp (new)
        zlib/libz.mak (new)

and is intended for use by the patch committer.

Attached patch text file uses Windows/DOS new line standard.
====================================
These entries are provided for convenience of committer:

./ChangeLog:

        * cvsnt.dsw: Rename projects and files as follows:
                        "zlib/zlib.*" to "zlib/libz.*"
                     Add project "lib/libcvs".
        * cvsnt.dsp: Revised for "cvsnt.dsw" changes.
                     Move "lib/*.c" to project "lib/libcvs".
                     Upgraded to Visual C++ 6.0 format.
        * cvsnt.dep: Added for "cvsnt.dsp" change.
        * cvsnt.mak: Regenerated for "cvsnt.dsp" change.

./diff/ChangeLog:

        * .cvsignore: Changed for "libdiff.dsp" changes.
        * libdiff.dep: Added for "../cvsnt.dsw" changes.
        * libdiff.dsp: Changed for "../cvsnt.dsw" changes.
        * libdiff.mak: Regenerated for "../cvsnt.dsw" changes.

./lib/ChangeLog:

        * .cvsignore: Changed for "libcvs.dsp" changes.
        * libcvs.dsp: Added for "../cvsnt.dsw" changes.
        * libcvs.dep: Added for "libcvs.dsp" addition.
        * libcvs.mak: Added for "libcvs.dsp" addition.

./zlib/ChangeLog:

        * .cvsignore: Changed for "libz.dsp", "zlib.dsp" changes.
        * libz.dsp: Added for "../cvsnt.dsw" changes.
        * libz.dep: Added for "libz.dsp" addition.
        * libz.mak: Added for "libz.dsp" addition.
        * zlib.dsp: Removed for "../cvsnt.dsw" changes.

for use or not at committer's discretion.
====================================
I'm not sure if an "NEWS" entry is needed or appropriate.
I'll provide one if suggested as to the needed content.
====================================
These commands are provided for convenience of committer:

cvs add cvsnt.dep
cvs add diff/libdiff.dep
cvs add diff/libdiff.mak
cvs add lib/libcvs.dep
cvs add lib/libcvs.dsp
cvs add lib/libcvs.mak
cvs add zlib/libz.dep
cvs add zlib/libz.dsp
cvs add zlib/libz.mak

if stable == feature
        cvs admin -n cvs1-11-x-branch:1 windows-NT/fix-msvc-mak-head.pl
        cvs admin -n cvs1-11-x-branch:1 windows-NT/fix-msvc-mak.pl
else
        cvs add windows-NT/fix-msvc-mak-head.pl
        cvs add windows-NT/fix-msvc-mak.pl
fi

cvs remove zlib/zlib.dsp
====================================
Conrad

Attachment: Patch-stable.txt
Description: Text document


reply via email to

[Prev in Thread] Current Thread [Next in Thread]