diff options
author | Dagfinn Ilmari Mannsåker <ilmari@ilmari.org> | 2020-07-27 14:31:25 +0100 |
---|---|---|
committer | Dagfinn Ilmari Mannsåker <ilmari@ilmari.org> | 2021-11-02 18:01:42 +0000 |
commit | 994b363a4c1338d882ccf9350de80be451f0bb08 (patch) | |
tree | 00cc495e72d53d1479ab34874ea0ff56002395e8 | |
parent | 4457f3fc414965b3f281e91fc2e24332a7149345 (diff) | |
download | perl-994b363a4c1338d882ccf9350de80be451f0bb08.tar.gz |
Remove AT&T UWIN support
UWIN is a UNIX compatibility layer for Windows. It was last released
in 2012 and has been superseded by Cygwin these days.
-rw-r--r-- | MANIFEST | 1 | ||||
-rwxr-xr-x | Porting/checkURL.pl | 1 | ||||
-rw-r--r-- | README.cygwin | 1 | ||||
-rw-r--r-- | ext/POSIX/POSIX.xs | 4 | ||||
-rw-r--r-- | ext/POSIX/lib/POSIX.pm | 2 | ||||
-rw-r--r-- | ext/POSIX/t/posix.t | 3 | ||||
-rw-r--r-- | hints/uwin.sh | 134 | ||||
-rwxr-xr-x | installman | 2 | ||||
-rw-r--r-- | makedepend_file.SH | 1 | ||||
-rw-r--r-- | pod/perldelta.pod | 5 | ||||
-rw-r--r-- | pod/perlport.pod | 7 | ||||
-rw-r--r-- | t/io/layers.t | 1 | ||||
-rw-r--r-- | t/io/tell.t | 3 | ||||
-rw-r--r-- | t/loc_tools.pl | 3 | ||||
-rw-r--r-- | t/op/chdir.t | 4 |
15 files changed, 14 insertions, 158 deletions
@@ -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 diff --git a/Porting/checkURL.pl b/Porting/checkURL.pl index 2d92ff3c11..a9a031e618 100755 --- a/Porting/checkURL.pl +++ b/Porting/checkURL.pl @@ -242,7 +242,6 @@ http://www.pvhp.com/%7epvhp/ 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 diff --git a/README.cygwin b/README.cygwin index 0b737a58f2..ab9814a7d3 100644 --- a/README.cygwin +++ b/README.cygwin @@ -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 diff --git a/ext/POSIX/POSIX.xs b/ext/POSIX/POSIX.xs index 9d9d8a5be2..355c8b6462 100644 --- a/ext/POSIX/POSIX.xs +++ b/ext/POSIX/POSIX.xs @@ -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 diff --git a/ext/POSIX/lib/POSIX.pm b/ext/POSIX/lib/POSIX.pm index 844eb9b968..8b71721c6b 100644 --- a/ext/POSIX/lib/POSIX.pm +++ b/ext/POSIX/lib/POSIX.pm @@ -4,7 +4,7 @@ use warnings; our ($AUTOLOAD, %SIGRT); -our $VERSION = '2.01'; +our $VERSION = '2.02'; require XSLoader; diff --git a/ext/POSIX/t/posix.t b/ext/POSIX/t/posix.t index 4a0d1f34f7..f200a895bd 100644 --- a/ext/POSIX/t/posix.t +++ b/ext/POSIX/t/posix.t @@ -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; @@ -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' && diff --git a/hints/uwin.sh b/hints/uwin.sh deleted file mode 100644 index 0c70b529cb..0000000000 --- a/hints/uwin.sh +++ /dev/null @@ -1,134 +0,0 @@ -# -# The lines starting with #b that follow are the uwin.sh -# file from Joe Buehler. Some lines are, themselves, -# commented out. If an uncommented line disappears -# altogether, it means it didn't seem to be needed any more, -# to get a proper build on the following machine. -# UWIN-NT korn-7200 3.19-5.0 2195 i686 -# But maybe they'll be useful to others on different machines. - -#b # hint file for U/WIN (UNIX for Windows 95/NT) -#b # -#b # created for U/WIN version 1.55 -#b # running under Windows NT 4.0 SP 3 -#b # using MSVC++ 5.0 for the compiler -#b # -#b # created by Joe Buehler (jbuehler@hekimian.com) -#b # -#b # for information about U/WIN see www.gtlinc.com -#b # -#b -#b #ccflags=-D_BSDCOMPAT -#b # confusion in Configure over preprocessor -#b cppstdin=`pwd`/cppstdin -#b cpprun=`pwd`/cppstdin -#b # pwd.h confuses Configure -#b d_pwcomment=undef -#b d_pwgecos=define -#b # work around case-insensitive file names -#b firstmakefile=GNUmakefile -#b # avoid compilation error -#b i_utime=undef -#b # compile/link flags -#b ldflags=-g -#b optimize=-g -#b static_ext="B Data/Dumper Digest/MD5 Errno Fcntl Filter::Util::Call IO IPC/SysV MIME::Base64 Opcode PerlIO::scalar POSIX SDBM_File Socket Storable Unicode::Collate Unicode::Normalize attributes re" -#b #static_ext=none -#b # dynamic loading needs work -#b usedl=undef -#b # perl malloc will not work -#b usemymalloc=n -#b # cannot use nm -#b usenm=undef -#b # vfork() is buggy (as of 1.55 anyway) -#b usevfork=false - -# __UWIN__ added so it could be used in ext/POSIX/POSIX.xs -# to protect against either tzname definition. According to Dave Korn - -#dgk gcc on uwin also predefined _UWIN as does the digital mars compiler. -#dgk -#dgk Only ncc does not define _UWIN and this is intentional. ncc is used -#dgk to build binaries that do not require the uwin runtime. -#dgk This could be used for building a native win32 perl using unix -#dgk makefiles. However, in this case you don't wan't _UWIN defined. -#dgk -#dgk I have used _UWIN everywhere else in any uwin specific changes. -#dgk and _WIN32 on windows specific changes, and _MSVC on any compiler -#dgk Visual C specific changes. We also define _WINIX for any unix -#dgk on windows implementation so that _UWIN or __cygwin__ imply _WINIX. - -# I left __UWIN__ as is, since I had already filed a patch, -# and it might be useful to distinguish perl-specific tweaks -# from generic uwin ones. - -ccflags="$ccflags -D__UWIN__" - -# This from Dave Korn -#dgk Windows splits shared libraries into two parts; the part used -#dgk for linking and the part that is used for running. -#dgk Given a library foo, then the part you link with is named -#dgk foo.lib -#dgk and is in the lib directory. The part that you run with -#dgk is named -#dgk foo.dll or foo#.dll -#dgk and is in the bin directory. This way when you set you PATH -#dgk variable, it automatically does the library search. -#dgk -#dgk Static libraries use libfoo.a. -#dgk By the way if you specify -lfoo, then it will first look for foo.lib -#dgk and then libfoo.a. If you specify +lfoo, it will only look for -#dgk static versions of the library. - -# So we use .lib as the extension, and put -lm in, because it is a .a -# This probably accounts for the comment about dynamic libraries -# needing work, and indeed, the build failed if I didn't undef it. - -lib_ext=".lib" -libs="-lm" -so=dll -# dynamic loading still needs work -usedl=undef - -# confusion in Configure over preprocessor -cppstdin=`pwd`/cppstdin -cpprun=`pwd`/cppstdin - -# lest it default to .exe, and then there's no perl in the test directory, -# t, just a perl.exe, and make test promptly dies. _exe gets set to .exe -# by Configure (on 5/23/2003) if exe_ext is merely null, so clean it out, too. -exe_ext='' -_exe='' - -# work around case-insensitive file names -firstmakefile=GNUmakefile -# compile/link flags -ldflags=-g -optimize=-g - -# Original, with :: separators, cause make to choke. -# No longer seems to be necessary at all. -# static_ext="B Data/Dumper Digest/MD5 Errno Fcntl Filter/Util/Call IO IPC/SysV MIME/Base64 Opcode PerlIO/scalar POSIX SDBM_File Socket Storable Unicode/Collate Unicode/Normalize attributes re" - -# perl malloc will not work -usemymalloc=n -# cannot use nm -usenm=undef -# vfork() is buggy (as of 1.55 anyway) -usevfork=false - -# Some other comments: -# If you see something like - -# got: '/E/users/jpl/src/cmd/perl/t' -# expected: '/e/users/jpl/src/cmd/perl/t' -# Failed test (../dist/Cwd/t/cwd.t at line 88) - -# when running tests under harness, try the simple expedient of -# changing to directory -# /E/users/jpl/src/cmd/perl/t # note the leading capital /E -# before running the tests. UWIN is a bit schizophrenic about case. -# It likes to return an uppercase "disk" letter for the leading directory, -# but your home directory may well have that in lower case. -# In most cases, they are entirely interchangeable, but the perl tests -# don't ignore case. If they fail, change to the directory they expect. diff --git a/installman b/installman index 0154be4d68..686862d8c4 100755 --- a/installman +++ b/installman @@ -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"; diff --git a/makedepend_file.SH b/makedepend_file.SH index 51f5191fe9..b90f741ee1 100644 --- a/makedepend_file.SH +++ b/makedepend_file.SH @@ -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/" ;; diff --git a/pod/perldelta.pod b/pod/perldelta.pod index 0ff5544cd4..c2327b2ee5 100644 --- a/pod/perldelta.pod +++ b/pod/perldelta.pod @@ -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 diff --git a/pod/perlport.pod b/pod/perlport.pod index d8a5f5b7c2..5c75af99bd 100644 --- a/pod/perlport.pod +++ b/pod/perlport.pod @@ -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 @@ -2362,6 +2357,8 @@ as of 5.36: =item DOS/DJGPP +=item AT&T UWIN + =back =head2 (Perl 5.20) diff --git a/t/io/layers.t b/t/io/layers.t index 7938c39231..1c1ac4fd4c 100644 --- a/t/io/layers.t +++ b/t/io/layers.t @@ -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; diff --git a/t/io/tell.t b/t/io/tell.t index e93dc57b29..3e156636c4 100644 --- a/t/io/tell.t +++ b/t/io/tell.t @@ -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; diff --git a/t/loc_tools.pl b/t/loc_tools.pl index a9266ab374..46db3dce5f 100644 --- a/t/loc_tools.pl +++ b/t/loc_tools.pl @@ -388,9 +388,6 @@ sub find_locales ($;$) { 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); diff --git a/t/op/chdir.t b/t/op/chdir.t index b9df30d40a..44bc90f14d 100644 --- a/t/op/chdir.t +++ b/t/op/chdir.t @@ -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; |