Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Corrections

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@17157 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2002-09-12 20:55:05 +00:00
parent c721300b59
commit 2c00930d43
3 changed files with 32 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
distrib/msw/tardist
View File

@@ -183,24 +183,24 @@ echo Re-tarring wxAll in a subdirectory...
cd $2
mkdir wxWindows-${WXVER}
cd wxWindows-${WXVER}
# Copy OS/2 specific configure files
cp $1/distrib/os2/os2-specific.zip docs/os2
$TAR xf ../wxAll-${WXVER}.tar
# Translate all .dsp and .dsw files to DOS format
unix2dos --unix2dos `cat $1/distrib/msw/vc.rsp`
# Copy OS/2 specific configure files
cp $1/distrib/os2/os2-specific.zip docs/os2
# Copy the OS/2 files which probably haven't been copied yet
mkdir include/wx/os2
mkdir src/os2
cp $1/include/wx/os2/*.H include/wx/os2
cp $1/src/os2/*.CPP src/os2
cp $1/src/os2/*.CPP $1/src/os2/*.I src/os2
# Make all OS/2 files lower case
$1/distrib/namedown include/wx/os2/*.H
$1/distrib/namedown src/os2/*.CPP
$1/distrib/namedown src/os2/*.CPP src/os2/*.I
$TAR xf ../wxAll-${WXVER}.tar
cd ..
rm -f wxAll-${WXVER}.tar
$TAR cf $2/wxAll-${WXVER}.tar wxWindows-${WXVER}/*

21
distrib/msw/tarwxall
View File

@@ -74,25 +74,34 @@ echo Re-tarring wxAll in a subdirectory...
cd $2
rm -f -r wxWindows-${WXVER}
mkdir wxWindows-${WXVER}
cd wxWindows-${WXVER}
# Copy OS/2 specific configure files
cp $1/distrib/os2/os2-specific.zip docs/os2
# If we have the full set of VC++ project files,
# get them
if [ -f $2/deliver/extra/wxWindows-${WXVER}-VC.zip ]; then
unzip -o $2/deliver/extra/wxWindows-${WXVER}-VC.zip
else
echo "Warning - did not find $2/deliver/extra/wxWindows-${WXVER}-VC.zip"
fi
cd wxWindows-${WXVER}
$TAR xf ../wxAll-${WXVER}.tar
# Translate all .dsp and .dsw files to DOS format
unix2dos --unix2dos `cat $1/distrib/msw/vc.rsp`
# Copy OS/2 specific configure files
cp $1/distrib/os2/os2-specific.zip docs/os2
# Copy the OS/2 files which probably haven't been copied yet
mkdir include/wx/os2
mkdir src/os2
cp $1/include/wx/os2/*.H include/wx/os2
cp $1/src/os2/*.CPP src/os2
cp $1/src/os2/*.CPP $1/src/os2/*.I src/os2
# Make all OS/2 files lower case
$1/distrib/namedown include/wx/os2/*.H
$1/distrib/namedown src/os2/*.CPP
$1/distrib/namedown src/os2/*.CPP src/os2/*.I
$TAR xf ../wxAll-${WXVER}.tar
cd ..
rm -f wxAll-${WXVER}.tar
$TAR cf $2/wxAll-${WXVER}.tar wxWindows-${WXVER}/*

20
distrib/msw/unix2dos.c
View File

@@ -37,7 +37,7 @@ main(int argc, char *argv[])
unix2Dos = 1;
i = 1;
if (i > argc)
if (argc > 1)
{
if (strcmp(argv[1], "--help") == 0)
{
@@ -70,23 +70,25 @@ main(int argc, char *argv[])
sprintf(tmpFile, "%s.tmp", argv[i]);
fp = fopen(argv[i], "r");
if (!fp)
{
fprintf(stderr, "Cannot open %s.\n", argv[i]);
i ++;
continue;
}
outFile = fopen(tmpFile, "w");
if (!outFile)
{
fprintf(stderr, "Cannot open %s.\n", tmpFile);
exit(1);
}
if (!fp)
{
fprintf(stderr, "Cannot open %s.\n", argv[i]);
exit(1);
}
translate(fp, outFile, unix2Dos);
if (warning) /* unix2dos acting on a possible DOS file */
{
fprintf(stderr,"%s: %s may have already been in DOS format.\n",
prog, argv[i]);
fprintf(stderr,"%s: %s may have already been in DOS format. Not converted.\n",
prog, argv[i]);
warning = 0;
}
fclose(fp);
fclose(outFile);
@@ -128,7 +130,7 @@ void translate(FILE *ifp, FILE *ofp, int unix2Dos)
while ((c = getc(ifp)) != EOF){
if (c == CR)
warning = 1; /* set warning flag: input file may be a DOS file */
if (c == LF)
if (c == LF && (warning == 0))
putc(CR, ofp); /* add CR before each LF */
putc(c, ofp);
}