Date:	Thu, 17 Oct 2002 19:19:00 +0100
From:	"Richard Dawe" <rich AT phekda DOT freeserve DOT co DOT uk>
Sender:	rich AT phekda DOT freeserve DOT co DOT uk
To:	djgpp-workers AT delorie DOT com
X-Mailer:	Emacs 21.3.50 (via feedmail 8.3.emacs20_6 I) and Blat ver 1.8.6
Subject:	Updates for distrib/ for 2.04 release [PATCH]
Message-Id:	<E182F4G-0000mx-00@phekda.freeserve.co.uk>
Reply-To:	djgpp-workers AT delorie DOT com

Hello.

Below is a patch that I propose to commit under distrib/.
There are several changes:

* build *204.zip rather than *203.zip;
* include DSMs in the ZIP files, if they exist;
* use echo instead of becho in batch files (what's becho?);
* don't include .cvsignore in the ZIP files.

OK to commit?

Thanks, bye, Rich =]

Index: mkdist.bat
===================================================================
RCS file: /cvs/djgpp/djgpp/distrib/mkdist.bat,v
retrieving revision 1.2
diff -p -u -3 -r1.2 mkdist.bat
--- mkdist.bat	3 Jun 1999 16:38:32 -0000	1.2
+++ mkdist.bat	17 Oct 2002 17:58:00 -0000
@@ -3,10 +3,10 @@
 cp ../readme.1st ../zips
 cp ../copying* ../zips
 
-call mkdist1 djdev203 Development Kit and Runtime
-call mkdist1 djlsr203 Base Library Sources
-call mkdist1 djtst203 Test Programs
-call mkdist1 djcrx203 For Cross-to-DOS Compiling (subset of djdev)
-call mkdist1 djtzn203 Extra Timezone Support Files
-call mkdist1 djtzs203 Timezone Sources and Utils
+call mkdist1 djdev204 Development Kit and Runtime
+call mkdist1 djlsr204 Base Library Sources
+call mkdist1 djtst204 Test Programs
+call mkdist1 djcrx204 For Cross-to-DOS Compiling (subset of djdev)
+call mkdist1 djtzn204 Extra Timezone Support Files
+call mkdist1 djtzs204 Timezone Sources and Utils
 
Index: mkdist1.bat
===================================================================
RCS file: /cvs/djgpp/djgpp/distrib/mkdist1.bat,v
retrieving revision 1.1
diff -p -u -3 -r1.1 mkdist1.bat
--- mkdist1.bat	20 Feb 1999 18:55:58 -0000	1.1
+++ mkdist1.bat	17 Oct 2002 17:58:01 -0000
@@ -1,15 +1,15 @@
 @echo off
 
-becho Making %1... 
+echo Making %1... 
 cd ..
 
 echo %1 %2 %3 %4 %5 %6 %7 %8 %9 > manifest\%1.ver
 
-becho find... 
+echo find... 
 find @distrib/p/%1/files -type f -print > manifest\%1.mft
 
 if not exist distrib\p\%1\skips goto noskip
-becho skip... 
+echo skip... 
 sed -f distrib/p/%1/skips manifest/%1.mft > manifest\%1.tmp
 mv manifest/%1.tmp manifest/%1.mft
 :noskip
@@ -17,18 +17,24 @@ mv manifest/%1.tmp manifest/%1.mft
 echo manifest/%1.mft>>manifest\%1.mft
 echo manifest/%1.ver>>manifest\%1.mft
 
+if not exist distrib\p\%1\%1.dsm goto nodsm
+echo dsm...
+cp distrib\p\%1\%1.dsm manifest/%1.dsm
+echo manifest/%1.dsm>>manifest\%1.mft
+:nodsm
+
 if not exist distrib\p\%1\nobins goto dobins
-becho nobins... 
+echo nobins... 
 cp manifest/%1.mft manifest/%1.tmp
 distrib\nobins @distrib/p/%1/nobins < manifest\%1.tmp > manifest\%1.tm2
 mv manifest/%1.tm2 manifest/%1.mft
 :dobins
 
-becho sort... 
+echo sort... 
 sort < manifest\%1.mft > manifest\%1.tmp
 cp manifest/%1.tmp manifest/%1.mft
 
-becho zip... 
+echo zip... 
 if exist zips\%1.zip del zips\%1.zip
 zip -qq -9 -@ zips/%1.zip < manifest\%1.tmp
 rm manifest/%1.tmp
Index: p/djcrx204/skips
===================================================================
RCS file: /cvs/djgpp/djgpp/distrib/p/djcrx204/skips,v
retrieving revision 1.1
diff -p -u -3 -r1.1 skips
--- p/djcrx204/skips	17 Oct 2002 11:08:56 -0000	1.1
+++ p/djcrx204/skips	17 Oct 2002 17:58:01 -0000
@@ -1,5 +1,6 @@
 /flexlexe.h/ d
 s/sys\/sysmacro.h/sys\/sysmacros.h/
 /\/[Cc][Vv][Ss]\// d
+/\/\.cvsignore/ d
 /\/_ansi/ d
 /\/_inline/ d
Index: p/djdev204/skips
===================================================================
RCS file: /cvs/djgpp/djgpp/distrib/p/djdev204/skips,v
retrieving revision 1.1
diff -p -u -3 -r1.1 skips
--- p/djdev204/skips	17 Oct 2002 11:08:56 -0000	1.1
+++ p/djdev204/skips	17 Oct 2002 17:58:01 -0000
@@ -2,5 +2,6 @@
 /flexlexe.h/ d
 s/sys\/sysmacro.h/sys\/sysmacros.h/
 /\/[Cc][Vv][Ss]\// d
+/\/\.cvsignore/ d
 /\/_ansi/ d
 /\/_inline/ d
Index: p/djlsr204/skips
===================================================================
RCS file: /cvs/djgpp/djgpp/distrib/p/djlsr204/skips,v
retrieving revision 1.1
diff -p -u -3 -r1.1 skips
--- p/djlsr204/skips	17 Oct 2002 11:08:56 -0000	1.1
+++ p/djlsr204/skips	17 Oct 2002 17:58:01 -0000
@@ -11,5 +11,6 @@
 /makefile.sub/ d
 /src\/libm\/.*\.def$/ d
 /\/[Cc][Vv][Ss]\// d
+/\/\.cvsignore/ d
 /src\/debug\/ar\.in/ d
 /src\/libc\/dpmi\/api\/_dpmi/ d
Index: p/djtst204/skips
===================================================================
RCS file: /cvs/djgpp/djgpp/distrib/p/djtst204/skips,v
retrieving revision 1.1
diff -p -u -3 -r1.1 skips
--- p/djtst204/skips	17 Oct 2002 11:08:56 -0000	1.1
+++ p/djtst204/skips	17 Oct 2002 17:58:01 -0000
@@ -1 +1,2 @@
 /\/[Cc][Vv][Ss]\// d
+/\/\.cvsignore/ d
Index: p/djtzn204/skips
===================================================================
RCS file: /cvs/djgpp/djgpp/distrib/p/djtzn204/skips,v
retrieving revision 1.1
diff -p -u -3 -r1.1 skips
--- p/djtzn204/skips	17 Oct 2002 11:08:56 -0000	1.1
+++ p/djtzn204/skips	17 Oct 2002 17:58:01 -0000
@@ -1,2 +1,3 @@
 /\/src/ d
 /\/[Cc][Vv][Ss]\// d
+/\/\.cvsignore/ d
Index: p/djtzs204/skips
===================================================================
RCS file: /cvs/djgpp/djgpp/distrib/p/djtzs204/skips,v
retrieving revision 1.1
diff -p -u -3 -r1.1 skips
--- p/djtzs204/skips	17 Oct 2002 11:08:56 -0000	1.1
+++ p/djtzs204/skips	17 Oct 2002 17:58:01 -0000
@@ -1 +1,2 @@
 /\/[Cc][Vv][Ss]\// d
+/\/\.cvsignore/ d

- Raw text -