JehanneOS
/
newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* mkvers.sh: Fix problem with handling of CVS tags causing .rc syntax errors.

This commit is contained in:
Christopher Faylor 2000-06-20 21:42:25 +00:00
parent a704d94a86
commit 3ce7a5af5a
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,8 @@
Tue Jun 20 17:41:30 2000 Christopher Faylor <cgf@cygnus.com>
* mkvers.sh: Fix problem with handling of CVS tags causing .rc syntax
errors.
Tue Jun 20 13:38:12 2000 Christopher Faylor <cgf@cygnus.com>
* Makefile.in: Change to build the DLL during a cross-compiler build.

5
winsup/cygwin/mkvers.sh
View File

@ -86,6 +86,7 @@ fn=`basename $incfile`
#
cvs_tag="`sed 's%^.\(.*\)%\1%' $dir/CVS/Tag 2>/dev/null`"
wv_cvs_tag="$cvs_tag"
[ -n "$cvs_tag" ] && cvs_tag=" CVS tag"'
'"$cvs_tag"
@ -164,8 +165,10 @@ cygverhigh=`expr $major / 1000`
cygverlow=`expr $major % 1000`
cygwin_ver="$cygverhigh.$cygverlow.$minor"
if [ -n "$cvs_tag" ]; then
cygwin_ver="$cygwin_ver ($cvs_tag)"
cvs_tag="`echo $wv_cvs_tag | sed -e 's/-branch.*//'`"
cygwin_ver="$cygwin_ver-$cvs_tag"
fi
echo "Version $cygwin_ver"
set -$- $builddate
$windres --include-dir $dir/../w32api/include --include-dir $dir/include --define CYGWIN_BUILD_DATE="$1" --define CYGWIN_BUILD_TIME="$2" --define CYGWIN_VERSION='"'"$cygwin_ver"'"' $rcfile winver.o