Skip to content

Commit

Permalink
Remove AT&T UWIN support
Browse files Browse the repository at this point in the history
UWIN is a UNIX compatibility layer for Windows.  It was last released
in 2012 and has been superseded by Cygwin these days.
  • Loading branch information
ilmari committed Nov 2, 2021
1 parent 4457f3f commit 994b363
Show file tree
Hide file tree
Showing 15 changed files with 14 additions and 158 deletions.
1 change: 0 additions & 1 deletion MANIFEST
Original file line number Diff line number Diff line change
Expand Up @@ -4752,7 +4752,6 @@ hints/unicos.sh Hints for named architecture
hints/unicosmk.sh Hints for named architecture
hints/unisysdynix.sh Hints for named architecture
hints/utekv.sh Hints for named architecture
hints/uwin.sh Hints for named architecture
hints/vos.sh Hints for named architecture
hv.c Hash value code
hv.h Hash value header
Expand Down
1 change: 0 additions & 1 deletion Porting/checkURL.pl
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,6 @@ sub work {
http://www.leo.org
http://www.madgoat.com
http://www.mks.com/s390/gnu/
http://www.research.att.com/sw/tools/uwin/
http://www.tpj.com/
http://safaribooksonline.com/
http://use.perl.org/~autrijus/journal/25768
Expand Down
1 change: 0 additions & 1 deletion README.cygwin
Original file line number Diff line number Diff line change
Expand Up @@ -595,7 +595,6 @@ be kept as clean as possible.
regen_lib.pl - file permissions

plan9/mkfile
hints/uwin.sh
vms/descrip_mms.template
win32/Makefile

Expand Down
4 changes: 2 additions & 2 deletions ext/POSIX/POSIX.xs
Original file line number Diff line number Diff line change
Expand Up @@ -1348,11 +1348,11 @@ static NV_PAYLOAD_TYPE S_getpayload(NV nv)
#include <fcntl.h>

#ifdef HAS_TZNAME
# if !defined(WIN32) && !defined(__CYGWIN__) && !defined(__UWIN__)
# if !defined(WIN32) && !defined(__CYGWIN__)
extern char *tzname[];
# endif
#else
#if !defined(WIN32) && !defined(__UWIN__) || (defined(__MINGW32__) && !defined(tzname))
#if !defined(WIN32) || (defined(__MINGW32__) && !defined(tzname))
char *tzname[] = { "" , "" };
#endif
#endif
Expand Down
2 changes: 1 addition & 1 deletion ext/POSIX/lib/POSIX.pm
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use warnings;

our ($AUTOLOAD, %SIGRT);

our $VERSION = '2.01';
our $VERSION = '2.02';

require XSLoader;

Expand Down
3 changes: 1 addition & 2 deletions ext/POSIX/t/posix.t
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ $| = 1;
$Is_W32 = $^O eq 'MSWin32';
$Is_VMS = $^O eq 'VMS';
$Is_OS2 = $^O eq 'os2';
$Is_UWin = $^O eq 'uwin';
$Is_OS390 = $^O eq 'os390';

my $vms_unix_rpt = 0;
Expand Down Expand Up @@ -468,7 +467,7 @@ if ($^O eq 'vos') {
} else {
$| = 0;
# The following line assumes buffered output, which may be not true:
print '@#!*$@(!@#$' unless ($Is_OS2 || $Is_UWin || $Is_OS390 ||
print '@#!*$@(!@#$' unless ($Is_OS2 || $Is_OS390 ||
$Is_VMS ||
(defined $ENV{PERLIO} &&
$ENV{PERLIO} eq 'unix' &&
Expand Down
134 changes: 0 additions & 134 deletions hints/uwin.sh

This file was deleted.

2 changes: 1 addition & 1 deletion installman
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ sub pod2man {
next;
}

if ($^O eq 'os2' || $^O eq 'amigaos' || $^O eq 'uwin' || $^O eq 'cygwin') {
if ($^O eq 'os2' || $^O eq 'amigaos' || $^O eq 'cygwin') {
$manpage =~ s#::#.#g;
}
my $tmp = "${mandir}/${manpage}.tmp";
Expand Down
1 change: 0 additions & 1 deletion makedepend_file.SH
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ amigaos) cat=/bin/cat ;; # must be absolute
esac
case "$osname" in
uwin) uwinfix="-e s,\\\\\\\\,/,g -e s,\\([a-zA-Z]\\):/,/\\1/,g" ;;
os2) uwinfix="-e s,\\\\\\\\,/,g" ;;
cygwin) uwinfix="-e s,\\\\\\\\,/,g" ;;
posix-bc) uwinfix="-e s/\\*POSIX(\\(.*\\))/\\1/" ;;
Expand Down
5 changes: 5 additions & 0 deletions pod/perldelta.pod
Original file line number Diff line number Diff line change
Expand Up @@ -321,6 +321,11 @@ DJGPP is a port of the GNU toolchain to 32-bit x86 systems running
DOS. The last known attempt to build Perl on it was on 5.20, which
only got as far as building miniperl.

=item AT&T UWIN

UWIN is a UNIX compatibility layer for Windows. It was last released
in 2012 and has been superseded by Cygwin these days.

=back

=head2 Platform-Specific Notes
Expand Down
7 changes: 2 additions & 5 deletions pod/perlport.pod
Original file line number Diff line number Diff line change
Expand Up @@ -1036,11 +1036,6 @@ as L<perlcygwin>), L<https://www.cygwin.com/>

=item *

The U/WIN environment for Win32,
L<http://www.research.att.com/sw/tools/uwin/>

=item *

Build instructions for OS/2, L<perlos2>

=back
Expand Down Expand Up @@ -2362,6 +2357,8 @@ as of 5.36:

=item DOS/DJGPP

=item AT&T UWIN

=back

=head2 (Perl 5.20)
Expand Down
1 change: 0 additions & 1 deletion t/io/layers.t
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ BEGIN {
use Config;

my $DOSISH = $^O =~ /^(?:MSWin32|os2)$/ ? 1 : 0;
$DOSISH = 1 if !$DOSISH and $^O =~ /^uwin/;
my $NONSTDIO = exists $ENV{PERLIO} && $ENV{PERLIO} ne 'stdio' ? 1 : 0;
my $FASTSTDIO = $Config{d_faststdio} && $Config{usefaststdio} ? 1 : 0;
my $UTF8_STDIN;
Expand Down
3 changes: 1 addition & 2 deletions t/io/tell.t
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ plan(36);
$TST = 'TST';

$Is_Dosish = ($^O eq 'MSWin32' or
$^O eq 'os2' or $^O eq 'cygwin' or
$^O =~ /^uwin/);
$^O eq 'os2' or $^O eq 'cygwin');

open($TST, 'harness') || (die "Can't open harness");
binmode $TST if $Is_Dosish;
Expand Down
3 changes: 0 additions & 3 deletions t/loc_tools.pl
Original file line number Diff line number Diff line change
Expand Up @@ -388,9 +388,6 @@ ($;$)
return if (($^O eq 'MSWin32' && !$winxp)
&& $Config{cc} =~ /^(cl|gcc|g\+\+|ici)/i);

# UWIN seems to loop after taint tests, just skip for now
return if ($^O =~ /^uwin/);

my @Locale;
_trylocale("C", \@categories, \@Locale, $allow_incompatible);
_trylocale("POSIX", \@categories, \@Locale, $allow_incompatible);
Expand Down
4 changes: 1 addition & 3 deletions t/op/chdir.t
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,7 @@ use File::Spec::Functions qw(:DEFAULT splitdir rel2abs splitpath);
# Can't use Cwd::abs_path() because it has different ideas about
# path separators than File::Spec.
sub abs_path {
my $d = rel2abs(curdir);
$d = lc($d) if $^O =~ /^uwin/;
$d;
return rel2abs(curdir);
}

my $Cwd = abs_path;
Expand Down

0 comments on commit 994b363

Please sign in to comment.