diff --git a/Configure b/Configure index cef8c3c078b5..9c76d54fc9d9 100755 --- a/Configure +++ b/Configure @@ -1901,7 +1901,7 @@ fi touch posthint.sh : set package name -package='perl5' +package='perl7' first=`echo $package | sed -e 's/^\(.\).*/\1/'` last=`echo $package | sed -e 's/^.\(.*\)/\1/'` case "`echo AbyZ | tr '[:lower:]' '[:upper:]' 2>/dev/null`"-"`echo AbyZ | tr '[:upper:]' '[:lower:]' 2>/dev/null`" in @@ -2290,7 +2290,7 @@ You may safely delete it if you wish. EOF : See if we are using a devel version and want that -xversion=`awk '/define[ ]+PERL_VERSION/ {print $3}' $rsrc/patchlevel.h` +xversion=`awk '/define[ ]+PERL_VERSION_MINOR/ {print $3}' $rsrc/patchlevel.h` case "$usedevel" in $define|true|[yY]*) usedevel="$define" ;; @@ -4339,9 +4339,9 @@ esac' echo " " echo "Getting the current patchlevel..." >&4 if $test -r $rsrc/patchlevel.h;then - revision=`awk '/define[ ]+PERL_REVISION/ {print $3}' $rsrc/patchlevel.h` - patchlevel=`awk '/define[ ]+PERL_VERSION/ {print $3}' $rsrc/patchlevel.h` - subversion=`awk '/define[ ]+PERL_SUBVERSION/ {print $3}' $rsrc/patchlevel.h` + revision=`awk '/define[ ]+PERL_VERSION_MAJOR/ {print $3}' $rsrc/patchlevel.h` + patchlevel=`awk '/define[ ]+PERL_VERSION_MINOR/ {print $3}' $rsrc/patchlevel.h` + subversion=`awk '/define[ ]+PERL_VERSION_PATCH/ {print $3}' $rsrc/patchlevel.h` api_revision=`awk '/define[ ]+PERL_API_REVISION/ {print $3}' $rsrc/patchlevel.h` api_version=`awk '/define[ ]+PERL_API_VERSION/ {print $3}' $rsrc/patchlevel.h` api_subversion=`awk '/define[ ]+PERL_API_SUBVERSION/ {print $3}' $rsrc/patchlevel.h` @@ -9637,7 +9637,7 @@ case "$usecbacktrace" in : Check if faststdio is requested and available case "$usefaststdio" in $define|true|[yY]*|'') - xversion=`awk '/define[ ]+PERL_VERSION/ {print $3}' $rsrc/patchlevel.h` + xversion=`awk '/define[ ]+PERL_VERSION_MINOR/ {print $3}' $rsrc/patchlevel.h` case "$xversion" in [68]) dflt='y' ;; *) dflt='n' ;; diff --git a/Cross/config.sh-arm-linux b/Cross/config.sh-arm-linux index 8813d1d4b906..f4cbbba53701 100644 --- a/Cross/config.sh-arm-linux +++ b/Cross/config.sh-arm-linux @@ -31,12 +31,12 @@ afsroot='/afs' alignbytes='4' aphostname='/bin/hostname' api_revision='5' -api_subversion='1' -api_version='33' -api_versionstring='5.33.1' +api_subversion='0' +api_version='1' +api_versionstring='7.1.0' ar='ar' -archlib='/usr/lib/perl5/5.33.1/armv4l-linux' -archlibexp='/usr/lib/perl5/5.33.1/armv4l-linux' +archlib='/usr/lib/perl/7.1.0/armv4l-linux' +archlibexp='/usr/lib/perl/7.1.0/armv4l-linux' archname64='' archname='armv4l-linux' archobjs='' @@ -55,7 +55,7 @@ castflags='0' cat='cat' cc='cc' cccdlflags='-fpic' -ccdlflags='-rdynamic -Wl,-rpath,/usr/lib/perl5/5.33.1/armv4l-linux/CORE' +ccdlflags='-rdynamic -Wl,-rpath,/usr/lib/perl/7.1.0/armv4l-linux/CORE' ccflags='-fno-strict-aliasing -I/usr/local/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64' ccflags_uselargefiles='-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64' ccname='arm-linux-gcc' @@ -824,7 +824,7 @@ inc_version_list=' ' inc_version_list_init='0' incpath='' inews='' -installarchlib='./install_me_here/usr/lib/perl5/5.33.1/armv4l-linux' +installarchlib='./install_me_here/usr/lib/perl/7.1.0/armv4l-linux' installbin='./install_me_here/usr/bin' installhtml1dir='' installhtml3dir='' @@ -832,13 +832,13 @@ installman1dir='./install_me_here/usr/share/man/man1' installman3dir='./install_me_here/usr/share/man/man3' installprefix='./install_me_here/usr' installprefixexp='./install_me_here/usr' -installprivlib='./install_me_here/usr/lib/perl5/5.33.1' +installprivlib='./install_me_here/usr/lib/perl/7.1.0' installscript='./install_me_here/usr/bin' -installsitearch='./install_me_here/usr/lib/perl5/site_perl/5.33.1/armv4l-linux' +installsitearch='./install_me_here/usr/lib/perl/site_perl/7.1.0/armv4l-linux' installsitebin='./install_me_here/usr/bin' installsitehtml1dir='' installsitehtml3dir='' -installsitelib='./install_me_here/usr/lib/perl5/site_perl/5.33.1' +installsitelib='./install_me_here/usr/lib/perl/site_perl/7.1.0' installsiteman1dir='./install_me_here/usr/share/man/man1' installsiteman3dir='./install_me_here/usr/share/man/man3' installsitescript='./install_me_here/usr/bin' @@ -952,7 +952,7 @@ orderlib='false' osname='linux' osvers='2.4.6-rmk1-np2-embedix' otherlibdirs=' ' -package='perl5' +package='perl7' pager='/usr/bin/less' passcat='cat /etc/passwd' patchlevel='9' @@ -972,8 +972,8 @@ pmake='' pr='' prefix='/usr' prefixexp='/usr' -privlib='/usr/lib/perl5/5.33.1' -privlibexp='/usr/lib/perl5/5.33.1' +privlib='/usr/lib/perl/7.1.0' +privlibexp='/usr/lib/perl/7.1.0' procselfexe='"/proc/self/exe"' prototype='define' ptrsize='4' @@ -1038,17 +1038,17 @@ sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 sig_num_init='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 6, 17, 29, 31, 0' sig_size='68' signal_t='void' -sitearch='/usr/lib/perl5/site_perl/5.33.1/armv4l-linux' -sitearchexp='/usr/lib/perl5/site_perl/5.33.1/armv4l-linux' +sitearch='/usr/lib/perl/site_perl/7.1.0/armv4l-linux' +sitearchexp='/usr/lib/perl/site_perl/7.1.0/armv4l-linux' sitebin='/usr/bin' sitebinexp='/usr/bin' sitehtml1dir='' sitehtml1direxp='' sitehtml3dir='' sitehtml3direxp='' -sitelib='/usr/lib/perl5/site_perl/5.33.1' +sitelib='/usr/lib/perl/site_perl/7.1.0' sitelib_stem='/usr/lib/perl5/site_perl' -sitelibexp='/usr/lib/perl5/site_perl/5.33.1' +sitelibexp='/usr/lib/perl/site_perl/7.1.0' siteman1dir='/usr/share/man/man1' siteman1direxp='/usr/share/man/man1' siteman3dir='/usr/share/man/man3' @@ -1178,8 +1178,8 @@ vendorprefix='' vendorprefixexp='' vendorscript='' vendorscriptexp='' -version='5.33.1' -version_patchlevel_string='version 33 subversion 1' +version='7.1.0' +version_patchlevel_string='version 1 subversion 0' versiononly='undef' vi='' xlibpth='/usr/lib/386 /lib/386' @@ -1191,11 +1191,11 @@ zip='zip' config_arg0='Configure' config_args='' config_argc=0 -PERL_REVISION=5 -PERL_VERSION=33 -PERL_SUBVERSION=1 -PERL_API_REVISION=5 -PERL_API_VERSION=33 -PERL_API_SUBVERSION=1 +PERL_VERSION_MAJOR=7 +PERL_VERSION_MINOR=1 +PERL_VERSION_PATCH=0 +PERL_API_REVISION=7 +PERL_API_VERSION=1 +PERL_API_SUBVERSION=0 PERL_PATCHLEVEL= PERL_CONFIG_SH=true diff --git a/Cross/config.sh-arm-linux-n770 b/Cross/config.sh-arm-linux-n770 index 30c37cff7962..6ede5e259141 100644 --- a/Cross/config.sh-arm-linux-n770 +++ b/Cross/config.sh-arm-linux-n770 @@ -31,12 +31,12 @@ afsroot='/afs' alignbytes='4' aphostname='/bin/hostname' api_revision='5' -api_subversion='1' -api_version='33' -api_versionstring='5.33.1' +api_subversion='0' +api_version='1' +api_versionstring='7.1.0' ar='ar' -archlib='/usr/lib/perl5/5.33.1/armv4l-linux' -archlibexp='/usr/lib/perl5/5.33.1/armv4l-linux' +archlib='/usr/lib/perl/7.1.0/armv4l-linux' +archlibexp='/usr/lib/perl/7.1.0/armv4l-linux' archname64='' archname='armv4l-linux' archobjs='' @@ -54,7 +54,7 @@ castflags='0' cat='cat' cc='arm-none-linux-gnueabi-gcc' cccdlflags='-fpic' -ccdlflags='-rdynamic -Wl,-rpath,/usr/lib/perl5/5.33.1/armv4l-linux/CORE' +ccdlflags='-rdynamic -Wl,-rpath,/usr/lib/perl/7.1.0/armv4l-linux/CORE' ccflags='-fno-strict-aliasing -I/usr/local/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64' ccflags_uselargefiles='-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64' ccname='arm-linux-gcc' @@ -822,7 +822,7 @@ inc_version_list=' ' inc_version_list_init='0' incpath='' inews='' -installarchlib='./install_me_here/usr/lib/perl5/5.33.1/armv4l-linux' +installarchlib='./install_me_here/usr/lib/perl/7.1.0/armv4l-linux' installbin='./install_me_here/usr/bin' installhtml1dir='' installhtml3dir='' @@ -830,13 +830,13 @@ installman1dir='./install_me_here/usr/share/man/man1' installman3dir='./install_me_here/usr/share/man/man3' installprefix='./install_me_here/usr' installprefixexp='./install_me_here/usr' -installprivlib='./install_me_here/usr/lib/perl5/5.33.1' +installprivlib='./install_me_here/usr/lib/perl/7.1.0' installscript='./install_me_here/usr/bin' -installsitearch='./install_me_here/usr/lib/perl5/site_perl/5.33.1/armv4l-linux' +installsitearch='./install_me_here/usr/lib/perl/site_perl/7.1.0/armv4l-linux' installsitebin='./install_me_here/usr/bin' installsitehtml1dir='' installsitehtml3dir='' -installsitelib='./install_me_here/usr/lib/perl5/site_perl/5.33.1' +installsitelib='./install_me_here/usr/lib/perl/site_perl/7.1.0' installsiteman1dir='./install_me_here/usr/share/man/man1' installsiteman3dir='./install_me_here/usr/share/man/man3' installsitescript='./install_me_here/usr/bin' @@ -950,7 +950,7 @@ orderlib='false' osname='linux' osvers='2.6' otherlibdirs=' ' -package='perl5' +package='perl7' pager='/usr/bin/less' passcat='cat /etc/passwd' patchlevel='11' @@ -970,8 +970,8 @@ pmake='' pr='' prefix='/usr' prefixexp='/usr' -privlib='/usr/lib/perl5/5.33.1' -privlibexp='/usr/lib/perl5/5.33.1' +privlib='/usr/lib/perl/7.1.0' +privlibexp='/usr/lib/perl/7.1.0' procselfexe='"/proc/self/exe"' prototype='define' ptrsize='4' @@ -1036,17 +1036,17 @@ sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 sig_num_init='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 6, 17, 29, 31, 0' sig_size='68' signal_t='void' -sitearch='/usr/lib/perl5/site_perl/5.33.1/armv4l-linux' -sitearchexp='/usr/lib/perl5/site_perl/5.33.1/armv4l-linux' +sitearch='/usr/lib/perl/site_perl/7.1.0/armv4l-linux' +sitearchexp='/usr/lib/perl/site_perl/7.1.0/armv4l-linux' sitebin='/usr/bin' sitebinexp='/usr/bin' sitehtml1dir='' sitehtml1direxp='' sitehtml3dir='' sitehtml3direxp='' -sitelib='/usr/lib/perl5/site_perl/5.33.1' +sitelib='/usr/lib/perl/site_perl/7.1.0' sitelib_stem='/usr/lib/perl5/site_perl' -sitelibexp='/usr/lib/perl5/site_perl/5.33.1' +sitelibexp='/usr/lib/perl/site_perl/7.1.0' siteman1dir='/usr/share/man/man1' siteman1direxp='/usr/share/man/man1' siteman3dir='/usr/share/man/man3' @@ -1176,8 +1176,8 @@ vendorprefix='' vendorprefixexp='' vendorscript='' vendorscriptexp='' -version='5.33.1' -version_patchlevel_string='version 33 subversion 1' +version='7.1.0' +version_patchlevel_string='version 1 subversion 0' versiononly='undef' vi='' xlibpth='/usr/lib/386 /lib/386' @@ -1189,11 +1189,11 @@ zip='zip' config_arg0='Configure' config_args='' config_argc=0 -PERL_REVISION=5 -PERL_VERSION=33 -PERL_SUBVERSION=1 -PERL_API_REVISION=5 -PERL_API_VERSION=33 -PERL_API_SUBVERSION=1 +PERL_VERSION_MAJOR=7 +PERL_VERSION_MINOR=1 +PERL_VERSION_PATCH=0 +PERL_API_REVISION=7 +PERL_API_VERSION=1 +PERL_API_SUBVERSION=0 PERL_PATCHLEVEL= PERL_CONFIG_SH=true diff --git a/INSTALL b/INSTALL index 7acf874f70af..ac73ca0e21b6 100644 --- a/INSTALL +++ b/INSTALL @@ -615,7 +615,7 @@ The directories set up by Configure fall into three broad categories. =item Directories for the perl distribution -By default, Configure will use the following directories for 5.33.1. +By default, Configure will use the following directories for 7.1.0. $version is the full perl version number, including subversion, e.g. 5.12.3, and $archname is a string like sun4-sunos, determined by Configure. The full definitions of all Configure @@ -2438,7 +2438,7 @@ L =head1 Coexistence with earlier versions of perl 5 -Perl 5.33.1 is not binary compatible with earlier versions of Perl. +Perl 7.1.0 is not binary compatible with earlier versions of Perl. In other words, you will have to recompile your XS modules. In general, you can usually safely upgrade from one stable version of Perl @@ -2513,9 +2513,9 @@ won't interfere with another version. (The defaults guarantee this for libraries after 5.6.0, but not for executables. TODO?) One convenient way to do this is by using a separate prefix for each version, such as - sh Configure -Dprefix=/opt/perl5.33.1 + sh Configure -Dprefix=/opt/perl7.1.0 -and adding /opt/perl5.33.1/bin to the shell PATH variable. Such users +and adding /opt/perl7.1.0/bin to the shell PATH variable. Such users may also wish to add a symbolic link /usr/local/bin/perl so that scripts can still start with #!/usr/local/bin/perl. @@ -2530,11 +2530,11 @@ yet. =head2 Upgrading from 5.32.0 or earlier -B Perl modules having binary parts (meaning that a C compiler is used) will have to be recompiled to be -used with 5.33.1. If you find you do need to rebuild an extension with -5.33.1, you may safely do so without disturbing the older +used with 7.1.0. If you find you do need to rebuild an extension with +7.1.0, you may safely do so without disturbing the older installations. (See L<"Coexistence with earlier versions of perl 5"> above.) @@ -2567,15 +2567,15 @@ Firstly, the bare minimum to run this script print("$f\n"); } -in Linux with perl-5.33.1 is as follows (under $Config{prefix}): +in Linux with perl-7.1.0 is as follows (under $Config{prefix}): ./bin/perl - ./lib/perl5/5.33.1/strict.pm - ./lib/perl5/5.33.1/warnings.pm - ./lib/perl5/5.33.1/i686-linux/File/Glob.pm - ./lib/perl5/5.33.1/feature.pm - ./lib/perl5/5.33.1/XSLoader.pm - ./lib/perl5/5.33.1/i686-linux/auto/File/Glob/Glob.so + ./lib/perl/7.1.0/strict.pm + ./lib/perl/7.1.0/warnings.pm + ./lib/perl/7.1.0/i686-linux/File/Glob.pm + ./lib/perl/7.1.0/feature.pm + ./lib/perl/7.1.0/XSLoader.pm + ./lib/perl/7.1.0/i686-linux/auto/File/Glob/Glob.so Secondly, for perl-5.10.1, the Debian perl-base package contains 591 files, (of which 510 are for lib/unicore) totaling about 3.5MB in its diff --git a/META.json b/META.json index 5ebde5e3be58..5afd09ce10e9 100644 --- a/META.json +++ b/META.json @@ -130,6 +130,6 @@ "url" : "https://github.com/Perl/perl5" } }, - "version" : "5.033001", + "version" : "7.001000", "x_serialization_backend" : "JSON::PP version 4.05" } diff --git a/META.yml b/META.yml index 2587f06a8d24..b45e9d2a7342 100644 --- a/META.yml +++ b/META.yml @@ -117,5 +117,5 @@ resources: homepage: https://www.perl.org/ license: https://dev.perl.org/licenses/ repository: https://github.com/Perl/perl5 -version: '5.033001' +version: '7.001000' x_serialization_backend: 'CPAN::Meta::YAML version 0.018' diff --git a/Makefile.SH b/Makefile.SH index 236ef493c29c..fb3865589936 100755 --- a/Makefile.SH +++ b/Makefile.SH @@ -589,7 +589,7 @@ esac $spitshell >>$Makefile <<'!NO!SUBS!' -perltoc_pod_prereqs = extra.pods pod/perl5331delta.pod pod/perlapi.pod pod/perlintern.pod pod/perlmodlib.pod pod/perluniprops.pod +perltoc_pod_prereqs = extra.pods pod/perl710delta.pod pod/perlapi.pod pod/perlintern.pod pod/perlmodlib.pod pod/perluniprops.pod generated_pods = pod/perltoc.pod $(perltoc_pod_prereqs) generated_headers = uudmap.h bitcount.h mg_data.h @@ -1153,9 +1153,9 @@ pod/perlintern.pod: $(MINIPERL_EXE) autodoc.pl embed.fnc pod/perlmodlib.pod: $(MINIPERL_EXE) pod/perlmodlib.PL MANIFEST $(MINIPERL) pod/perlmodlib.PL -q -pod/perl5331delta.pod: pod/perldelta.pod - $(RMS) pod/perl5331delta.pod - $(LNS) perldelta.pod pod/perl5331delta.pod +pod/perl710delta.pod: pod/perldelta.pod + $(RMS) pod/perl710delta.pod + $(LNS) perldelta.pod pod/perl710delta.pod extra.pods: $(MINIPERL_EXE) -@test ! -f extra.pods || rm -f `cat extra.pods` diff --git a/NetWare/Makefile b/NetWare/Makefile index 07d31f0e12af..b083de0e4b83 100644 --- a/NetWare/Makefile +++ b/NetWare/Makefile @@ -86,7 +86,7 @@ NLM_VERSION = 3,20,0 # Here comes the CW tools - TO BE FILLED TO BUILD WITH CW - -MODULE_DESC = "Perl 5.33.1 for NetWare" +MODULE_DESC = "Perl 7.1.0 for NetWare" CCTYPE = CodeWarrior C_COMPILER = mwccnlm -c CPP_COMPILER = mwccnlm @@ -462,7 +462,7 @@ INST_NW_TOP2 = $(INST_NW_DRV)\perl # versioned installation can be obtained by setting INST_TOP above to a # path that includes an arbitrary version string. # -INST_VER = \5.33.1 +INST_VER = \7.1.0 # # Comment this out if you DON'T want your perl installation to have diff --git a/NetWare/Nwmain.c b/NetWare/Nwmain.c index 0b9728a8ac85..ebf99d31d3d0 100644 --- a/NetWare/Nwmain.c +++ b/NetWare/Nwmain.c @@ -1337,12 +1337,12 @@ void fnGetPerlScreenName(char *sPerlScreenName) char sPerlVersion[32 * sizeof(char)] = {'\0'}; char sPerlSubVersion[32 * sizeof(char)] = {'\0'}; - // The defines for PERL_REVISION, PERL_VERSION, PERL_SUBVERSION are available in + // The defines for PERL_VERSION_MAJOR, PERL_VERSION_MINOR, PERL_VERSION_PATCH are available in // patchlevel.h under root and gets included when perl.h is included. // The number 10 below indicates base 10. - itoa(PERL_REVISION, sPerlRevision, 10); - itoa(PERL_VERSION, sPerlVersion, 10); - itoa(PERL_SUBVERSION, sPerlSubVersion, 10); + itoa(PERL_VERSION_MAJOR, sPerlRevision, 10); + itoa(PERL_VERSION_MINOR, sPerlVersion, 10); + itoa(PERL_VERSION_PATCH, sPerlSubVersion, 10); // Concatenate substrings to get a string like Perl5.6.1 which is used as the screen name. sprintf(sPerlScreenName, "%s%s.%s.%s", PERL_COMMAND_NAME, diff --git a/NetWare/config.wc b/NetWare/config.wc index b0a02f560527..553f8ed40ac7 100644 --- a/NetWare/config.wc +++ b/NetWare/config.wc @@ -927,7 +927,7 @@ orderlib='false' osname='NetWare' osvers='5.x' otherlibdirs='' -package='perl5' +package='perl7' pager='more /e' passcat='' patchlevel='~PATCHLEVEL~' @@ -1136,14 +1136,14 @@ vi='' xlibpth='/usr/lib/386 /lib/386' zcat='' zip='zip' -PERL_REVISION='~PERL_REVISION~' -PERL_SUBVERSION='~PERL_SUBVERSION~' -PERL_VERSION='~PERL_VERSION~' +PERL_VERSION_MAJOR='~PERL_VERSION_MAJOR~' +PERL_VERSION_PATCH='~PERL_VERSION_PATCH~' +PERL_VERSION_MINOR='~PERL_VERSION_MINOR~' PERL_API_REVISION='~PERL_API_REVISION~' PERL_API_SUBVERSION='~PERL_API_SUBVERSION~' PERL_API_VERSION='~PERL_API_VERSION~' -PATCHLEVEL='~PERL_VERSION~' -SUBVERSION='~PERL_SUBVERSION~' +PATCHLEVEL='~PERL_VERSION_MINOR~' +SUBVERSION='~PERL_VERSION_PATCH~' PERL_CONFIG_SH='true' base_import='' nlm_version='' diff --git a/NetWare/config_H.wc b/NetWare/config_H.wc index dc55b95f2df6..cc8bb97963da 100644 --- a/NetWare/config_H.wc +++ b/NetWare/config_H.wc @@ -887,7 +887,7 @@ * This symbol contains the ~name expanded version of ARCHLIB, to be used * in programs that are not prepared to deal with ~ expansion at run-time. */ -#define ARCHLIB "c:\\perl\\5.33.1\\lib\\NetWare-x86-multi-thread" /**/ +#define ARCHLIB "c:\\perl\\7.1.0\\lib\\NetWare-x86-multi-thread" /**/ /*#define ARCHLIB_EXP "" /**/ /* ARCHNAME: @@ -918,8 +918,8 @@ * This symbol is the filename expanded version of the BIN symbol, for * programs that do not want to deal with that at run-time. */ -#define BIN "c:\\perl\\5.33.1\\bin\\NetWare-x86-multi-thread" /**/ -#define BIN_EXP "c:\\perl\\5.33.1\\bin\\NetWare-x86-multi-thread" /**/ +#define BIN "c:\\perl\\7.1.0\\bin\\NetWare-x86-multi-thread" /**/ +#define BIN_EXP "c:\\perl\\7.1.0\\bin\\NetWare-x86-multi-thread" /**/ /* BYTEORDER: * This symbol holds the hexadecimal constant defined in byteorder, @@ -2878,7 +2878,7 @@ * This symbol contains the ~name expanded version of SITEARCH, to be used * in programs that are not prepared to deal with ~ expansion at run-time. */ -#define SITEARCH "c:\\perl\\site\\5.33.1\\lib\\NetWare-x86-multi-thread" /**/ +#define SITEARCH "c:\\perl\\site\\7.1.0\\lib\\NetWare-x86-multi-thread" /**/ /*#define SITEARCH_EXP "" /**/ /* SITELIB: @@ -2901,7 +2901,7 @@ * removed. The elements in inc_version_list (inc_version_list.U) can * be tacked onto this variable to generate a list of directories to search. */ -#define SITELIB "c:\\perl\\site\\5.33.1\\lib" /**/ +#define SITELIB "c:\\perl\\site\\7.1.0\\lib" /**/ /*#define SITELIB_EXP "" /**/ #define SITELIB_STEM "" /**/ diff --git a/NetWare/config_sh.PL b/NetWare/config_sh.PL index d2daf0ecc16f..8150834fd032 100644 --- a/NetWare/config_sh.PL +++ b/NetWare/config_sh.PL @@ -54,7 +54,7 @@ if (-e $pl_h) { else { die "Can't find $pl_h: $!"; } -$opt{VERSION} = "$opt{PERL_REVISION}.$opt{PERL_VERSION}.$opt{PERL_SUBVERSION}"; +$opt{VERSION} = "$opt{PERL_VERSION_MAJOR}.$opt{PERL_VERSION_MINOR}.$opt{PERL_VERSION_PATCH}"; $opt{INST_VER} =~ s|~VERSION~|$opt{VERSION}|g; $opt{'cf_by'} = $ENV{USERNAME} unless $opt{'cf_by'}; diff --git a/Porting/Glossary b/Porting/Glossary index e11e4eed2347..65ea9648cbe6 100644 --- a/Porting/Glossary +++ b/Porting/Glossary @@ -4578,7 +4578,7 @@ patchlevel (patchlevel.U): The patchlevel level of this package. The value of patchlevel comes from the patchlevel.h file. In a version number such as 5.6.1, this is the "6". - In patchlevel.h, this is referred to as "PERL_VERSION". + In patchlevel.h, this is referred to as "PERL_VERSION_MINOR". path_sep (Unix.U): This is an old synonym for p_ in Head.U, the character @@ -4595,21 +4595,21 @@ perl5 (perl5.U): to determine inc_version_list. PERL_API_REVISION (patchlevel.h): - This number describes the earliest compatible PERL_REVISION of + This number describes the earliest compatible PERL_VERSION_MAJOR of Perl ("compatibility" here being defined as sufficient binary/API compatibility to run XS code built with the older version). Normally this does not change across maintenance releases. Please read the comment in patchlevel.h. PERL_API_SUBVERSION (patchlevel.h): - This number describes the earliest compatible PERL_SUBVERSION of + This number describes the earliest compatible PERL_VERSION_PATCH of Perl ("compatibility" here being defined as sufficient binary/API compatibility to run XS code built with the older version). Normally this does not change across maintenance releases. Please read the comment in patchlevel.h. PERL_API_VERSION (patchlevel.h): - This number describes the earliest compatible PERL_VERSION of + This number describes the earliest compatible PERL_VERSION_MINOR of Perl ("compatibility" here being defined as sufficient binary/API compatibility to run XS code built with the older version). Normally this does not change across maintenance releases. @@ -4632,7 +4632,7 @@ perl_patchlevel (patchlevel.U): the maintenance versus development dichotomy except by also being increasing. -PERL_REVISION (Oldsyms.U): +PERL_VERSION_MAJOR (Oldsyms.U): In a Perl version number such as 5.6.2, this is the 5. This value is manually set in patchlevel.h @@ -4646,13 +4646,13 @@ perl_static_inline (d_static_inline.U): static _inline (older MSVC) static (c89 compilers) -PERL_SUBVERSION (Oldsyms.U): +PERL_VERSION_PATCH (Oldsyms.U): In a Perl version number such as 5.6.2, this is the 2. Values greater than 50 represent potentially unstable development subversions. This value is manually set in patchlevel.h -PERL_VERSION (Oldsyms.U): +PERL_VERSION_MINOR (Oldsyms.U): In a Perl version number such as 5.6.2, this is the 6. This value is manually set in patchlevel.h @@ -4785,7 +4785,7 @@ readdir_r_proto (d_readdir_r.U): revision (patchlevel.U): The value of revision comes from the patchlevel.h file. In a version number such as 5.6.1, this is the "5". - In patchlevel.h, this is referred to as "PERL_REVISION". + In patchlevel.h, this is referred to as "PERL_VERSION_MAJOR". rm (Loc.U): This variable is used internally by Configure to determine the @@ -5329,7 +5329,7 @@ subversion (patchlevel.U): The subversion level of this package. The value of subversion comes from the patchlevel.h file. In a version number such as 5.6.1, this is the "1". - In patchlevel.h, this is referred to as "PERL_SUBVERSION". + In patchlevel.h, this is referred to as "PERL_VERSION_PATCH". This is unique to perl. sysman (sysman.U): diff --git a/Porting/bisect-runner.pl b/Porting/bisect-runner.pl index b6c75a9ad4f2..82c67b5f225d 100755 --- a/Porting/bisect-runner.pl +++ b/Porting/bisect-runner.pl @@ -1495,10 +1495,11 @@ sub match_and_exit { if defined $dev_c && $dev_C == $dev_c && $ino_C == $ino_c; } -# This changes to PERL_VERSION in 4d8076ea25903dcb in 1999 +# PERL_VERSION was introduced in 1999 for perl-5.6.0 via 4d8076ea25903dcb +# PERL_VERSION_MINOR was introduced in 2020 for perl-7.0.0 my $major = extract_from_file('patchlevel.h', - qr/^#define\s+(?:PERL_VERSION|PATCHLEVEL)\s+(\d+)\s/, + qr/^#define\s+(?:PERL_VERSION_MINOR|PERL_VERSION|PATCHLEVEL)\s+(\d+)\s/, 0); my $unfixable_db_file; diff --git a/Porting/bump-perl-version b/Porting/bump-perl-version index fcc5eb2ab712..0de430c6ad70 100644 --- a/Porting/bump-perl-version +++ b/Porting/bump-perl-version @@ -31,7 +31,7 @@ # all of the changes at once and then edit the results via git). # This utility 'knows' about certain files and formats, and so can spot -# 'hidden' version numbers, like PERL_SUBVERSION=9. +# 'hidden' version numbers, like PERL_VERSION_PATCH=9. # # A third variant makes use of this knowledge to check that all the things # it knows about are at the current version: @@ -63,7 +63,7 @@ usage: $0 -c -i -c check files and warn if any known string values (eg - PERL_SUBVERSION) don't match the specified version + PERL_VERSION_PATCH) don't match the specified version -s scan files and produce list of possible change lines to stdout @@ -91,9 +91,9 @@ else { } usage('only one of -c, -s, -u and -i') if keys %opts > 1; -my ($oldx, $oldy, $oldz) = $ARGV[0] =~ /^(\d+)\.(\d+)\.(\d+)$/ +my ($oldx, $oldy, $oldz) = $ARGV[0] =~ /^(\d+)\.(\d+)\.(\d+)$/a or usage("bad version: $ARGV[0]"); -my ($newx, $newy, $newz) = $ARGV[1] =~ /^(\d+)\.(\d+)\.(\d+)$/ +my ($newx, $newy, $newz) = $ARGV[1] =~ /^(\d+)\.(\d+)\.(\d+)$/a or usage("bad version: $ARGV[1]"); my $old_decimal = sprintf "%d.%03d%03d", $oldx, $oldy, $oldz; # 5.011001 @@ -142,12 +142,22 @@ my @maps = ( qr/config/, ], [ - qr{\b (PERL_(?:API_)?VERSION(?:=|\s+)'?) (\d+) ('?) (?!\.)}x, + qr{\b (PERL_API_VERSION(?:=|\s+)'?) (\d+) ('?) (?!\.)}x, sub { $2, "$1$newy$3"}, $oldy, ], [ - qr{\b (PERL_SUBVERSION(?:=|\s+)'?) (\d+) ('?) (?!\.)}x, + qr{\b (PERL_VERSION_MAJOR(?:=|\s+)'?) (\d+) ('?) (?!\.)}x, + sub { $2, "$1$newx$3"}, + $oldy, + ], + [ + qr{\b (PERL_VERSION_MINOR(?:=|\s+)'?) (\d+) ('?) (?!\.)}x, + sub { $2, "$1$newy$3"}, + $oldy, + ], + [ + qr{\b (PERL_VERSION_PATCH(?:=|\s+)'?) (\d+) ('?) (?!\.)}x, sub { $2, "$1$newz$3"}, ($oldy % 2) ? $oldz : 0, ], diff --git a/Porting/config.sh b/Porting/config.sh index 122a61982a12..6f2b4c64bfd0 100644 --- a/Porting/config.sh +++ b/Porting/config.sh @@ -43,13 +43,13 @@ afs='false' afsroot='/afs' alignbytes='8' aphostname='' -api_revision='5' -api_subversion='1' -api_version='33' -api_versionstring='5.33.1' +api_revision='7' +api_subversion='0' +api_version='1' +api_versionstring='7.1.0' ar='ar' -archlib='/opt/perl/lib/5.33.1/x86_64-linux' -archlibexp='/opt/perl/lib/5.33.1/x86_64-linux' +archlib='/opt/perl/lib/7.1.0/x86_64-linux' +archlibexp='/opt/perl/lib/7.1.0/x86_64-linux' archname64='' archname='x86_64-linux' archobjs='' @@ -848,7 +848,7 @@ incpath='' incpth='/usr/lib/gcc/x86_64-linux-gnu/4.9/include /usr/local/include /usr/lib/gcc/x86_64-linux-gnu/4.9/include-fixed /usr/include/x86_64-linux-gnu /usr/include' inews='' initialinstalllocation='/opt/perl/bin' -installarchlib='/opt/perl/lib/5.33.1/x86_64-linux' +installarchlib='/opt/perl/lib/7.1.0/x86_64-linux' installbin='/opt/perl/bin' installhtml1dir='' installhtml3dir='' @@ -856,13 +856,13 @@ installman1dir='/opt/perl/man/man1' installman3dir='/opt/perl/man/man3' installprefix='/opt/perl' installprefixexp='/opt/perl' -installprivlib='/opt/perl/lib/5.33.1' +installprivlib='/opt/perl/lib/7.1.0' installscript='/opt/perl/bin' -installsitearch='/opt/perl/lib/site_perl/5.33.1/x86_64-linux' +installsitearch='/opt/perl/lib/site_perl/7.1.0/x86_64-linux' installsitebin='/opt/perl/bin' installsitehtml1dir='' installsitehtml3dir='' -installsitelib='/opt/perl/lib/site_perl/5.33.1' +installsitelib='/opt/perl/lib/site_perl/7.1.0' installsiteman1dir='/opt/perl/man/man1' installsiteman3dir='/opt/perl/man/man3' installsitescript='/opt/perl/bin' @@ -976,7 +976,7 @@ orderlib='false' osname='linux' osvers='3.16.0-4-amd64' otherlibdirs=' ' -package='perl5' +package='perl7' pager='/usr/bin/less -R' passcat='cat /etc/passwd' patchlevel='27' @@ -987,7 +987,7 @@ perl_patchlevel='' perl_static_inline='static __inline__' perladmin='yourname@yourhost.yourplace.com' perllibs='-lpthread -lnsl -ldl -lm -lcrypt -lutil -lc' -perlpath='/opt/perl/bin/perl5.33.1' +perlpath='/opt/perl/bin/perl7.1.0' pg='pg' phostname='' pidtype='pid_t' @@ -996,8 +996,8 @@ pmake='' pr='' prefix='/opt/perl' prefixexp='/opt/perl' -privlib='/opt/perl/lib/5.33.1' -privlibexp='/opt/perl/lib/5.33.1' +privlib='/opt/perl/lib/7.1.0' +privlibexp='/opt/perl/lib/7.1.0' procselfexe='"/proc/self/exe"' ptrsize='8' quadkind='2' @@ -1062,17 +1062,17 @@ sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 sig_num_init='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 6, 17, 29, 31, 0' sig_size='69' signal_t='void' -sitearch='/opt/perl/lib/site_perl/5.33.1/x86_64-linux' -sitearchexp='/opt/perl/lib/site_perl/5.33.1/x86_64-linux' +sitearch='/opt/perl/lib/site_perl/7.1.0/x86_64-linux' +sitearchexp='/opt/perl/lib/site_perl/7.1.0/x86_64-linux' sitebin='/opt/perl/bin' sitebinexp='/opt/perl/bin' sitehtml1dir='' sitehtml1direxp='' sitehtml3dir='' sitehtml3direxp='' -sitelib='/opt/perl/lib/site_perl/5.33.1' +sitelib='/opt/perl/lib/site_perl/7.1.0' sitelib_stem='/opt/perl/lib/site_perl' -sitelibexp='/opt/perl/lib/site_perl/5.33.1' +sitelibexp='/opt/perl/lib/site_perl/7.1.0' siteman1dir='/opt/perl/man/man1' siteman1direxp='/opt/perl/man/man1' siteman3dir='/opt/perl/man/man3' @@ -1098,7 +1098,7 @@ src='.' ssizetype='ssize_t' st_ino_sign='1' st_ino_size='8' -startperl='#!/opt/perl/bin/perl5.33.1' +startperl='#!/opt/perl/bin/perl7.1.0' startsh='#!/bin/sh' static_ext=' ' stdchar='char' @@ -1208,8 +1208,8 @@ vendorprefix='' vendorprefixexp='' vendorscript='' vendorscriptexp='' -version='5.33.1' -version_patchlevel_string='version 33 subversion 1' +version='7.1.0' +version_patchlevel_string='version 1 subversion 0' versiononly='define' vi='' xlibpth='/usr/lib/386 /lib/386' @@ -1217,12 +1217,12 @@ yacc='yacc' yaccflags='' zcat='' zip='zip' -PERL_REVISION=5 -PERL_VERSION=33 -PERL_SUBVERSION=1 -PERL_API_REVISION=5 -PERL_API_VERSION=33 -PERL_API_SUBVERSION=1 +PERL_VERSION_MAJOR=7 +PERL_VERSION_MINOR=1 +PERL_VERSION_PATCH=0 +PERL_API_REVISION=7 +PERL_API_VERSION=1 +PERL_API_SUBVERSION=0 PERL_PATCHLEVEL='' PERL_CONFIG_SH=true : Variables propagated from previous config.sh file. diff --git a/Porting/config_H b/Porting/config_H index 708add2bb708..131780a74982 100644 --- a/Porting/config_H +++ b/Porting/config_H @@ -1239,8 +1239,8 @@ * This symbol contains the ~name expanded version of ARCHLIB, to be used * in programs that are not prepared to deal with ~ expansion at run-time. */ -#define ARCHLIB "/opt/perl/lib/5.33.1/x86_64-linux" /**/ -#define ARCHLIB_EXP "/opt/perl/lib/5.33.1/x86_64-linux" /**/ +#define ARCHLIB "/opt/perl/lib/7.1.0/x86_64-linux" /**/ +#define ARCHLIB_EXP "/opt/perl/lib/7.1.0/x86_64-linux" /**/ /* BIN: * This symbol holds the path of the bin directory where the package will @@ -1293,8 +1293,8 @@ * This symbol contains the ~name expanded version of PRIVLIB, to be used * in programs that are not prepared to deal with ~ expansion at run-time. */ -#define PRIVLIB "/opt/perl/lib/5.33.1" /**/ -#define PRIVLIB_EXP "/opt/perl/lib/5.33.1" /**/ +#define PRIVLIB "/opt/perl/lib/7.1.0" /**/ +#define PRIVLIB_EXP "/opt/perl/lib/7.1.0" /**/ /* SITEARCH: * This symbol contains the name of the private library for this package. @@ -1311,8 +1311,8 @@ * This symbol contains the ~name expanded version of SITEARCH, to be used * in programs that are not prepared to deal with ~ expansion at run-time. */ -#define SITEARCH "/opt/perl/lib/site_perl/5.33.1/x86_64-linux" /**/ -#define SITEARCH_EXP "/opt/perl/lib/site_perl/5.33.1/x86_64-linux" /**/ +#define SITEARCH "/opt/perl/lib/site_perl/7.1.0/x86_64-linux" /**/ +#define SITEARCH_EXP "/opt/perl/lib/site_perl/7.1.0/x86_64-linux" /**/ /* SITELIB: * This symbol contains the name of the private library for this package. @@ -1334,8 +1334,8 @@ * removed. The elements in inc_version_list (inc_version_list.U) can * be tacked onto this variable to generate a list of directories to search. */ -#define SITELIB "/opt/perl/lib/site_perl/5.33.1" /**/ -#define SITELIB_EXP "/opt/perl/lib/site_perl/5.33.1" /**/ +#define SITELIB "/opt/perl/lib/site_perl/7.1.0" /**/ +#define SITELIB_EXP "/opt/perl/lib/site_perl/7.1.0" /**/ #define SITELIB_STEM "/opt/perl/lib/site_perl" /**/ /* PERL_VENDORARCH: @@ -4109,7 +4109,7 @@ * script to make sure (one hopes) that it runs with perl and not * some shell. */ -#define STARTPERL "#!/opt/perl/bin/perl5.33.1" /**/ +#define STARTPERL "#!/opt/perl/bin/perl7.1.0" /**/ /* HAS_STDIO_STREAM_ARRAY: * This symbol, if defined, tells that there is an array diff --git a/Porting/makemeta b/Porting/makemeta index 760377e060ef..e204ea8b3332 100644 --- a/Porting/makemeta +++ b/Porting/makemeta @@ -131,9 +131,9 @@ sub _determine_status { } } unless ( $status ) { - $status = $defines{PERL_VERSION} % 2 ? 'unstable' : 'stable'; + $status = $defines{PERL_VERSION_MINOR} % 2 ? 'unstable' : 'stable'; } - if ( my @wotsits = grep { defined $defines{$_} } qw(PERL_REVISION PERL_VERSION PERL_SUBVERSION) ) { + if ( my @wotsits = grep { defined $defines{$_} } qw(PERL_VERSION_MAJOR PERL_VERSION_MINOR PERL_VERSION_PATCH) ) { $version = sprintf '%d.%03d%03d', map { $defines{$_} } @wotsits; } else { diff --git a/Porting/makerel b/Porting/makerel index b08a28733a65..ef7e39f2d9be 100755 --- a/Porting/makerel +++ b/Porting/makerel @@ -53,9 +53,9 @@ my @patchlevel_h = ; close PATCHLEVEL; my $patchlevel_h = join "", grep { /^#\s*define/ } @patchlevel_h; print $patchlevel_h; -$revision = $1 if $patchlevel_h =~ /PERL_REVISION\s+(\d+)/; -$patchlevel = $1 if $patchlevel_h =~ /PERL_VERSION\s+(\d+)/; -$subversion = $1 if $patchlevel_h =~ /PERL_SUBVERSION\s+(\d+)/; +$revision = $1 if $patchlevel_h =~ /PERL_VERSION_MAJOR\s+(\d+)/; +$patchlevel = $1 if $patchlevel_h =~ /PERL_VERSION_MINOR\s+(\d+)/; +$subversion = $1 if $patchlevel_h =~ /PERL_VERSION_PATCH\s+(\d+)/; die "Unable to parse patchlevel.h" unless $subversion >= 0; $vers = sprintf("%d.%d.%d", $revision, $patchlevel, $subversion); diff --git a/Porting/perldelta_template.pod b/Porting/perldelta_template.pod index dd4f6ec41d69..ed536a4f55c6 100644 --- a/Porting/perldelta_template.pod +++ b/Porting/perldelta_template.pod @@ -403,7 +403,7 @@ died, add a short obituary here. XXX Generate this with: - perl Porting/acknowledgements.pl v5.33.1..HEAD + perl Porting/acknowledgements.pl v7.1.0..HEAD =head1 Reporting Bugs diff --git a/Porting/pod_lib.pl b/Porting/pod_lib.pl index 097d96f2627b..13fa7731e52b 100644 --- a/Porting/pod_lib.pl +++ b/Porting/pod_lib.pl @@ -15,7 +15,7 @@ =head1 SYNOPSIS =head1 DESCRIPTION -This program, when Cd into other programs in the Perl 5 core +This program, when Cd into other programs in the Perl core distribution, provides functions useful during building and, secondarily, testing. diff --git a/Porting/release_schedule.pod b/Porting/release_schedule.pod index b4990942caa4..4f7467b2a939 100644 --- a/Porting/release_schedule.pod +++ b/Porting/release_schedule.pod @@ -11,10 +11,21 @@ release schedules for the next, current and previous stable versions of Perl. Dates with two or more question marks will only be releases if deemed necessary by the Pumpking. +=head2 Perl 7.0 & Perl 7.1 + + 2020-??-?? 7.1.0 + 2020-??-?? 7.0.0 + =head2 Perl 5.32 - 2020-06-20 5.32.0 ✓ Sawyer X - 2020-??-?? 5.32.1 +Code freezes (which happen in the 5.31.X series) + + 2020-01-20 5.31.8 ✓ Contentious changes freeze + 2020-02-20 5.31.9 ✓ User-visible changes to correctly + functioning programs freeze + 2020-03-20 5.31.10 ✓ Full code freeze + 2020-04-28 5.31.11 ✓ Full code freeze (clearing BBCs) + 2020-05-20 5.32.0 ✓ Stable release! (Hopefully) =head2 Perl 5.30 diff --git a/Porting/todo.pod b/Porting/todo.pod index 9a7ce0a49051..9f71bbf71830 100644 --- a/Porting/todo.pod +++ b/Porting/todo.pod @@ -486,7 +486,7 @@ Natively 64-bit systems need neither -Duse64bitint nor -Duse64bitall. On these systems, it might be the default compilation mode, and there is currently no guarantee that passing no use64bitall option to the Configure process will build a 32bit perl. Implementing -Duse32bit* -options would be nice for perl 5.33.1. +options would be nice for perl 7.1.0. =head2 Profile Perl - am I hot or not? @@ -1189,7 +1189,7 @@ L =head1 Big projects Tasks that will get your name mentioned in the description of the "Highlights -of 5.33.1" +of 7.1.0" =head2 make ithreads more robust diff --git a/README.haiku b/README.haiku index dd1db176943d..533cce039cd6 100644 --- a/README.haiku +++ b/README.haiku @@ -22,9 +22,9 @@ The build procedure is completely standard: Make perl executable and create a symlink for libperl: chmod a+x /boot/common/bin/perl - cd /boot/common/lib; ln -s perl5/5.33.1/BePC-haiku/CORE/libperl.so . + cd /boot/common/lib; ln -s perl/7.1.0/BePC-haiku/CORE/libperl.so . -Replace C<5.33.1> with your respective version of Perl. +Replace C<7.1.0> with your respective version of Perl. =head1 KNOWN PROBLEMS diff --git a/README.macosx b/README.macosx index 7a4e4f2d84e5..bf9bb5b11a9f 100644 --- a/README.macosx +++ b/README.macosx @@ -10,9 +10,9 @@ perlmacosx - Perl under Mac OS X This document briefly describes Perl under Mac OS X. - curl -O https://www.cpan.org/src/perl-5.33.1.tar.gz - tar -xzf perl-5.33.1.tar.gz - cd perl-5.33.1 + curl -O https://www.cpan.org/src/perl-7.1.0.tar.gz + tar -xzf perl-7.1.0.tar.gz + cd perl-7.1.0 ./Configure -des -Dprefix=/usr/local/ make make test @@ -20,7 +20,7 @@ This document briefly describes Perl under Mac OS X. =head1 DESCRIPTION -The latest Perl release (5.33.1 as of this writing) builds without changes +The latest Perl release (7.1.0 as of this writing) builds without changes under all versions of Mac OS X from 10.3 "Panther" onwards. In order to build your own version of Perl you will need 'make', diff --git a/README.os2 b/README.os2 index 142395725df4..125678a00e25 100644 --- a/README.os2 +++ b/README.os2 @@ -619,7 +619,7 @@ C in F, see L">. =item Additional Perl modules - unzip perl_ste.zip -d f:/perllib/lib/site_perl/5.33.1/ + unzip perl_ste.zip -d f:/perllib/lib/site_perl/7.1.0/ Same remark as above applies. Additionally, if this directory is not one of directories on @INC (and @INC is influenced by C), you diff --git a/README.os390 b/README.os390 index 73ec3f8103fb..d6bcb450dc5b 100644 --- a/README.os390 +++ b/README.os390 @@ -452,7 +452,9 @@ Updated 12 March 2001 to mention //'SYS1.TCPPARMS(TCPDATA)'. Updated 28 November 2001 for broken URLs. -Updated 03 October 2019 for perl-5.33.1+ +Updated 03 October 2019 for perl-5.31.5+ + +Updated 28 July 2020 for perl-7.0.0+ =cut diff --git a/README.vms b/README.vms index b51a75698dd0..099628f6d48b 100644 --- a/README.vms +++ b/README.vms @@ -142,11 +142,11 @@ You may need to set up a foreign symbol for the unpacking utility of choice. Once you have done so, use a command like the following to unpack the archive: - vmstar -xvf perl-5^.33^.1.tar + vmstar -xvf perl-7^.1^.0.tar Then set default to the top-level source directory like so: - set default [.perl-5^.33^.1] + set default [.perl-7^.1^.0] and proceed with configuration as described in the next section. diff --git a/README.win32 b/README.win32 index 128d517d6cbf..e9868a14662a 100644 --- a/README.win32 +++ b/README.win32 @@ -399,7 +399,7 @@ Be sure to read the instructions near the top of the makefiles carefully. Type "dmake" ("gmake" for GNU make, or "nmake" if you are using that make). This should build everything. Specifically, it will create perl.exe, -perl533.dll at the perl toplevel, and various other extension dll's +perl71.dll at the perl toplevel, and various other extension dll's under the lib\auto directory. If the build fails for any reason, make sure you have done the previous steps correctly. diff --git a/configpm b/configpm index 8c4bd14ffcfd..26965cf17ff4 100755 --- a/configpm +++ b/configpm @@ -225,6 +225,20 @@ i_time='define' prototype='define' EOT +# Don't lie about PATCHLEVEL and SUBVERSION in %Config +my ($vstring) = ( $^V =~ m{^v(.+)$} ); +my ($ver_major, $ver_minor, $ver_patch) = split m/\./, $vstring; + +my @hardcoded = qw{ PATCHLEVEL SUBVERSION PERL_REVISION PERL_VERSION PERL_SUBVERSION }; + +# grand-grand father variables +push @v_others, "PATCHLEVEL='$ver_minor'\n"; +push @v_others, "SUBVERSION='$ver_patch'\n"; + +# grand father variables +push @v_others, "PERL_REVISION='$ver_major'\n"; +push @v_others, "PERL_VERSION='$ver_minor'\n"; +push @v_others, "PERL_SUBVERSION='$ver_patch'\n"; my %seen_quotes; { @@ -233,22 +247,14 @@ my %seen_quotes; while () { next if m:^#!/bin/sh:; - # Catch PERL_CONFIG_SH=true and PERL_VERSION=n line from Configure. + # Catch PERL_CONFIG_SH=true and PERL_VERSION_MINOR=n line from Configure. s/^(\w+)=(true|\d+)\s*$/$1='$2'\n/ or m/^(\w+)='(.*)'$/; my($k, $v) = ($1, $2); - # grandfather PATCHLEVEL and SUBVERSION and CONFIG - if ($k) { - if ($k eq 'PERL_VERSION') { - push @v_others, "PATCHLEVEL='$v'\n"; - } - elsif ($k eq 'PERL_SUBVERSION') { - push @v_others, "SUBVERSION='$v'\n"; - } - elsif ($k eq 'PERL_CONFIG_SH') { + # grandfather CONFIG + if (defined $k && $k eq 'PERL_CONFIG_SH') { push @v_others, "CONFIG='$v'\n"; } - } # We can delimit things in config.sh with either ' or ". unless ($in_v or m/^(\w+)=(['"])(.*\n)/){ @@ -272,6 +278,9 @@ my %seen_quotes; $val =~ s/$quote\n?\z//; + # Don't lie about PERL_VERSION variables in %Config + next if defined $k && grep { $_ eq $k } @hardcoded; + my $line = "$name=$quote$val$quote\n"; push(@v_others, $line); $seen_quotes{$quote}++; diff --git a/configure.com b/configure.com index 713e875d336a..bddbd03fa413 100644 --- a/configure.com +++ b/configure.com @@ -404,7 +404,7 @@ $! Unfortunately Configure.COM in DCL is not yet set up to do this - $! maybe someday $! $!: set package name -$ package = "perl5" +$ package = "perl7" $ packageup = F$EDIT((package - "5"),"UPCASE") $! $!: Eunice requires " " instead of "", can you believe it @@ -735,7 +735,7 @@ $ IF F$TYPE(usedevel) .EQS. "" THEN usedevel = "undef" $ patchlevel_h = F$SEARCH("[-]patchlevel.h") $ IF (patchlevel_h.NES."") $ THEN -$ SEARCH 'patchlevel_h' "define","PERL_VERSION","epoch"/match=and/out=[]ver.out +$ SEARCH 'patchlevel_h' "define","PERL_VERSION_MINOR","epoch"/match=and/out=[]ver.out $ IF .NOT. usedevel .AND. usedevel .NES. "define" $ THEN $ OPEN/READ CONFIG []ver.out @@ -812,7 +812,7 @@ $ TYPE SYS$INPUT: $ DECK This installation shell script will examine your system and ask you questions -to determine how the perl5 package should be installed. If you get +to determine how the perl7 package should be installed. If you get stuck on a question, you may use a ^C or ^Y shell escape to STOP this process, edit something, then restart this process as you just did. Many of the questions will have default answers in square @@ -1207,13 +1207,13 @@ $ got_perl_patchlevel= "false" $ OPEN/READONLY CONFIG 'patchlevel_h' $Patchlevel_h_loop: $ READ/END_Of_File=Close_patch/ERROR=Close_patch CONFIG line -$ IF ((F$LOCATE("#define PERL_VERSION",line).NE.F$LENGTH(line)).AND.(.NOT.got_patch)) +$ IF ((F$LOCATE("#define PERL_VERSION_MINOR",line).NE.F$LENGTH(line)).AND.(.NOT.got_patch)) $ THEN $ line = F$EDIT(line,"COMPRESS, TRIM") $ patchlevel = F$ELEMENT(2," ",line) $ got_patch = "true" $ ENDIF -$ IF ((F$LOCATE("#define PERL_SUBVERSION",line).NE.F$LENGTH(line)).AND.(.NOT.got_sub)) +$ IF ((F$LOCATE("#define PERL_VERSION_PATCH",line).NE.F$LENGTH(line)).AND.(.NOT.got_sub)) $ THEN $ line = F$EDIT(line,"COMPRESS, TRIM") $ subversion = F$ELEMENT(2," ",line) @@ -2467,14 +2467,14 @@ $! $!: set the prefixit variable, to compute a suitable default value $! $!: determine where private library files go -$!: Usual default is /usr/local/lib/perl5. Also allow things like -$!: /opt/perl/lib, since /opt/perl/lib/perl5 would be redundant. +$!: Usual default is /usr/local/lib/perl7. Also allow things like +$!: /opt/perl/lib, since /opt/perl/lib/perl7 would be redundant. $ IF .NOT.silent $ THEN $ TYPE SYS$INPUT: $ DECK -There are some auxiliary files for perl5 that need to be put into a +There are some auxiliary files for perl7 that need to be put into a private library directory that is accessible by everyone. $ EOD $ ENDIF @@ -6026,11 +6026,11 @@ $ WC "# Target system : " + myuname $ WC "" $ WC "Makefile_SH='" + Makefile_SH + "'" $ WC "Mcc='" + Mcc + "'" -$ WC "PERL_REVISION='" + revision + "'" -$ WC "PERL_VERSION='" + patchlevel + "'" -$ WC "PERL_SUBVERSION='" + subversion + "'" +$ WC "PERL_VERSION_MAJOR='" + revision + "'" +$ WC "PERL_VERSION_MINOR='" + patchlevel + "'" +$ WC "PERL_VERSION_PATCH='" + subversion + "'" $ WC "PERL_API_REVISION='" + api_revision + "'" -$ WC "PERL_API_VERSION='" + api_version + "'" +$ WC "PERL_API_VERSION='" + api_version + "'" $ WC "PERL_API_SUBVERSION='" + api_subversion + "'" $ WC "PERL_PATCHLEVEL='" + perl_patchlevel + "'" $ WC "perl_patchlevel='" + perl_patchlevel + "'" diff --git a/dist/Module-CoreList/Changes b/dist/Module-CoreList/Changes index b7e548ab10db..ca8cbbf59483 100644 --- a/dist/Module-CoreList/Changes +++ b/dist/Module-CoreList/Changes @@ -1,5 +1,5 @@ -5.20200820 - - Updated for v5.33.1 +7.20200820 + - Updated for v7.0.0 5.20200717 - Updated for v5.33.0 diff --git a/dist/Module-CoreList/lib/Module/CoreList.pm b/dist/Module-CoreList/lib/Module/CoreList.pm index d5b78462c402..645f07c02b24 100644 --- a/dist/Module-CoreList/lib/Module/CoreList.pm +++ b/dist/Module-CoreList/lib/Module/CoreList.pm @@ -4,7 +4,7 @@ use strict; our ( %released, %version, %families, %upstream, %bug_tracker, %deprecated, %delta ); use version; -our $VERSION = '5.20200820'; +our $VERSION = '7.20200820'; sub PKG_PATTERN () { q#\A[a-zA-Z_][0-9a-zA-Z_]*(?:(::|')[0-9a-zA-Z_]+)*\z# } sub _looks_like_invocant ($) { local $@; !!eval { $_[0]->isa(__PACKAGE__) } } @@ -367,7 +367,7 @@ sub changes_between { 5.030003 => '2020-06-01', 5.032000 => '2020-06-20', 5.033000 => '2020-07-17', - 5.033001 => '2020-08-20', + 7.001000 => '2020-08-20', ); for my $version ( sort { $a <=> $b } keys %released ) { @@ -17529,13 +17529,13 @@ for my $version ( sort { $a <=> $b } keys %released ) { removed => { } }, - 5.033001 => { + 7.001000 => { delta_from => 5.033000, changed => { - 'B::Op_private' => '5.033001', - 'Config' => '5.033001', - 'Module::CoreList' => '5.20200820', - 'Module::CoreList::Utils'=> '5.20200820', + 'B::Op_private' => '7.001000', + 'Config' => '7.001000', + 'Module::CoreList' => '7.20200820', + 'Module::CoreList::Utils'=> '7.20200820', }, removed => { } @@ -18668,7 +18668,7 @@ sub is_core removed => { } }, - 5.033001 => { + 7.001000 => { delta_from => 5.033, changed => { }, diff --git a/dist/Module-CoreList/lib/Module/CoreList/Utils.pm b/dist/Module-CoreList/lib/Module/CoreList/Utils.pm index 61fa17a94e19..8002426d167f 100644 --- a/dist/Module-CoreList/lib/Module/CoreList/Utils.pm +++ b/dist/Module-CoreList/lib/Module/CoreList/Utils.pm @@ -4,7 +4,7 @@ use strict; use warnings; use Module::CoreList; -our $VERSION = '5.20200820'; +our $VERSION = '7.20200820'; our %utilities; sub utilities { @@ -1629,7 +1629,7 @@ my %delta = ( removed => { } }, - 5.033001 => { + 7.001000 => { delta_from => 5.033000, changed => { }, diff --git a/dosish.h b/dosish.h index 5b2716046d74..5b6a52693df1 100644 --- a/dosish.h +++ b/dosish.h @@ -29,9 +29,9 @@ # ifndef PERL_CORE # define PERL_FS_VER_FMT "%d_%d_%d" # endif -# define PERL_FS_VERSION STRINGIFY(PERL_REVISION) "_" \ - STRINGIFY(PERL_VERSION) "_" \ - STRINGIFY(PERL_SUBVERSION) +# define PERL_FS_VERSION STRINGIFY(PERL_VERSION_MAJOR) "_" \ + STRINGIFY(PERL_VERSION_MINOR) "_" \ + STRINGIFY(PERL_VERSION_PATCH) #elif defined(WIN32) # define PERL_SYS_INIT_BODY(c,v) \ MALLOC_CHECK_TAINT2(*c,*v) Perl_win32_init(c,v); PERLIO_INIT diff --git a/ext/Hash-Util/lib/Hash/Util.pm b/ext/Hash-Util/lib/Hash/Util.pm index a778db033f80..9f019f8557ab 100644 --- a/ext/Hash-Util/lib/Hash/Util.pm +++ b/ext/Hash-Util/lib/Hash/Util.pm @@ -39,6 +39,7 @@ our @EXPORT_OK = qw( used_buckets num_buckets ); +our $VERSION; BEGIN { # make sure all our XS routines are available early so their prototypes # are correctly applied in the following code. diff --git a/ext/Pod-Html/testdir/perlvar-copy.pod b/ext/Pod-Html/testdir/perlvar-copy.pod index efb00a012dcf..f49178dd16af 100644 --- a/ext/Pod-Html/testdir/perlvar-copy.pod +++ b/ext/Pod-Html/testdir/perlvar-copy.pod @@ -1331,10 +1331,10 @@ startup. This information is used by perl when it's in adjust-utf8ness-to-locale mode (as when run with the C<-CL> command-line switch); see L for more info on this. -=item $PERL_VERSION +=item $PERL_VERSION_MINOR =item $^V -X<$^V> X<$PERL_VERSION> +X<$^V> X<$PERL_VERSION_MINOR> The revision, version, and subversion of the Perl interpreter, represented as a C object. diff --git a/handy.h b/handy.h index ff818ccf7998..8112b418f5de 100644 --- a/handy.h +++ b/handy.h @@ -429,24 +429,6 @@ Perl_xxx(aTHX_ ...) form for any API calls where it's used. #define get_cvs(str, flags) \ Perl_get_cvn_flags(aTHX_ STR_WITH_LEN(str), (flags)) -/* internal helpers */ -/* Transitional */ -#ifndef PERL_VERSION_MAJOR -# define PERL_VERSION_MAJOR PERL_REVISION -#else -# undef PERL_REVISION /* We don't want code to be using these */ -#endif -#ifndef PERL_VERSION_MINOR -# define PERL_VERSION_MINOR PERL_VERSION -#else -# undef PERL_VERSION -#endif -#ifndef PERL_VERSION_PATCH -# define PERL_VERSION_PATCH PERL_SUBVERSION -#else -# undef PERL_SUBVERSION -#endif - #define PERL_JNP_TO_DECIMAL_(maJor,miNor,Patch) \ /* '10*' leaves room for things like alpha, beta, releases */ \ (10 * ((maJor) * 1000000) + ((miNor) * 1000) + (Patch)) diff --git a/hints/README.hints b/hints/README.hints index e8ff5eee44bf..398125fa6f82 100644 --- a/hints/README.hints +++ b/hints/README.hints @@ -6,7 +6,7 @@ README.hints - hint files used by Configure These files are used by Configure to set things which Configure either can't or doesn't guess properly. Most of these hint files have been -tested with at least some version of perl5, but some are still left +tested with at least some version of Perl, but some are still left over from perl4. Please report any problems or suggested changes at diff --git a/hints/atheos.sh b/hints/atheos.sh index c3acdbb910f6..8d75cf93fe8d 100644 --- a/hints/atheos.sh +++ b/hints/atheos.sh @@ -1,7 +1,7 @@ # AtheOS hints file ( http://www.atheos.cx/ ) # Kurt Skauen, kurt@atheos.cx -prefix="/usr/perl5" +prefix="/usr/perl" libpth='/system/libs /usr/lib' usrinc='/include' diff --git a/hints/bsdos.sh b/hints/bsdos.sh index a1ba113f7a18..4ae92e2583c5 100644 --- a/hints/bsdos.sh +++ b/hints/bsdos.sh @@ -52,15 +52,15 @@ case "$bsdos_distribution" in d_dosuid='define' d_portable='undef' prefix='/usr/contrib' - perlpath='/usr/bin/perl5' - startperl='#!/usr/bin/perl5' + perlpath='/usr/bin/perl' + startperl='#!/usr/bin/perl' scriptdir='/usr/contrib/bin' - privlib='/usr/libdata/perl5' + privlib='/usr/libdata/perl' man1dir='/usr/contrib/man/man1' man3dir='/usr/contrib/man/man3' # phlib added by BSDI -- we share the *.ph include dir with perl4 - phlib="/usr/libdata/perl5/site_perl/$(arch)-$osname/include" - phlibexp="/usr/libdata/perl5/site_perl/$(arch)-$osname/include" + phlib="/usr/libdata/perl/site_perl/$(arch)-$osname/include" + phlibexp="/usr/libdata/perl/site_perl/$(arch)-$osname/include" ;; esac diff --git a/hints/catamount.sh b/hints/catamount.sh index e7660e4f674b..509a9f9751c7 100644 --- a/hints/catamount.sh +++ b/hints/catamount.sh @@ -31,11 +31,11 @@ # mkdir -p /opt/perl-catamount # mkdir -p /opt/perl-catamount/include # mkdir -p /opt/perl-catamount/lib -# mkdir -p /opt/perl-catamount/lib/perl5/5.33.1 +# mkdir -p /opt/perl-catamount/lib/perl/7.1.0 # mkdir -p /opt/perl-catamount/bin # cp *.h /opt/perl-catamount/include # cp libperl.a /opt/perl-catamount/lib -# cp -pr lib/* /opt/perl-catamount/lib/perl5/5.33.1 +# cp -pr lib/* /opt/perl-catamount/lib/perl/7.1.0 # cp miniperl perl run.sh cc.sh /opt/perl-catamount/lib # # With the headers and the libperl.a you can embed Perl to your Catamount diff --git a/hints/darwin.sh b/hints/darwin.sh index fdfbdd4a3b94..c38e08d64223 100644 --- a/hints/darwin.sh +++ b/hints/darwin.sh @@ -8,9 +8,9 @@ ## # Configure hasn't figured out the version number yet. Bummer. -perl_revision=`awk '/define[ ]+PERL_REVISION/ {print $3}' $src/patchlevel.h` -perl_version=`awk '/define[ ]+PERL_VERSION/ {print $3}' $src/patchlevel.h` -perl_subversion=`awk '/define[ ]+PERL_SUBVERSION/ {print $3}' $src/patchlevel.h` +perl_revision=`awk '/define[ ]+PERL_VERSION_MAJOR/ {print $3}' $src/patchlevel.h` +perl_version=`awk '/define[ ]+PERL_VERSION_MINOR/ {print $3}' $src/patchlevel.h` +perl_subversion=`awk '/define[ ]+PERL_VERSION_PATCH/ {print $3}' $src/patchlevel.h` version="${perl_revision}.${perl_version}.${perl_subversion}" # Pretend that Darwin doesn't know about those system calls in Tiger diff --git a/hints/dos_djgpp.sh b/hints/dos_djgpp.sh index 8f5fa3378291..9551a3b9eba5 100644 --- a/hints/dos_djgpp.sh +++ b/hints/dos_djgpp.sh @@ -57,7 +57,7 @@ usemymalloc='n' timetype='time_t' prefix=$DJDIR -privlib=$prefix/lib/perl5 +privlib=$prefix/lib/perl archlib=$privlib sitelib=$privlib/site sitearch=$sitelib diff --git a/hints/freebsd.sh b/hints/freebsd.sh index 72db521ef75e..27a5b61bf99e 100644 --- a/hints/freebsd.sh +++ b/hints/freebsd.sh @@ -185,8 +185,8 @@ case "$osvers" in # the equivalent in the main Configure so we copy a little # from Configure XXX Configure should be fixed. if $test -r $src/patchlevel.h;then - patchlevel=`awk '/define[ ]+PERL_VERSION/ {print $3}' $src/patchlevel.h` - subversion=`awk '/define[ ]+PERL_SUBVERSION/ {print $3}' $src/patchlevel.h` + patchlevel=`awk '/define[ ]+PERL_VERSION_MINOR/ {print $3}' $src/patchlevel.h` + subversion=`awk '/define[ ]+PERL_VERSION_PATCH/ {print $3}' $src/patchlevel.h` else patchlevel=0 subversion=0 diff --git a/hints/hpux.sh b/hints/hpux.sh index da5f81dfe127..a9cb34b725fe 100644 --- a/hints/hpux.sh +++ b/hints/hpux.sh @@ -68,7 +68,7 @@ shift cppflags="-Aa -D__STDC_EXT__ $cc_cppflags" case "$prefix" in - "") prefix='/opt/perl5' ;; + "") prefix='/opt/perl' ;; esac gnu_as=no diff --git a/installman b/installman index 0154be4d68cb..f354a8418e4e 100755 --- a/installman +++ b/installman @@ -22,8 +22,8 @@ $ENV{SHELL} = 'sh' if $^O eq 'os2'; my $patchlevel = substr($],3,2); die "Patchlevel of perl ($patchlevel)", - "and patchlevel of config.sh ($Config{'PERL_VERSION'}) don't match\n" - if $patchlevel != $Config{'PERL_VERSION'}; + "and patchlevel of config.sh ($Config{'PERL_VERSION_MINOR'}) don't match\n" + if $patchlevel != $Config{'PERL_VERSION_MINOR'}; my $usage = "Usage: installman --man1dir=/usr/wherever --man1ext=1 diff --git a/installperl b/installperl index 6cd65a092386..dd4e37b6aacd 100755 --- a/installperl +++ b/installperl @@ -189,8 +189,8 @@ my $ver = $Config{version}; my $release = substr($],0,3); # Not used currently. my $patchlevel = substr($],3,2); die "Patchlevel of perl ($patchlevel)", - "and patchlevel of config.sh ($Config{'PERL_VERSION'}) don't match\n" - if $patchlevel != $Config{'PERL_VERSION'}; + "and patchlevel of config.sh ($Config{'PERL_VERSION_MINOR'}) don't match\n" + if $patchlevel != $Config{'PERL_VERSION_MINOR'}; # Fetch some frequently-used items from %Config my $installbin = "$opts{destdir}$Config{installbin}"; @@ -267,7 +267,7 @@ if (($Is_W32 and ! $Is_NetWare) or $Is_Cygwin) { if ($Is_Cygwin) { $perldll = $libperl; } else { - $perldll = 'perl5'.$Config{patchlevel}.'.'.$so; + $perldll = 'perl7'.$Config{patchlevel}.'.'.$so; } if ($dlsrc ne "dl_none.xs") { @@ -729,7 +729,7 @@ sub installlib { # Also preserve modification times for .a libraries. # On some systems, if you do # ranlib libperl.a -# cp libperl.a /usr/local/lib/perl5/archlib/CORE/libperl.a +# cp libperl.a /usr/local/lib/perl/archlib/CORE/libperl.a # and then try to link against the installed libperl.a, you might # get an error message to the effect that the symbol table is older # than the library. diff --git a/lib/B/Op_private.pm b/lib/B/Op_private.pm index 5b49783d5fa9..99229e31e378 100644 --- a/lib/B/Op_private.pm +++ b/lib/B/Op_private.pm @@ -118,7 +118,7 @@ package B::Op_private; our %bits; -our $VERSION = "5.033001"; +our $VERSION = "7.001000"; $bits{$_}{3} = 'OPpENTERSUB_AMPER' for qw(entersub rv2cv); $bits{$_}{6} = 'OPpENTERSUB_DB' for qw(entersub rv2cv); diff --git a/lib/Config.t b/lib/Config.t index abd93169ff88..e0d44d9bc4fe 100644 --- a/lib/Config.t +++ b/lib/Config.t @@ -28,7 +28,7 @@ ok(exists($Config{$first_each}), "First key exists"); ok(!exists($Config{"\n$first"}), "Check that first key with prepended newline isn't falsely existing"); -is($Config{PERL_REVISION}, 5, "PERL_REVISION is 5"); +is($Config{PERL_VERSION_MAJOR}, 7, "PERL_VERSION_MAJOR is 7"); # Check that old config variable names are aliased to their new ones. my %grandfathers = ( PERL_VERSION => 'PATCHLEVEL', @@ -37,7 +37,7 @@ my %grandfathers = ( PERL_VERSION => 'PATCHLEVEL', ); while( my($new, $old) = each %grandfathers ) { isnt($Config{$new}, undef, "$new is defined"); - is($Config{$new}, $Config{$old}, "$new is aliased to $old"); + is($Config{$new}, $Config{$old}, "$new=$Config{$new} is aliased to $old=$Config{$old}"); } ok( exists $Config{cc}, "has cc"); diff --git a/lib/feature.pm b/lib/feature.pm index b5ee2eca9be8..dd8c405e8406 100644 --- a/lib/feature.pm +++ b/lib/feature.pm @@ -5,7 +5,7 @@ package feature; -our $VERSION = '1.60'; +our $VERSION = '1.61'; our %feature = ( fc => 'feature_fc', @@ -53,9 +53,10 @@ $feature_bundle{"5.29"} = $feature_bundle{"5.27"}; $feature_bundle{"5.30"} = $feature_bundle{"5.27"}; $feature_bundle{"5.31"} = $feature_bundle{"5.27"}; $feature_bundle{"5.32"} = $feature_bundle{"5.27"}; -$feature_bundle{"5.33"} = $feature_bundle{"5.27"}; -$feature_bundle{"5.34"} = $feature_bundle{"5.27"}; $feature_bundle{"5.9.5"} = $feature_bundle{"5.10"}; +$feature_bundle{"7.0"} = $feature_bundle{"5.27"}; +$feature_bundle{"7.1"} = $feature_bundle{"5.27"}; +$feature_bundle{"7.2"} = $feature_bundle{"5.27"}; my %noops = ( postderef => 1, lexical_subs => 1, @@ -426,7 +427,11 @@ The following feature bundles are available: postderef_qq say state switch unicode_eval unicode_strings - :5.34 bitwise current_sub evalbytes fc indirect + :7.0 bitwise current_sub evalbytes fc indirect + postderef_qq say state switch unicode_eval + unicode_strings + + :7.2 bitwise current_sub evalbytes fc indirect postderef_qq say state switch unicode_eval unicode_strings diff --git a/os2/Makefile.SHs b/os2/Makefile.SHs index db23b1c9754d..28199785b357 100644 --- a/os2/Makefile.SHs +++ b/os2/Makefile.SHs @@ -6,7 +6,7 @@ # Additional rules supported: perl_, aout_test, aout_install, use them # for a.out style perl (which may fork). -perl_fullversion="${PERL_REVISION}.00${PERL_VERSION}_${PERL_SUBVERSION}" +perl_fullversion="${PERL_VERSION_MAJOR}.00${PERL_VERSION_MINOR}_${PERL_VERSION_PATCH}" case "$archname" in *-thread*) perl_fullversion="${perl_fullversion}-threaded";; esac diff --git a/os2/os2.c b/os2/os2.c index 68f14ff16926..da8d826cf334 100644 --- a/os2/os2.c +++ b/os2/os2.c @@ -2050,7 +2050,7 @@ mod2fname(pTHX_ SV *sv) different DLL, even if a DLL with the same basename is loaded already. Thus there is no need to include the version into the mangling scheme. */ #if 0 - sum += PERL_VERSION * 200 + PERL_SUBVERSION * 2; /* Up to 5.6.1 */ + sum += PERL_VERSION_MINOR * 200 + PERL_VERSION_PATCH * 2; /* Up to 5.6.1 */ #else # ifndef COMPATIBLE_VERSION_SUM /* Binary compatibility with the 5.00553 binary */ # define COMPATIBLE_VERSION_SUM (5 * 200 + 53 * 2) @@ -2411,14 +2411,14 @@ perllib_mangle(char *s, unsigned int l) if (perllib_mangle_installed && (name = perllib_mangle_installed(s,l))) return name; if (!newp && !notfound) { - newp = PerlEnv_getenv(name = "PERLLIB_" STRINGIFY(PERL_REVISION) - STRINGIFY(PERL_VERSION) STRINGIFY(PERL_SUBVERSION) + newp = PerlEnv_getenv(name = "PERLLIB_" STRINGIFY(PERL_VERSION_MAJOR) + STRINGIFY(PERL_VERSION_MINOR) STRINGIFY(PERL_VERSION_PATCH) "_PREFIX"); if (!newp) - newp = PerlEnv_getenv(name = "PERLLIB_" STRINGIFY(PERL_REVISION) - STRINGIFY(PERL_VERSION) "_PREFIX"); + newp = PerlEnv_getenv(name = "PERLLIB_" STRINGIFY(PERL_VERSION_MAJOR) + STRINGIFY(PERL_VERSION_MINOR) "_PREFIX"); if (!newp) - newp = PerlEnv_getenv(name = "PERLLIB_" STRINGIFY(PERL_REVISION) "_PREFIX"); + newp = PerlEnv_getenv(name = "PERLLIB_" STRINGIFY(PERL_VERSION_MAJOR) "_PREFIX"); if (!newp) newp = PerlEnv_getenv(name = "PERLLIB_PREFIX"); if (newp) { diff --git a/patchlevel.h b/patchlevel.h index 598a928fe38f..91f81f1baafb 100644 --- a/patchlevel.h +++ b/patchlevel.h @@ -39,9 +39,31 @@ Instead use one of the version comparison macros. See C>. /* do not adjust the whitespace! Configure expects the numbers to be * exactly on the third column */ -#define PERL_REVISION 5 /* age */ -#define PERL_VERSION 33 /* epoch */ -#define PERL_SUBVERSION 1 /* generation */ +/* Perl semantic versioning + you should avoid using these variables directly + and prefer using the compare functions. + - PERL_VERSION_EQ + - PERL_VERSION_NE + - PERL_VERSION_LT + - PERL_VERSION_GT + - PERL_VERSION_LE + - PERL_VERSION_GE +*/ +#define PERL_VERSION_MAJOR 7 +#define PERL_VERSION_MINOR 1 +#define PERL_VERSION_PATCH 0 +#define PERL_VERSION_RELEASE 0 /* for future usage */ +#define PERL_VERSION_BUILD 0 /* for future usage */ + +/* Legacy Perl5 VERSION macro hardcoded to 5.255.255 + You should never change these values + This fixes two XS Perl5 modules issues: + - modules using an old version of ppport.h + - incomplete version checks when only using PERL_VERSION for example +*/ +#define PERL_REVISION 5 +#define PERL_VERSION 255 +#define PERL_SUBVERSION 255 /* The following numbers describe the earliest compatible version of Perl ("compatibility" here being defined as sufficient binary/API @@ -60,9 +82,9 @@ Instead use one of the version comparison macros. See C>. to be released for blead releases, and to 5.X.0 for maint releases. Manually changing them should not be necessary. */ -#define PERL_API_REVISION 5 -#define PERL_API_VERSION 33 -#define PERL_API_SUBVERSION 1 +#define PERL_API_REVISION 7 +#define PERL_API_VERSION 1 +#define PERL_API_SUBVERSION 0 /* XXX Note: The selection of non-default Configure options, such as -Duselonglong may invalidate these settings. Currently, Configure diff --git a/perl.c b/perl.c index 9f0f23030168..240ec534260d 100644 --- a/perl.c +++ b/perl.c @@ -3791,9 +3791,9 @@ S_minus_v(pTHX) #endif /* #ifdef PERL_PATCHNUM */ PIO_stdout = PerlIO_stdout(); PerlIO_printf(PIO_stdout, - "\nThis is perl " STRINGIFY(PERL_REVISION) - ", version " STRINGIFY(PERL_VERSION) - ", subversion " STRINGIFY(PERL_SUBVERSION) + "\nThis is perl " STRINGIFY(PERL_VERSION_MAJOR) + ", version " STRINGIFY(PERL_VERSION_MINOR) + ", subversion " STRINGIFY(PERL_VERSION_PATCH) " (%" SVf ") built for " ARCHNAME, SVfARG(level) ); SvREFCNT_dec_NN(level); diff --git a/perl.h b/perl.h index 219fa5e35c23..f6e249e3efe6 100644 --- a/perl.h +++ b/perl.h @@ -4580,9 +4580,17 @@ EXTERN_C char **environ; /* environment variables supplied via exec */ #include "patchlevel.h" #undef PERL_PATCHLEVEL_H_IMPLICIT -#define PERL_VERSION_STRING STRINGIFY(PERL_REVISION) "." \ - STRINGIFY(PERL_VERSION) "." \ - STRINGIFY(PERL_SUBVERSION) +/* Version as a single 4-byte hex number + Use this for numeric comparisons */ +#define PERL_VERSION_HEX ((PERL_VERSION_MAJOR << 24) | \ + (PERL_VERSION_MINOR << 16) | \ + (PERL_VERSION_PATCH << 8) | \ + (PERL_VERSION_RELEASE << 4) | \ + (PERL_VERSION_BUILD << 0)) + +#define PERL_VERSION_STRING STRINGIFY(PERL_VERSION_MAJOR) "." \ + STRINGIFY(PERL_VERSION_MINOR) "." \ + STRINGIFY(PERL_VERSION_PATCH) #define PERL_API_VERSION_STRING STRINGIFY(PERL_API_REVISION) "." \ STRINGIFY(PERL_API_VERSION) "." \ @@ -4668,11 +4676,11 @@ EXTCONST char PL_cshname[] library we're linking against. */ EXTCONST U8 PL_revision - INIT(PERL_REVISION); + INIT(PERL_VERSION_MAJOR); EXTCONST U8 PL_version - INIT(PERL_VERSION); + INIT(PERL_VERSION_MINOR); EXTCONST U8 PL_subversion - INIT(PERL_SUBVERSION); + INIT(PERL_VERSION_PATCH); EXTCONST char PL_uuemap[65] INIT("`!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_"); diff --git a/plan9/config_sh.sample b/plan9/config_sh.sample index 00cf8d47a263..f707d2f54cac 100644 --- a/plan9/config_sh.sample +++ b/plan9/config_sh.sample @@ -6,7 +6,7 @@ # instead choose to run each of the .SH files by yourself, or "Configure -S". # -# Package name : perl5 +# Package name : perl7 # Source directory : . # Configuration time: Sun Nov 24 20:57:48 EST 2002 # Configured by : unknown @@ -31,12 +31,12 @@ afsroot='/afs' alignbytes='4' aphostname='/bin/uname -n' api_revision='5' -api_subversion='1' -api_version='33' -api_versionstring='5.33.1' +api_subversion='0' +api_version='1' +api_versionstring='7.1.0' ar='ar' -archlib='/sys/lib/perl5/5.33.1/386' -archlibexp='/sys/lib/perl5/5.33.1/386' +archlib='/sys/lib/perl/7.1.0/386' +archlibexp='/sys/lib/perl/7.1.0/386' archname64='' archname='386' archobjs='' @@ -818,18 +818,18 @@ inc_version_list=' ' inc_version_list_init='0' incpath='' inews='' -installarchlib='/sys/lib/perl/5.33.1/386' +installarchlib='/sys/lib/perl/7.1.0/386' installbin='/usr/bin' installman1dir='/sys/man/1pub' installman3dir='/sys/man/2pub' installprefix='/usr' installprefixexp='/usr' -installprivlib='/sys/lib/perl/5.33.1' +installprivlib='/sys/lib/perl/7.1.0' installscript='/usr/bin' -installsitearch='/sys/lib/perl/5.33.1/site_perl/386' +installsitearch='/sys/lib/perl/7.1.0/site_perl/386' installsitebin='/usr/bin' -installsitelib='/sys/lib/perl/5.33.1/site_perl' -installstyle='lib/perl5' +installsitelib='/sys/lib/perl/7.1.0/site_perl' +installstyle='lib/perl' installusrbinperl='undef' installvendorarch='' installvendorbin='' @@ -933,7 +933,7 @@ orderlib='false' osname='plan9' osvers='1' otherlibdirs=' ' -package='perl5' +package='perl7' pager='/usr/ucb/more' passcat='' patchlevel='8' @@ -953,8 +953,8 @@ pmake='' pr='' prefix='/usr' prefixexp='/usr' -privlib='/sys/lib/perl/5.33.1' -privlibexp='/sys/lib/perl/5.33.1' +privlib='/sys/lib/perl/7.1.0' +privlibexp='/sys/lib/perl/7.1.0' procselfexe='' prototype='define' ptrsize='4' @@ -1019,13 +1019,13 @@ sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 sig_num_init='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 0' sig_size='50' signal_t='void' -sitearch='/sys/lib/perl/5.33.1/site_perl/386' +sitearch='/sys/lib/perl/7.1.0/site_perl/386' sitearchexp='/sys/lib/perl/site_perl/386' sitebin='/usr/bin' sitebinexp='/usr/bin' -sitelib='/sys/lib/perl/5.33.1/site_perl' -sitelib_stem='/sys/lib/perl/5.33.1/site_perl' -sitelibexp='/sys/lib/perl/5.33.1/site_perl' +sitelib='/sys/lib/perl/7.1.0/site_perl' +sitelib_stem='/sys/lib/perl/7.1.0/site_perl' +sitelibexp='/sys/lib/perl/7.1.0/site_perl' siteprefix='/usr' siteprefixexp='/usr' sizesize='4' @@ -1037,7 +1037,7 @@ sockethdr='' socketlib='' socksizetype='int' sort='sort' -spackage='Perl5' +spackage='Perl7' spitshell='cat' srand48_r_proto='0' srandom_r_proto='0' @@ -1139,8 +1139,8 @@ vendorlib_stem='' vendorlibexp='' vendorprefix='' vendorprefixexp='' -version='5.33.1' -version_patchlevel_string='version 33 subversion 1' +version='7.1.0' +version_patchlevel_string='version 1 subversion 0' versiononly='undef' vi='' xlibpth='' @@ -1152,11 +1152,11 @@ zip='zip' config_arg0='./Configure' config_args='' config_argc=0 -PERL_REVISION=5 -PERL_VERSION=33 -PERL_SUBVERSION=1 -PERL_API_REVISION=5 -PERL_API_VERSION=33 -PERL_API_SUBVERSION=1 +PERL_VERSION_MAJOR=7 +PERL_VERSION_MINOR=1 +PERL_VERSION_PATCH=0 +PERL_API_REVISION=7 +PERL_API_VERSION=1 +PERL_API_SUBVERSION=0 PERL_PATCHLEVEL= PERL_CONFIG_SH=true diff --git a/plan9/genconfig.pl b/plan9/genconfig.pl index 14c1faed25b5..e22a2b3609f5 100644 --- a/plan9/genconfig.pl +++ b/plan9/genconfig.pl @@ -70,7 +70,7 @@ # $0 # Time: $time -package='perl5' +package='perl7' PERL_CONFIG_SH='true' cf_time='$time' cf_by='$cf_by' @@ -279,18 +279,18 @@ if (open(PL,'<',"${outdir}patchlevel.h")) { while () { - if (/^#define PERL_VERSION\s+(\S+)/) { - print OUT "PERL_VERSION='$1'\n"; + if (/^#define PERL_VERSION_MINOR\s+(\S+)/) { + print OUT "PERL_VERSION_MINOR='$1'\n"; print OUT "PATCHLEVEL='$1'\n"; # XXX compat } - elsif (/^#define PERL_SUBVERSION\s+(\S+)/) { - print OUT "PERL_SUBVERSION='$1'\n"; + elsif (/^#define PERL_VERSION_PATCH\s+(\S+)/) { + print OUT "PERL_VERSION_PATCH='$1'\n"; print OUT "SUBVERSION='$1'\n"; # XXX compat } } close PL; } -elsif ($VERBOSE) { warn "Can't read ${outdir}patchlevel.h - skipping 'PERL_VERSION'" } +elsif ($VERBOSE) { warn "Can't read ${outdir}patchlevel.h - skipping 'PERL_VERSION_MINOR'" } print OUT "pager='/bin/p'\n"; diff --git a/plan9/myconfig.plan9 b/plan9/myconfig.plan9 index ecf40174c604..bff0edbbaa9b 100644 --- a/plan9/myconfig.plan9 +++ b/plan9/myconfig.plan9 @@ -15,7 +15,7 @@ $spitshell< "buildinfo"; diff --git a/pod/.gitignore b/pod/.gitignore index 34c82336cfe2..10e8b15a0078 100644 --- a/pod/.gitignore +++ b/pod/.gitignore @@ -49,7 +49,7 @@ /roffitall # generated -/perl5331delta.pod +/perl710delta.pod /perlapi.pod /perlintern.pod /perlmodlib.pod diff --git a/pod/perldelta.pod b/pod/perldelta.pod index 13332c75dbbc..7aa6ae87293d 100644 --- a/pod/perldelta.pod +++ b/pod/perldelta.pod @@ -5,15 +5,15 @@ [ this is a template for a new perldelta file. Any text flagged as XXX needs to be processed before release. ] -perldelta - what is new for perl v5.33.1 +perldelta - what is new for perl v7.1.0 =head1 DESCRIPTION -This document describes differences between the 5.33.0 release and the 5.33.1 +This document describes differences between the 7.0.0 release and the 7.1.0 release. If you are upgrading from an earlier release such as 5.32.0, first read -L, which describes differences between 5.32.0 and 5.33.0. +L, which describes differences between 5.32.0 and 7.0.0. =head1 Notice @@ -311,13 +311,13 @@ XXX =head2 Discontinued Platforms +XXX List any platforms that this version of perl no longer compiles on. + =over 4 -=item Symbian +=item XXX-some-platform -Support code relating to Symbian has been removed. Symbian was an -operating system for mobile devices. The port was last updated in July -2009, and the platform itself in October 2012. +XXX =back @@ -342,13 +342,13 @@ XXX Changes which affect the interface available to C code go here. Other significant internal changes for future core maintainers should be noted as well. +[ List each change as an =item entry ] + =over 4 =item * -The C compilation option has been removed, and -with it the need or the C macro. C remains defined as a -no-op outside C for backwards compatiblity with XS modules. +XXX =back @@ -403,7 +403,7 @@ died, add a short obituary here. XXX Generate this with: - perl Porting/acknowledgements.pl v5.33.0..HEAD + perl Porting/acknowledgements.pl v7.1.0..HEAD =head1 Reporting Bugs diff --git a/pp_ctl.c b/pp_ctl.c index 40e9ae7289c6..f6b5a8679d26 100644 --- a/pp_ctl.c +++ b/pp_ctl.c @@ -3775,7 +3775,7 @@ S_require_version(pTHX_ SV *sv) lav = MUTABLE_AV(SvRV(*hv_fetchs(MUTABLE_HV(req), "version", FALSE))); first = SvIV(*av_fetch(lav,0,0)); - if ( first > (int)PERL_REVISION /* probably 'use 6.0' */ + if ( first > (int)PERL_VERSION_MAJOR /* probably 'use 6.0' */ || hv_exists(MUTABLE_HV(req), "qv", 2 ) /* qv style */ || av_tindex(lav) > 1 /* FP with > 3 digits */ || strstr(SvPVX(pv),".0") /* FP with leading 0 */ diff --git a/regen/feature.pl b/regen/feature.pl index cab3928f3472..278e535d5ef2 100755 --- a/regen/feature.pl +++ b/regen/feature.pl @@ -45,6 +45,7 @@ BEGIN # be changed to account. # 5.odd implies the next 5.even, but an explicit 5.even can override it. +my @all_features = sort keys %feature; # features bundles use constant V5_9_5 => sort qw{say state switch indirect}; @@ -54,7 +55,7 @@ BEGIN use constant V5_27 => sort ( +V5_23, qw{bitwise} ); my %feature_bundle = ( - all => [ sort keys %feature ], + all => [ @all_features ], default => [ qw{indirect} ], # using 5.9.5 features bundle "5.9.5" => [ +V5_9_5 ], @@ -74,7 +75,8 @@ BEGIN "5.27" => [ +V5_27 ], "5.29" => [ +V5_27 ], "5.31" => [ +V5_27 ], - "5.33" => [ +V5_27 ], + "7.0" => [ +V5_27 ], + "7.1" => [ +V5_27 ], ); my @noops = qw( postderef lexical_subs ); @@ -96,8 +98,8 @@ BEGIN } for (keys %feature_bundle) { - next unless /^5\.(\d*[13579])\z/; - $feature_bundle{"5.".($1+1)} ||= $feature_bundle{$_}; + next unless /^(\d+)\.(\d*[13579])\z/a; + $feature_bundle{"$1.".($2+1)} ||= $feature_bundle{$_}; } my %UniqueBundles; # "say state switch" => 5.10 @@ -117,7 +119,7 @@ BEGIN sort { $a eq 'default' ? -1 : $b eq 'default' ? 1 : $a cmp $b } values %UniqueBundles ) { - next if $bund =~ /[^\d.]/ and $bund ne 'default'; + next if $bund =~ /[^\d.]/a and $bund ne 'default'; for (@{$feature_bundle{$bund}}) { if (@{$BundleRanges{$_} ||= []} == 2) { $BundleRanges{$_}[1] = $bund @@ -149,8 +151,7 @@ BEGIN my $bits_needed = length sprintf "%b", scalar keys %UniqueBundles; $bits =~ /1{$bits_needed}/ - or die "Not enough bits (need $bits_needed)" - . " in $bits (binary for $hex):\n\n$_\n "; + or die "Not enough bits (need $bits_needed) in $bits (binary for $hex):\n\n$_\n"; } if ($Uni8Bit && $HintMask) { last } } @@ -160,7 +161,7 @@ BEGIN close "perl.h"; my @HintedBundles = - ('default', grep !/[^\d.]/, sort values %UniqueBundles); + ('default', grep !/[^\d.]/a, sort values %UniqueBundles); ########################################################################### @@ -244,9 +245,9 @@ sub longest { $::bundle, $::feature . -for ('default', sort grep /\.\d[02468]/, keys %feature_bundle) { - $::bundle = ":$_"; - $::feature = join ' ', @{$feature_bundle{$_}}; +foreach my $bundle ('default', sort grep /\.\d*[02468]\z/a, keys %feature_bundle) { + $::bundle = ":$bundle"; + $::feature = join ' ', @{$feature_bundle{$bundle}}; write $pm; print $pm "\n"; } @@ -475,7 +476,7 @@ sub longest { __END__ package feature; -our $VERSION = '1.60'; +our $VERSION = '1.61'; FEATURES diff --git a/regen/regen_lib.pl b/regen/regen_lib.pl index cbe51eda718a..ec30595fbd5a 100644 --- a/regen/regen_lib.pl +++ b/regen/regen_lib.pl @@ -239,13 +239,13 @@ sub perl_version { open my $fh, "<", $plh or die "can't open '$plh': $!\n"; my ($v1,$v2,$v3); while (<$fh>) { - $v1 = $1 if /PERL_REVISION\s+(\d+)/; - $v2 = $1 if /PERL_VERSION\s+(\d+)/; - $v3 = $1 if /PERL_SUBVERSION\s+(\d+)/; + $v1 = $1 if /PERL_VERSION_MAJOR\s+(\d+)/; + $v2 = $1 if /PERL_VERSION_MINOR\s+(\d+)/; + $v3 = $1 if /PERL_VERSION_PATCH\s+(\d+)/; } - die "can't locate PERL_REVISION in '$plh'" unless defined $v1; - die "can't locate PERL_VERSION in '$plh'" unless defined $v2; - die "can't locate PERL_SUBVERSION in '$plh'" unless defined $v3; + die "can't locate PERL_VERSION_MAJOR in '$plh'" unless defined $v1; + die "can't locate PERL_VERSION_MINOR in '$plh'" unless defined $v2; + die "can't locate PERL_VERSION_PATCH in '$plh'" unless defined $v3; return ($v1,$v2,$v3, sprintf("%d.%03d%03d", $v1, $v2, $v3)); } diff --git a/t/comp/use.t b/t/comp/use.t index 12409cfac5f0..fe3ee6a8ab9c 100644 --- a/t/comp/use.t +++ b/t/comp/use.t @@ -17,40 +17,40 @@ sub _ok { my $result; if ($type eq 'is') { - $result = $got eq $expected; + $result = $got eq $expected; } elsif ($type eq 'isnt') { - $result = $got ne $expected; + $result = $got ne $expected; } elsif ($type eq 'like') { - $result = $got =~ $expected; + $result = $got =~ $expected; } elsif ($type eq 'ok') { - $result = not not $got; + $result = not not $got; } else { - die "Unexpected type '$type'$name"; + die "Unexpected type '$type'$name"; } if ($result) { - if ($name) { - print "ok $test - $name\n"; - } else { - print "ok $test\n"; - } + if ($name) { + print "ok $test - $name\n"; + } else { + print "ok $test\n"; + } } else { - if ($name) { - print "not ok $test - $name\n"; - } else { - print "not ok $test\n"; - } - my @caller = caller(1); - print "# Failed test at $caller[1] line $caller[2]\n"; - print "# Got '$got'\n"; - if ($type eq 'is') { - print "# Expected '$expected'\n"; - } elsif ($type eq 'isnt') { - print "# Expected not '$expected'\n"; - } elsif ($type eq 'like') { - print "# Expected $expected\n"; - } elsif ($type eq 'ok') { - print "# Expected a true value\n"; - } + if ($name) { + print "not ok $test - $name\n"; + } else { + print "not ok $test\n"; + } + my @caller = caller(1); + print "# Failed test at $caller[1] line $caller[2]\n"; + print "# Got '$got'\n"; + if ($type eq 'is') { + print "# Expected '$expected'\n"; + } elsif ($type eq 'isnt') { + print "# Expected not '$expected'\n"; + } elsif ($type eq 'like') { + print "# Expected $expected\n"; + } elsif ($type eq 'ok') { + print "# Expected a true value\n"; + } } $test = $test + 1; $result; @@ -69,78 +69,94 @@ sub ok($;$) { _ok ('ok', shift, undef, @_); } -eval "use 5"; # implicit semicolon -is ($@, ''); +eval "use 5"; +is ($@, '', "implicit semicolon"); eval "use 5;"; -is ($@, ''); +is ($@, '', "explicit semicolon"); -eval "{use 5}"; # [perl #70884] -is ($@, ''); +eval "{use 5}"; +is ($@, '', "[perl #70884] -> GH 9990"); -eval "{use 5 }"; # [perl #70884] -is ($@, ''); +eval "{use 5 }"; +is ($@, '', "[perl #70884] -> GH 9990"); # new style version numbers eval q{ use v5.5.630; }; -is ($@, ''); +is ($@, '', "3-part version number"); eval q{ use 10.0.2; }; -like ($@, qr/^Perl v10\.0\.2 required/); +like ($@, qr/^Perl v10\.0\.2 required/, + "Got expected error message: insufficient Perl version"); -eval "use 5.000"; # implicit semicolon -is ($@, ''); +eval "use 5.000"; +is ($@, '', "implicit semicolon - decimal version number"); eval "use 5.000;"; -is ($@, ''); +is ($@, '', "explicit semicolon - decimal version number"); -eval "use 6.000;"; -like ($@, qr/Perl v6\.0\.0 required--this is only \Q$^V\E, stopped/); +eval "use 666.000;"; +like ($@, qr/Perl v666\.0\.0 required--this is only \Q$^V\E, stopped/, + "Got expected error message: insufficient Perl version - decimal version number"); -eval "no 6.000;"; -is ($@, ''); +eval "no 8.000;"; +is ($@, '', "No error for 'no 8.000'"); eval "no 5.000;"; -like ($@, qr/Perls since v5\.0\.0 too modern--this is \Q$^V\E, stopped/); +like ($@, qr/Perls since v5\.0\.0 too modern--this is \Q$^V\E, stopped/, + "Got expected error message: 'no 5.000'"); -eval "use 5.6;"; -like ($@, qr/Perl v5\.600\.0 required \(did you mean v5\.6\.0\?\)--this is only \Q$^V\E, stopped/); +eval "use 7.6;"; +like ($@, qr/Perl v7\.600\.0 required \(did you mean v7\.6\.0\?\)--this is only \Q$^V\E, stopped/, + "Got expected error message: 'use 7.6;'"); -eval "use 5.8;"; -like ($@, qr/Perl v5\.800\.0 required \(did you mean v5\.8\.0\?\)--this is only \Q$^V\E, stopped/); +eval "use 7.8;"; +like ($@, qr/Perl v7\.800\.0 required \(did you mean v7\.8\.0\?\)--this is only \Q$^V\E, stopped/, + "Got expected error message: 'use 7.8;'"); -eval "use 5.9;"; -like ($@, qr/Perl v5\.900\.0 required \(did you mean v5\.9\.0\?\)--this is only \Q$^V\E, stopped/); +eval "use 7.9;"; +like ($@, qr/Perl v7\.900\.0 required \(did you mean v7\.9\.0\?\)--this is only \Q$^V\E, stopped/, + "Got expected error message: 'use 7.9;'"); -eval "use 5.10;"; -like ($@, qr/Perl v5\.100\.0 required \(did you mean v5\.10\.0\?\)--this is only \Q$^V\E, stopped/); +eval "use 7.10;"; +like ($@, qr/Perl v7\.100\.0 required \(did you mean v7\.10\.0\?\)--this is only \Q$^V\E, stopped/, + "Got expected error message: 'use 7.10;'"); + +{ + local $::TODO = "patch pp_ctl.c S_require_version for use 5.x"; + eval "use 5.8;"; + like ($@, qr/Perl v5\.800\.0 required \(did you mean v5\.8\.0\?\)--this is only \Q$^V\E, stopped/, + "Got expected error message: 'use 5.8;' # TODO $::TODO"); +} -eval "use 5.11;"; -like ($@, qr/Perl v5\.110\.0 required \(did you mean v5\.11\.0\?\)--this is only \Q$^V\E, stopped/); eval sprintf "use %.6f;", $]; -is ($@, ''); +is ($@, '', "No error message on: 'use %.6f;'"); eval sprintf "use %.6f;", $] - 0.000001; -is ($@, ''); +is ($@, '', "No error message on: 'use %.6f;'"); eval sprintf("use %.6f;", $] + 1); -like ($@, qr/Perl v6.\d+.\d+ required--this is only \Q$^V\E, stopped/); +like ($@, qr/Perl v8.\d+.\d+ required--this is only \Q$^V\E, stopped/, + "Got expected error message: 'use %.6f;'"); eval sprintf "use %.6f;", $] + 0.00001; -like ($@, qr/Perl v5.\d+.\d+ required--this is only \Q$^V\E, stopped/); +like ($@, qr/Perl v7.\d+.\d+ required--this is only \Q$^V\E, stopped/a, + "Got expected error message: 'use %.6f;'"); # check that "use 5.11.0" (and higher) loads strictures eval 'use 5.11.0; ${"foo"} = "bar";'; -like ($@, qr/Can't use string \("foo"\) as a SCALAR ref while "strict refs" in use/); +like ($@, qr/Can't use string \("foo"\) as a SCALAR ref while "strict refs" in use/, + "5.11.0 (and higher) loads strictures"); # but that they can be disabled eval 'use 5.11.0; no strict "refs"; ${"foo"} = "bar";'; -is ($@, ""); +is ($@, "", "... but strictures can be disabled"); # and they are properly scoped eval '{use 5.11.0;} ${"foo"} = "bar";'; -is ($@, ""); +is ($@, "", "... and they are properly scoped"); + eval 'no strict; use 5.012; ${"foo"} = "bar"'; is $@, "", 'explicit "no strict" overrides later ver decl'; eval 'use strict; use 5.01; ${"foo"} = "bar"'; @@ -165,7 +181,7 @@ eval 'no strict "vars"; use 5.012; ursine_word'; ok $@, 'no strict vars allows ver decl to enable subs'; -{ use test_use } # check that subparse saves pending tokens +{ use test_use } # check that subparse saves pending tokens use test_use { () }; is ref $test_use::got[0], 'HASH', 'use parses arguments in term lexing cx'; @@ -173,127 +189,133 @@ is ref $test_use::got[0], 'HASH', 'use parses arguments in term lexing cx'; local $test_use::VERSION = 1.0; eval "use test_use 0.9"; -is ($@, ''); +is ($@, '', "use test_use 0.9"); eval "use test_use 1.0"; -is ($@, ''); +is ($@, '', "use test_use 1.0"); eval "use test_use 1.01"; -isnt ($@, ''); +isnt ($@, '', 'use test_use 1.01'); eval "use test_use 0.9 qw(fred)"; -is ($@, ''); +is ($@, '', 'use test_use 0.9 qw(fred)'); -is("@test_use::got", "fred"); +is("@test_use::got", "fred", 'got fred'); eval "use test_use 1.0 qw(joe)"; -is ($@, ''); +is ($@, '', 'use test_use 1.0 qw(joe)'); -is("@test_use::got", "joe"); +is("@test_use::got", "joe", 'got joe'); eval "use test_use 1.01 qw(freda)"; -isnt($@, ''); +isnt($@, '', 'use test_use 1.01 qw(freda)'); -is("@test_use::got", "joe"); +is("@test_use::got", "joe", 'got joe'); { local $test_use::VERSION = 35.36; eval "use test_use v33.55"; - is ($@, ''); + is ($@, '', 'use test_use v33.55'); eval "use test_use v100.105"; - like ($@, qr/test_use version v100.105.0 required--this is only version v35\.360\.0/); + like ($@, qr/test_use version v100.105.0 required--this is only version v35\.360\.0/, + "Got expected error message: insufficient test_use version"); eval "use test_use 33.55"; - is ($@, ''); + is ($@, '', 'use test_use 33.55'); eval "use test_use 100.105"; - like ($@, qr/test_use version 100.105 required--this is only version 35.36/); + like ($@, qr/test_use version 100.105 required--this is only version 35.36/, + "Got expected error message: insufficient test_use version"); local $test_use::VERSION = '35.36'; eval "use test_use v33.55"; - like ($@, ''); + like ($@, '', 'use test_use v33.55'); eval "use test_use v100.105"; - like ($@, qr/test_use version v100.105.0 required--this is only version v35\.360\.0/); + like ($@, qr/test_use version v100.105.0 required--this is only version v35\.360\.0/, + "Got expected error message: insufficient test_use version"); eval "use test_use 33.55"; - is ($@, ''); + is ($@, '', 'use test_use 33.55'); eval "use test_use 100.105"; - like ($@, qr/test_use version 100.105 required--this is only version 35.36/); + like ($@, qr/test_use version 100.105 required--this is only version 35.36/, + "Got expected error message: insufficient test_use version"); local $test_use::VERSION = v35.36; eval "use test_use v33.55"; - is ($@, ''); + is ($@, '', 'use test_use v33.55'); eval "use test_use v100.105"; - like ($@, qr/test_use version v100.105.0 required--this is only version v35\.36\.0/); + like ($@, qr/test_use version v100.105.0 required--this is only version v35\.36\.0/, + "Got expected error message: insufficient test_use version"); eval "use test_use 33.55"; - is ($@, ''); + is ($@, '', 'use test_use 33.55'); eval "use test_use 100.105"; - like ($@, qr/test_use version 100.105 required--this is only version v35.36/); + like ($@, qr/test_use version 100.105 required--this is only version v35.36/, + "Got expected error message: insufficient test_use version"); } { - # Regression test for patch 14937: + # Regression test for patch 14937: # Check that a .pm file with no package or VERSION doesn't core. # (git commit 2658f4d9934aba5f8b23afcc078dc12b3a40223) eval "use test_use_14937 3"; - like ($@, qr/^test_use_14937 defines neither package nor VERSION--version check failed at/); + like ($@, qr/^test_use_14937 defines neither package nor VERSION--version check failed at/, "test_use_14937"); } my @ver = split /\./, sprintf "%vd", $^V; foreach my $index (-3..+3) { foreach my $v (0, 1) { - my @parts = @ver; - if ($index) { - if ($index < 0) { - # Jiggle one of the parts down - --$parts[-$index - 1]; - if ($parts[-$index - 1] < 0) { - # perl's version number ends with '.0' - $parts[-$index - 1] = 0; - $parts[-$index - 2] -= 2; - } - } else { - # Jiggle one of the parts up - ++$parts[$index - 1]; - } - } - my $v_version = sprintf "v%d.%d.%d", @parts; - my $version; - if ($v) { - $version = $v_version; - } else { - $version = $parts[0] + $parts[1] / 1000 + $parts[2] / 1000000; - } - - eval "use $version"; - if ($index > 0) { - # The future - like ($@, - qr/Perl $v_version required--this is only \Q$^V\E, stopped/, - "use $version"); - } else { - # The present or past - is ($@, '', "use $version"); - } - - eval "no $version"; - if ($index <= 0) { - # The present or past - like ($@, - qr/Perls since $v_version too modern--this is \Q$^V\E, stopped/, - "no $version"); - } else { - # future - is ($@, '', "no $version"); - } + my @parts = @ver; + if ($index) { + if ($index < 0) { + # Jiggle one of the parts down + --$parts[-$index - 1] if $parts[-$index - 1] > 1; + if ($parts[-$index - 1] < 0) { + # perl's version number ends with '.0' + $parts[-$index - 1] = 0; + $parts[-$index - 2] -= 2 if $parts[-$index - 2] > 2; + } + } else { + # Jiggle one of the parts up + ++$parts[$index - 1]; + } + } + my $v_version = sprintf "v%d.%d.%d", @parts; + my $version; + if ($v) { + $version = $v_version; + } else { + $version = $parts[0] + $parts[1] / 1000 + $parts[2] / 1000000; + } + + eval "use $version"; + if ($index > 0) { + # The future + like ($@, + qr/Perl $v_version required--this is only \Q$^V\E, stopped/, + "use $version"); + } else { + # The present or past + is ($@, '', "use $version"); + } + + eval "no $version"; + if ($index <= 0) { + # The present or past + like ($@, + qr/Perls since $v_version too modern--this is \Q$^V\E, stopped/, + "no $version"); + } else { + # future + is ($@, '', "no $version"); + } } } diff --git a/t/porting/customized.dat b/t/porting/customized.dat index c38a92ee16a4..c3cc64006809 100644 --- a/t/porting/customized.dat +++ b/t/porting/customized.dat @@ -30,4 +30,4 @@ Win32API::File cpan/Win32API-File/File.pm 8fd212857f821cb26648878b96e57f13bf21b9 Win32API::File cpan/Win32API-File/File.xs beb870fed4490d2faa547b4a8576b8d64d1d27c5 experimental cpan/experimental/t/basic.t cb9da8dd05b854375809872a05dd32637508d5da version cpan/version/lib/version.pm 7ef9219d1d5f1d71f08a79f3b0577df138b21b12 -version vutil.c 601cc57bbc0070ae33eab7fd2d667f20efbe15f8 +version vutil.c 8b6af97faadfad5404e2482dbba762946718c69b diff --git a/t/porting/customized.t b/t/porting/customized.t index d425e5b775a4..272d5beb1898 100644 --- a/t/porting/customized.t +++ b/t/porting/customized.t @@ -128,8 +128,7 @@ customized.t - Test that CUSTOMIZED files in Maintainers.pl have not been overwr =head1 SYNOPSIS - cd t - ./perl -I../lib porting/customized.t --regen + cd t; ./perl -I../lib porting/customized.t --regen; cd - =head1 DESCRIPTION diff --git a/t/porting/regen.t b/t/porting/regen.t index 2c3fa219981c..014af353ed8d 100644 --- a/t/porting/regen.t +++ b/t/porting/regen.t @@ -2,6 +2,11 @@ # Verify that all files generated by perl scripts are up to date. +# Hint: A failure in this file can often be corrected by running: +# ./perl -Ilib regen/_________.pl +# ... where you fill in the blank by looking at what 'make test_porting' +# tells you. + BEGIN { @INC = '..' if -f '../TestInit.pm'; } diff --git a/t/run/switches.t b/t/run/switches.t index aa8d9c5427c9..89f99e5fa938 100644 --- a/t/run/switches.t +++ b/t/run/switches.t @@ -7,7 +7,7 @@ BEGIN { chdir 't' if -d 't'; @INC = '../lib'; - require Config; import Config; + require Config; Config->import; } BEGIN { require "./test.pl"; require "./loc_tools.pl"; } @@ -19,6 +19,7 @@ use Config; # due to a bug in VMS's piping which makes it impossible for runperl() # to emulate echo -n (ie. stdin always winds up with a newline), these # tests almost totally fail. +our $TODO; $TODO = "runperl() unable to emulate echo -n due to pipe bug" if $^O eq 'VMS'; my $r; @@ -121,7 +122,7 @@ SKIP: { # Win32 won't let us open the directory, so we never get to die with # EISDIR, which happens after open. require Errno; - import Errno qw(EACCES EISDIR); + Errno->import( qw(EACCES EISDIR) ); my $error = do { local $! = $^O eq 'MSWin32' ? &EACCES : &EISDIR; "$!" }; @@ -267,7 +268,7 @@ is runperl(stderr => 1, prog => '#!perl -M'), '-V generates 20+ lines' ); like( runperl( switches => ['-V'] ), - qr/\ASummary of my perl5 .*configuration:/, + qr/\ASummary of my perl7 .*configuration:/, '-V looks okay' ); # lookup a known config var @@ -301,10 +302,12 @@ is runperl(stderr => 1, prog => '#!perl -M'), skip "Win32 miniperl produces a default archname in -v", 1 if $^O eq 'MSWin32' && is_miniperl; my $v = sprintf "%vd", $^V; - my $ver = $Config{PERL_VERSION}; - my $rel = $Config{PERL_SUBVERSION}; + my $rev = $Config{PERL_VERSION_MAJOR}; + my $ver = $Config{PERL_VERSION_MINOR}; + my $rel = $Config{PERL_VERSION_PATCH}; + print STDERR "# $rev-$ver-$rel\n"; like( runperl( switches => ['-v'] ), - qr/This is perl 5, version \Q$ver\E, subversion \Q$rel\E \(v\Q$v\E(?:[-*\w]+| \([^)]+\))?\) built for \Q$Config{archname}\E.+Copyright.+Larry Wall.+Artistic License.+GNU General Public License/s, + qr/This is perl \Q$rev\E, version \Q$ver\E, subversion \Q$rel\E \(v\Q$v\E(?:[-*\w]+| \([^)]+\))?\) built for \Q$Config{archname}\E.+Copyright.+Larry Wall.+Artistic License.+GNU General Public License/s, '-v looks okay' ); } } diff --git a/toke.c b/toke.c index 64550fae3e6b..b995af25f3c7 100644 --- a/toke.c +++ b/toke.c @@ -8713,7 +8713,7 @@ yyl_try(pTHX_ char *s) } if (PL_minus_E) sv_catpvs(PL_linestr, - "use feature ':" STRINGIFY(PERL_REVISION) "." STRINGIFY(PERL_VERSION) "';"); + "use feature ':" STRINGIFY(PERL_VERSION_MAJOR) "." STRINGIFY(PERL_VERSION_MINOR) "';"); if (PL_minus_n || PL_minus_p) { sv_catpvs(PL_linestr, "LINE: while (<>) {"/*}*/); if (PL_minus_l) diff --git a/uconfig.h b/uconfig.h index 24e0a358135a..d54e53923dfc 100644 --- a/uconfig.h +++ b/uconfig.h @@ -7,7 +7,7 @@ * For a more permanent change edit uconfig.sh and rerun config_h.SH. */ -/* Package name : perl5 +/* Package name : perl7 * Source directory : . * Configuration time: Thu Jan 1 00:00:00 GMT 1970 * Configured by : root@localhost @@ -1219,7 +1219,7 @@ /* ARCHLIB: * This variable, if defined, holds the name of the directory in * which the user wants to put architecture-dependent public - * library files for perl5. It is most often a local directory + * library files for perl7. It is most often a local directory * such as /usr/local/lib. Programs using this variable must be * prepared to deal with filename expansion. If ARCHLIB is the * same as PRIVLIB, it is not defined, since presumably the @@ -1229,8 +1229,8 @@ * This symbol contains the ~name expanded version of ARCHLIB, to be used * in programs that are not prepared to deal with ~ expansion at run-time. */ -/*#define ARCHLIB "/usr/local/lib/perl5/5.33/unknown" / **/ -/*#define ARCHLIB_EXP "/usr/local/lib/perl5/5.33/unknown" / **/ +/*#define ARCHLIB "/usr/local/lib/perl/7.1/unknown" / **/ +/*#define ARCHLIB_EXP "/usr/local/lib/perl/7.1/unknown" / **/ /* BIN: * This symbol holds the path of the bin directory where the package will @@ -1283,8 +1283,8 @@ * This symbol contains the ~name expanded version of PRIVLIB, to be used * in programs that are not prepared to deal with ~ expansion at run-time. */ -#define PRIVLIB "/usr/local/lib/perl5/5.33" /**/ -#define PRIVLIB_EXP "/usr/local/lib/perl5/5.33" /**/ +#define PRIVLIB "/usr/local/lib/perl/7.1" /**/ +#define PRIVLIB_EXP "/usr/local/lib/perl/7.1" /**/ /* SITEARCH: * This symbol contains the name of the private library for this package. @@ -1301,8 +1301,8 @@ * This symbol contains the ~name expanded version of SITEARCH, to be used * in programs that are not prepared to deal with ~ expansion at run-time. */ -/*#define SITEARCH "/usr/local/lib/perl5/5.33/unknown" / **/ -/*#define SITEARCH_EXP "/usr/local/lib/perl5/5.33/unknown" / **/ +/*#define SITEARCH "/usr/local/lib/perl/7.1/unknown" / **/ +/*#define SITEARCH_EXP "/usr/local/lib/perl/7.1/unknown" / **/ /* SITELIB: * This symbol contains the name of the private library for this package. @@ -1324,9 +1324,9 @@ * removed. The elements in inc_version_list (inc_version_list.U) can * be tacked onto this variable to generate a list of directories to search. */ -#define SITELIB "/usr/local/lib/perl5/5.33" /**/ -#define SITELIB_EXP "/usr/local/lib/perl5/5.33" /**/ -#define SITELIB_STEM "/usr/local/lib/perl5" /**/ +#define SITELIB "/usr/local/lib/perl/7.1" /**/ +#define SITELIB_EXP "/usr/local/lib/perl/7.1" /**/ +#define SITELIB_STEM "/usr/local/lib/perl" /**/ /* PERL_VENDORARCH: * If defined, this symbol contains the name of a private library. @@ -5261,5 +5261,5 @@ /* Generated from: * 14796a77fb4ae3335f5e589a98445bc6e838b688194f6f112537495f0814f5d5 config_h.SH - * 36943454dd4cff2f1fd6a87074c461192a18b540d34c4d348707cc8cf7b8fcfc uconfig.sh + * 4547efe84174008b81e99895b5c8202fa7783a4d42bbe7239eff079e4e723584 uconfig.sh * ex: set ro: */ diff --git a/uconfig.sh b/uconfig.sh index b1ed39ee1c6c..2c030b3afae9 100644 --- a/uconfig.sh +++ b/uconfig.sh @@ -6,8 +6,8 @@ afs='false' afsroot='/afs' alignbytes='4' aphostname='/bin/hostname' -archlib='/usr/local/lib/perl5/5.33/unknown' -archlibexp='/usr/local/lib/perl5/5.33/unknown' +archlib='/usr/local/lib/perl/7.1/unknown' +archlibexp='/usr/local/lib/perl/7.1/unknown' archname='unknown' asctime_r_proto='0' bin='/usr/local/bin' @@ -729,7 +729,7 @@ i_wctype='undef' i_xlocale='undef' ignore_versioned_solibs='y' inc_version_list_init='NULL' -installstyle='lib/perl5' +installstyle='lib/perl' installusrbinperl='undef' intsize='4' ivdformat='"ld"' @@ -777,12 +777,12 @@ orderlib='false' osname='unknown' osvers='unknown' otherlibdirs=' ' -package='perl5' +package='perl7' perl_static_inline='static' phostname='hostname' pidtype=int -privlib='/usr/local/lib/perl5/5.33' -privlibexp='/usr/local/lib/perl5/5.33' +privlib='/usr/local/lib/perl/7.1' +privlibexp='/usr/local/lib/perl/7.1' procselfexe='' prototype='undef' ptrsize='4' @@ -832,11 +832,11 @@ sig_name_init='0' sig_num_init='0' sig_size='1' signal_t=int -sitearch='/usr/local/lib/perl5/5.33/unknown' -sitearchexp='/usr/local/lib/perl5/5.33/unknown' -sitelib='/usr/local/lib/perl5/5.33' -sitelib_stem='/usr/local/lib/perl5' -sitelibexp='/usr/local/lib/perl5/5.33' +sitearch='/usr/local/lib/perl/7.1/unknown' +sitearchexp='/usr/local/lib/perl/7.1/unknown' +sitelib='/usr/local/lib/perl/7.1' +sitelib_stem='/usr/local/lib/perl' +sitelibexp='/usr/local/lib/perl/7.1' sizesize=4 sizetype='size_t' socksizetype='int' diff --git a/uconfig64.sh b/uconfig64.sh index 112689fa0288..48f0eccda6c7 100644 --- a/uconfig64.sh +++ b/uconfig64.sh @@ -6,8 +6,8 @@ afs='false' afsroot='/afs' alignbytes='8' aphostname='/bin/hostname' -archlib='/usr/local/lib/perl5/5.33/unknown' -archlibexp='/usr/local/lib/perl5/5.33/unknown' +archlib='/usr/local/lib/perl/7.1/unknown' +archlibexp='/usr/local/lib/perl/7.1/unknown' archname='unknown64' asctime_r_proto='0' bin='/usr/local/bin' @@ -729,7 +729,7 @@ i_wctype='undef' i_xlocale='undef' ignore_versioned_solibs='y' inc_version_list_init='NULL' -installstyle='lib/perl5' +installstyle='lib/perl' installusrbinperl='undef' intsize='4' ivdformat='"ld"' @@ -777,12 +777,12 @@ orderlib='false' osname='unknown' osvers='unknown' otherlibdirs=' ' -package='perl5' +package='perl7' perl_static_inline='static' phostname='hostname' pidtype=int -privlib='/usr/local/lib/perl5/5.33' -privlibexp='/usr/local/lib/perl5/5.33' +privlib='/usr/local/lib/perl/7.1' +privlibexp='/usr/local/lib/perl/7.1' procselfexe='' prototype='undef' ptrsize='8' @@ -832,11 +832,11 @@ sig_name_init='0' sig_num_init='0' sig_size='1' signal_t=int -sitearch='/usr/local/lib/perl5/5.33/unknown' -sitearchexp='/usr/local/lib/perl5/5.33/unknown' -sitelib='/usr/local/lib/perl5/5.33' -sitelib_stem='/usr/local/lib/perl5' -sitelibexp='/usr/local/lib/perl5/5.33' +sitearch='/usr/local/lib/perl/7.1/unknown' +sitearchexp='/usr/local/lib/perl/7.1/unknown' +sitelib='/usr/local/lib/perl/7.1' +sitelib_stem='/usr/local/lib/perl' +sitelibexp='/usr/local/lib/perl/7.1' sizesize=4 sizetype='size_t' socksizetype='int' diff --git a/vms/descrip_mms.template b/vms/descrip_mms.template index e5954f6a5615..65ff509fb783 100644 --- a/vms/descrip_mms.template +++ b/vms/descrip_mms.template @@ -70,7 +70,7 @@ OBJVAL = $(MMS$TARGET_NAME)$(O) .endif .endif -PERL_VERSION = ~PV~ +PERL_VERSION_MINOR = ~PV~ .ifdef MALLOC MALLOC_O = malloc$(O) @@ -81,9 +81,9 @@ MALLOC_C = malloc$(C) SOCKET=1 .endif -ARCHDIR = [.lib.$(ARCHNAME).$(PERL_VERSION)] -ARCHCORE = [.lib.$(ARCHNAME).$(PERL_VERSION).CORE] -ARCHAUTO = [.lib.$(ARCHNAME).$(PERL_VERSION).auto] +ARCHDIR = [.lib.$(ARCHNAME).$(PERL_VERSION_MINOR)] +ARCHCORE = [.lib.$(ARCHNAME).$(PERL_VERSION_MINOR).CORE] +ARCHAUTO = [.lib.$(ARCHNAME).$(PERL_VERSION_MINOR).auto] #: >>>>>Compiler-specific options <<<<< .ifdef GNUC @@ -313,7 +313,7 @@ utils : $(utils1) $(utils2) $(utils3) $(utils4) $(utils5) extra.pods : miniperl @ @extra_pods.com -PERLDELTA_CURRENT = [.pod]perl5331delta.pod +PERLDELTA_CURRENT = [.pod]perl710delta.pod $(PERLDELTA_CURRENT) : [.pod]perldelta.pod Copy/NoConfirm/Log $(MMS$SOURCE) $(PERLDELTA_CURRENT) diff --git a/vms/myconfig.com b/vms/myconfig.com index 5f80d2531531..3a1000b7a1f0 100644 --- a/vms/myconfig.com +++ b/vms/myconfig.com @@ -119,13 +119,13 @@ $ endif $ open/read RATHER_LONG_CONFIG_FILE_HANDLE 'RATHER_LONG_FILENAME_SEARCH' $read_patchlevel_h: $ read/end_of_file = patchlevel_h_Done RATHER_LONG_CONFIG_FILE_HANDLE line -$ if f$locate("PERL_VERSION",line).ne.f$length(line) +$ if f$locate("PERL_VERSION_MINOR",line).ne.f$length(line) $ then $ line = f$edit(line,"TRIM,COMPRESS") $ $PATCHLEVEL = f$element(2," ",line) $ if f$type($SUBVERSION).nes."" then goto patchlevel_h_Done $ endif -$ if f$locate("PERL_SUBVERSION",line).ne.f$length(line) +$ if f$locate("PERL_VERSION_PATCH",line).ne.f$length(line) $ then $ line = f$edit(line,"TRIM,COMPRESS") $ $SUBVERSION = f$element(2," ",line) @@ -137,7 +137,7 @@ $patchlevel_h_Done: $ close RATHER_LONG_CONFIG_FILE_HANDLE $ if $PATCHLEVEL.eqs."" $ then -$ echo "warning: PERL_VERSION was not found in ''RATHER_LONG_FILENAME_TO_FIND':" +$ echo "warning: PERL_VERSION_MINOR was not found in ''RATHER_LONG_FILENAME_TO_FIND':" $ endif $! $spit_it_out: diff --git a/vms/vmsish.h b/vms/vmsish.h index a0003e90bc70..d69092456015 100644 --- a/vms/vmsish.h +++ b/vms/vmsish.h @@ -319,9 +319,9 @@ struct interp_intern { #ifndef PERL_CORE # define PERL_FS_VER_FMT "%d_%d_%d" #endif -#define PERL_FS_VERSION STRINGIFY(PERL_REVISION) "_" \ - STRINGIFY(PERL_VERSION) "_" \ - STRINGIFY(PERL_SUBVERSION) +#define PERL_FS_VERSION STRINGIFY(PERL_VERSION_MAJOR) "_" \ + STRINGIFY(PERL_VERSION_MINOR) "_" \ + STRINGIFY(PERL_VERSION_PATCH) /* Temporary; we need to add support for this to Configure.Com */ #ifdef PERL_INC_VERSION_LIST # undef PERL_INC_VERSION_LIST diff --git a/vutil.c b/vutil.c index 23627bea78c9..7850bf985a40 100644 --- a/vutil.c +++ b/vutil.c @@ -764,7 +764,7 @@ Perl_upg_version(pTHX_ SV *ver, bool qv) version = savepvn(SvPV(ver,len), SvCUR(ver)); SAVEFREEPV(version); #ifndef SvVOK -# if PERL_VERSION > 5 +# if PERL_VERSION_GT(5,5,0) /* This will only be executed for 5.6.0 - 5.8.0 inclusive */ if ( len >= 3 && !instr(version,".") && !instr(version,"_")) { /* may be a v-string */ diff --git a/vxs.inc b/vxs.inc index cea9857887dc..b20362a9d6e7 100644 --- a/vxs.inc +++ b/vxs.inc @@ -89,6 +89,11 @@ typedef char HVNAME; # define HEKf "s" #endif +/* we should have some meta in Devel-PPPort to check IS_PERL_VERSION_X_Y */ +#ifndef IS_PERL_VERSION_5_5 +# define IS_PERL_VERSION_5_5 PERL_VERSION_GE(5,5,0) && PERL_VERSION_LT(5,6,0) +#endif + VXS(universal_version) { dXSARGS; @@ -133,7 +138,7 @@ VXS(universal_version) if (undef) { if (pkg) { const HVNAME* const name = HvNAME_HEK(pkg); -#if PERL_VERSION == 5 +#if IS_PERL_VERSION_5_5 Perl_croak(aTHX_ "%s version %s required--this is only version ", name, SvPVx_nolen_const(req)); #else @@ -144,7 +149,7 @@ VXS(universal_version) #endif } else { -#if PERL_VERSION >= 8 +#if PERL_VERSION_GE(5,8,0) Perl_croak(aTHX_ "%" SVf " defines neither package nor VERSION--" "version check failed", @@ -206,7 +211,7 @@ VXS(version_new) SV * svarg2; vs = sv_newmortal(); svarg2 = ST(2); -#if PERL_VERSION == 5 +#if IS_PERL_VERSION_5_5 sv_setpvf(vs,"v%s",SvPV_nolen_const(svarg2)); #else Perl_sv_setpvf(aTHX_ vs,"v%s",SvPV_nolen_const(svarg2)); @@ -249,7 +254,7 @@ VXS(version_new) rv = NEW_VERSION(vs); if ( len != sizeof(VXS_CLASS)-1 || strcmp(classname,VXS_CLASS) != 0 ) /* inherited new() */ -#if PERL_VERSION == 5 +#if IS_PERL_VERSION_5_5 sv_bless(rv, gv_stashpv((char *)classname, GV_ADD)); #else sv_bless(rv, gv_stashpvn(classname, len, GV_ADD | flags)); @@ -445,7 +450,7 @@ VXS(version_qv) } if ( items == 2 && (len != 7 || strcmp(classname,"version")) ) { /* inherited new() */ -#if PERL_VERSION == 5 +#if IS_PERL_VERSION_5_5 sv_bless(rv, gv_stashpv((char *)classname, GV_ADD)); #else sv_bless(rv, gv_stashpvn(classname, len, GV_ADD | flags)); diff --git a/win32/GNUmakefile b/win32/GNUmakefile index a2578dd8e9c6..fcf291242f6a 100644 --- a/win32/GNUmakefile +++ b/win32/GNUmakefile @@ -7,7 +7,7 @@ # Windows SDK 64-bit compiler and tools # # This is set up to build a perl.exe that runs off a shared library -# (perl533.dll). Also makes individual DLLs for the XS extensions. +# (perl71.dll). Also makes individual DLLs for the XS extensions. # # The easiest way to customize the build process is to use parameters like this: # @@ -64,7 +64,7 @@ INST_TOP := $(INST_DRV)\perl # versioned installation can be obtained by setting INST_TOP above to a # path that includes an arbitrary version string. # -#INST_VER := \5.33.1 +#INST_VER := \7.1.0 # # Comment this out if you DON'T want your perl installation to have @@ -230,7 +230,7 @@ DEFAULT_INC_EXCLUDES_DOT := define # set this to additionally provide a statically linked perl-static.exe. # Note that dynamic loading will not work with this perl, so you must # include required modules statically using the STATIC_EXT or ALL_STATIC -# variables below. A static library perl533s.lib will also be created. +# variables below. A static library perl71s.lib will also be created. # Ordinary perl.exe is not affected by this option. # #BUILD_STATIC := define @@ -1004,9 +1004,9 @@ ifeq ($(CCTYPE),GCC) CFGSH_TMPL = config.gc CFGH_TMPL = config_H.gc -PERLIMPLIB = $(COREDIR)\libperl533$(a) -PERLIMPLIBBASE = libperl533$(a) -PERLSTATICLIB = ..\libperl533s$(a) +PERLIMPLIB = $(COREDIR)\libperl71$(a) +PERLIMPLIBBASE = libperl71$(a) +PERLSTATICLIB = ..\libperl71s$(a) INT64 = long long else @@ -1019,12 +1019,12 @@ endif # makedef.pl must be updated if this changes, and this should normally # only change when there is an incompatible revision of the public API. -PERLIMPLIB ?= $(COREDIR)\perl533$(a) -PERLIMPLIBBASE ?= perl533$(a) -PERLEXPLIB ?= $(COREDIR)\perl533.exp -PERLSTATICLIB ?= ..\perl533s$(a) -PERLDLL = ..\perl533.dll -PERLDLLBASE = perl533.dll +PERLIMPLIB ?= $(COREDIR)\perl71$(a) +PERLIMPLIBBASE ?= perl71$(a) +PERLEXPLIB ?= $(COREDIR)\perl71.exp +PERLSTATICLIB ?= ..\perl71s$(a) +PERLDLL = ..\perl71.dll +PERLDLLBASE = perl71.dll # don't let "gmake -n all" try to run "miniperl.exe make_ext.pl" PLMAKE = gmake @@ -1743,7 +1743,7 @@ utils: $(HAVEMINIPERL) ..\utils\Makefile copy ..\README.tw ..\pod\perltw.pod copy ..\README.vos ..\pod\perlvos.pod copy ..\README.win32 ..\pod\perlwin32.pod - copy ..\pod\perldelta.pod ..\pod\perl5331delta.pod + copy ..\pod\perldelta.pod ..\pod\perl710delta.pod $(MINIPERL) -I..\lib $(PL2BAT) $(UTILS) $(MINIPERL) -I..\lib ..\autodoc.pl .. $(MINIPERL) -I..\lib ..\pod\perlmodlib.PL -q .. @@ -1841,7 +1841,7 @@ distclean: realclean -if exist $(LIBDIR)\Win32API rmdir /s /q $(LIBDIR)\Win32API -if exist $(LIBDIR)\XS rmdir /s /q $(LIBDIR)\XS -cd $(PODDIR) && del /f *.html *.bat roffitall \ - perl5331delta.pod perlaix.pod perlamiga.pod perlandroid.pod \ + perl710delta.pod perlaix.pod perlamiga.pod perlandroid.pod \ perlapi.pod perlbs2000.pod perlcn.pod perlcygwin.pod \ perldos.pod perlfreebsd.pod perlhaiku.pod perlhpux.pod \ perlhurd.pod perlintern.pod perlirix.pod perljp.pod perlko.pod \ diff --git a/win32/Makefile b/win32/Makefile index 7598a90bddf5..32f9e776d693 100644 --- a/win32/Makefile +++ b/win32/Makefile @@ -5,7 +5,7 @@ # Windows SDK 64-bit compiler and tools # # This is set up to build a perl.exe that runs off a shared library -# (perl533.dll). Also makes individual DLLs for the XS extensions. +# (perl71.dll). Also makes individual DLLs for the XS extensions. # ## @@ -38,7 +38,7 @@ INST_TOP = $(INST_DRV)\perl # versioned installation can be obtained by setting INST_TOP above to a # path that includes an arbitrary version string. # -#INST_VER = \5.33.1 +#INST_VER = \7.1.0 # # Comment this out if you DON'T want your perl installation to have @@ -191,7 +191,7 @@ DEFAULT_INC_EXCLUDES_DOT = define # set this to additionally provide a statically linked perl-static.exe. # Note that dynamic loading will not work with this perl, so you must # include required modules statically using the STATIC_EXT or ALL_STATIC -# variables below. A static library perl533s.lib will also be created. +# variables below. A static library perl71s.lib will also be created. # Ordinary perl.exe is not affected by this option. # #BUILD_STATIC = define @@ -665,9 +665,9 @@ $(o).dll: # makedef.pl must be updated if this changes, and this should normally # only change when there is an incompatible revision of the public API. -PERLIMPLIB = ..\perl533.lib -PERLSTATICLIB = ..\perl533s.lib -PERLDLL = ..\perl533.dll +PERLIMPLIB = ..\perl71.lib +PERLSTATICLIB = ..\perl71s.lib +PERLDLL = ..\perl71.dll MINIPERL = ..\miniperl.exe MINIDIR = .\mini @@ -1263,7 +1263,7 @@ utils: $(PERLEXE) ..\utils\Makefile copy ..\README.tw ..\pod\perltw.pod copy ..\README.vos ..\pod\perlvos.pod copy ..\README.win32 ..\pod\perlwin32.pod - copy ..\pod\perldelta.pod ..\pod\perl5331delta.pod + copy ..\pod\perldelta.pod ..\pod\perl710delta.pod cd ..\win32 $(PERLEXE) $(PL2BAT) $(UTILS) $(MINIPERL) -I..\lib ..\autodoc.pl .. @@ -1362,7 +1362,7 @@ distclean: realclean -if exist $(LIBDIR)\Win32API rmdir /s /q $(LIBDIR)\Win32API -if exist $(LIBDIR)\XS rmdir /s /q $(LIBDIR)\XS -cd $(PODDIR) && del /f *.html *.bat roffitall \ - perl5331delta.pod perlaix.pod perlamiga.pod perlandroid.pod \ + perl710delta.pod perlaix.pod perlamiga.pod perlandroid.pod \ perlapi.pod perlbs2000.pod perlcn.pod perlcygwin.pod \ perldos.pod perlfreebsd.pod perlhaiku.pod perlhpux.pod \ perlhurd.pod perlintern.pod perlirix.pod perljp.pod perlko.pod \ diff --git a/win32/config.gc b/win32/config.gc index 793b455d0c07..9a088b695a41 100644 --- a/win32/config.gc +++ b/win32/config.gc @@ -946,10 +946,10 @@ orderlib='false' osname='MSWin32' osvers='4.0' otherlibdirs='' -package='perl5' +package='perl7' pager='more /e' passcat='' -patchlevel='~PERL_VERSION~' +patchlevel='~PERL_VERSION_MINOR~' path_sep=';' perl5='' perl='perl' @@ -1082,7 +1082,7 @@ stdio_stream_array='' strerror_r_proto='0' strings='/usr/include/string.h' submit='' -subversion='~PERL_SUBVERSION~' +subversion='~PERL_VERSION_PATCH~' sysman='/usr/man/man1' tail='' tar='' @@ -1182,9 +1182,9 @@ yacc='yacc' yaccflags='' zcat='' zip='zip' -PERL_REVISION='~PERL_REVISION~' -PERL_SUBVERSION='~PERL_SUBVERSION~' -PERL_VERSION='~PERL_VERSION~' +PERL_VERSION_MAJOR='~PERL_VERSION_MAJOR~' +PERL_VERSION_PATCH='~PERL_VERSION_PATCH~' +PERL_VERSION_MINOR='~PERL_VERSION_MINOR~' PERL_API_REVISION='~PERL_API_REVISION~' PERL_API_SUBVERSION='~PERL_API_SUBVERSION~' PERL_API_VERSION='~PERL_API_VERSION~' diff --git a/win32/config.vc b/win32/config.vc index a2c3f5a53d94..87f01736747b 100644 --- a/win32/config.vc +++ b/win32/config.vc @@ -945,10 +945,10 @@ orderlib='false' osname='MSWin32' osvers='4.0' otherlibdirs='' -package='perl5' +package='perl7' pager='more /e' passcat='' -patchlevel='~PERL_VERSION~' +patchlevel='~PERL_VERSION_MINOR~' path_sep=';' perl5='' perl='perl' @@ -1081,7 +1081,7 @@ stdio_stream_array='' strerror_r_proto='0' strings='/usr/include/string.h' submit='' -subversion='~PERL_SUBVERSION~' +subversion='~PERL_VERSION_PATCH~' sysman='/usr/man/man1' tail='' tar='' @@ -1181,9 +1181,9 @@ yacc='yacc' yaccflags='' zcat='' zip='zip' -PERL_REVISION='~PERL_REVISION~' -PERL_SUBVERSION='~PERL_SUBVERSION~' -PERL_VERSION='~PERL_VERSION~' +PERL_VERSION_MAJOR='~PERL_VERSION_MAJOR~' +PERL_VERSION_PATCH='~PERL_VERSION_PATCH~' +PERL_VERSION_MINOR='~PERL_VERSION_MINOR~' PERL_API_REVISION='~PERL_API_REVISION~' PERL_API_SUBVERSION='~PERL_API_SUBVERSION~' PERL_API_VERSION='~PERL_API_VERSION~' diff --git a/win32/config_sh.PL b/win32/config_sh.PL index bffd4ecf9fee..ed56e42d51cb 100644 --- a/win32/config_sh.PL +++ b/win32/config_sh.PL @@ -79,8 +79,8 @@ if (-e $patch_file) { close $fh; } -$opt{version} = "$opt{PERL_REVISION}.$opt{PERL_VERSION}.$opt{PERL_SUBVERSION}"; -$opt{version_patchlevel_string} = "version $opt{PERL_VERSION} subversion $opt{PERL_SUBVERSION}"; +$opt{version} = "$opt{PERL_VERSION_MAJOR}.$opt{PERL_VERSION_MINOR}.$opt{PERL_VERSION_PATCH}"; +$opt{version_patchlevel_string} = "version $opt{PERL_VERSION_MINOR} subversion $opt{PERL_VERSION_PATCH}"; $opt{version_patchlevel_string} .= " patch $opt{PERL_PATCHLEVEL}" if exists $opt{PERL_PATCHLEVEL}; my $ver = `ver 2>nul`; diff --git a/win32/makefile.mk b/win32/makefile.mk index 67c90347f0d3..5c8a266cac16 100644 --- a/win32/makefile.mk +++ b/win32/makefile.mk @@ -7,7 +7,7 @@ # Windows SDK 64-bit compiler and tools # # This is set up to build a perl.exe that runs off a shared library -# (perl533.dll). Also makes individual DLLs for the XS extensions. +# (perl71.dll). Also makes individual DLLs for the XS extensions. # ## @@ -45,7 +45,7 @@ INST_TOP *= $(INST_DRV)\perl # versioned installation can be obtained by setting INST_TOP above to a # path that includes an arbitrary version string. # -#INST_VER *= \5.33.1 +#INST_VER *= \7.1.0 # # Comment this out if you DON'T want your perl installation to have @@ -220,7 +220,7 @@ DEFAULT_INC_EXCLUDES_DOT *= define # set this to additionally provide a statically linked perl-static.exe. # Note that dynamic loading will not work with this perl, so you must # include required modules statically using the STATIC_EXT or ALL_STATIC -# variables below. A static library perl533s.lib will also be created. +# variables below. A static library perl71s.lib will also be created. # Ordinary perl.exe is not affected by this option. # #BUILD_STATIC *= define @@ -950,8 +950,8 @@ UTILS = \ CFGSH_TMPL = config.gc CFGH_TMPL = config_H.gc -PERLIMPLIB = $(COREDIR)\libperl533$(a) -PERLSTATICLIB = ..\libperl533s$(a) +PERLIMPLIB = $(COREDIR)\libperl71$(a) +PERLSTATICLIB = ..\libperl71s$(a) INT64 = long long .ELSE @@ -964,11 +964,11 @@ INT64 = __int64 # makedef.pl must be updated if this changes, and this should normally # only change when there is an incompatible revision of the public API. -PERLIMPLIB *= $(COREDIR)\perl533$(a) -PERLEXPLIB *= $(COREDIR)\perl533.exp -PERLSTATICLIB *= ..\perl533s$(a) -PERLDLL = ..\perl533.dll -PERLDLLBASE = perl533.dll +PERLIMPLIB *= $(COREDIR)\perl71$(a) +PERLEXPLIB *= $(COREDIR)\perl71.exp +PERLSTATICLIB *= ..\perl71s$(a) +PERLDLL = ..\perl71.dll +PERLDLLBASE = perl71.dll #EUMM on Win32 isn't ready for parallel make, so only allow this file to be parallel #$(MAKE) will contain the -P that this makefile was called with, which is bad for @@ -1662,7 +1662,7 @@ utils: $(HAVEMINIPERL) ..\utils\Makefile copy ..\README.tw ..\pod\perltw.pod copy ..\README.vos ..\pod\perlvos.pod copy ..\README.win32 ..\pod\perlwin32.pod - copy ..\pod\perldelta.pod ..\pod\perl5331delta.pod + copy ..\pod\perldelta.pod ..\pod\perl710delta.pod $(MINIPERL) -I..\lib $(PL2BAT) $(UTILS) $(MINIPERL) -I..\lib ..\autodoc.pl .. $(MINIPERL) -I..\lib ..\pod\perlmodlib.PL -q .. @@ -1760,7 +1760,7 @@ distclean: realclean -if exist $(LIBDIR)\Win32API rmdir /s /q $(LIBDIR)\Win32API -if exist $(LIBDIR)\XS rmdir /s /q $(LIBDIR)\XS -cd $(PODDIR) && del /f *.html *.bat roffitall \ - perl5331delta.pod perlaix.pod perlamiga.pod perlandroid.pod \ + perl710delta.pod perlaix.pod perlamiga.pod perlandroid.pod \ perlapi.pod perlbs2000.pod perlcn.pod perlcygwin.pod \ perldos.pod perlfreebsd.pod perlhaiku.pod perlhpux.pod \ perlhurd.pod perlintern.pod perlirix.pod perljp.pod perlko.pod \ diff --git a/win32/pod.mak b/win32/pod.mak index ece3805378c6..0fc9fbf627f7 100644 --- a/win32/pod.mak +++ b/win32/pod.mak @@ -64,7 +64,6 @@ POD = perl.pod \ perl5303delta.pod \ perl5320delta.pod \ perl5330delta.pod \ - perl5331delta.pod \ perl561delta.pod \ perl56delta.pod \ perl581delta.pod \ @@ -77,6 +76,7 @@ POD = perl.pod \ perl588delta.pod \ perl589delta.pod \ perl58delta.pod \ + perl710delta.pod \ perlapi.pod \ perlapio.pod \ perlartistic.pod \ @@ -224,7 +224,6 @@ MAN = perl.man \ perl5303delta.man \ perl5320delta.man \ perl5330delta.man \ - perl5331delta.man \ perl561delta.man \ perl56delta.man \ perl581delta.man \ @@ -237,6 +236,7 @@ MAN = perl.man \ perl588delta.man \ perl589delta.man \ perl58delta.man \ + perl710delta.man \ perlapi.man \ perlapio.man \ perlartistic.man \ @@ -384,7 +384,6 @@ HTML = perl.html \ perl5303delta.html \ perl5320delta.html \ perl5330delta.html \ - perl5331delta.html \ perl561delta.html \ perl56delta.html \ perl581delta.html \ @@ -397,6 +396,7 @@ HTML = perl.html \ perl588delta.html \ perl589delta.html \ perl58delta.html \ + perl710delta.html \ perlapi.html \ perlapio.html \ perlartistic.html \ @@ -544,7 +544,6 @@ TEX = perl.tex \ perl5303delta.tex \ perl5320delta.tex \ perl5330delta.tex \ - perl5331delta.tex \ perl561delta.tex \ perl56delta.tex \ perl581delta.tex \ @@ -557,6 +556,7 @@ TEX = perl.tex \ perl588delta.tex \ perl589delta.tex \ perl58delta.tex \ + perl710delta.tex \ perlapi.tex \ perlapio.tex \ perlartistic.tex \ diff --git a/win32/win32.c b/win32/win32.c index 9719f14fa381..ad2304905ce8 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -331,7 +331,7 @@ get_emd_part(SV **prev_pathp, STRLEN *const len, char *trailing_path, ...) va_start(ap, trailing_path); strip = va_arg(ap, char *); - sprintf(base, "%d.%d", (int)PERL_REVISION, (int)PERL_VERSION); + sprintf(base, "%d.%d", (int)PERL_VERSION_MAJOR, (int)PERL_VERSION_MINOR); baselen = strlen(base); if (!*w32_module_name) {