X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/69df4abc7c8a05e1b705134bf772dc9c44d92dd6..1f0ad55202b6a90c2d0d9203897077cee51da114:/patchlevel.h diff --git a/patchlevel.h b/patchlevel.h index aea4c2f..1bfcf37 100644 --- a/patchlevel.h +++ b/patchlevel.h @@ -1,7 +1,7 @@ /* patchlevel.h * - * Copyright (C) 1993, 1995, 1996, 1997, 1998, 1999, - * 2000, 2001, 2002, 2003, 2004, by Larry Wall and others + * Copyright (C) 1993, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, + * 2003, 2004, 2005, 2006, 2007, 2008, 2009, by Larry Wall and others * * You may distribute under the terms of either the GNU General Public * License or the Artistic License, as specified in the README file. @@ -14,8 +14,8 @@ * exactly on the third column */ #define PERL_REVISION 5 /* age */ -#define PERL_VERSION 9 /* epoch */ -#define PERL_SUBVERSION 3 /* generation */ +#define PERL_VERSION 19 /* epoch */ +#define PERL_SUBVERSION 2 /* generation */ /* The following numbers describe the earliest compatible version of Perl ("compatibility" here being defined as sufficient binary/API @@ -26,13 +26,17 @@ options such as usemultiplicity tend to break binary compatibility more often. - This is used by Configure et al to figure out + This is used by Configure et al to figure out PERL_INC_VERSION_LIST, which lists version libraries to include in @INC. See INSTALL for how this works. + + Porting/bump-perl-version will automatically set these to the version of perl + 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 /* Adjust manually as needed. */ -#define PERL_API_VERSION 9 /* Adjust manually as needed. */ -#define PERL_API_SUBVERSION 2 /* Adjust manually as needed. */ +#define PERL_API_REVISION 5 +#define PERL_API_VERSION 19 +#define PERL_API_SUBVERSION 2 /* XXX Note: The selection of non-default Configure options, such as -Duselonglong may invalidate these settings. Currently, Configure @@ -66,8 +70,8 @@ + ,"MINE001 - my new patch" ,NULL }; - - please change it to + + please change it to *** patchlevel.h.orig --- patchlevel.h *** 41,43 *** @@ -75,7 +79,7 @@ + ,"MINE001 - my new patch" ,NULL }; - + (Note changes to line numbers as well as removal of context lines.) This will prevent patch from choking if someone has previously applied different patches than you. @@ -92,6 +96,8 @@ my $seen=0; while () { if (/\t,NULL/ and $seen) { while (my $c = shift @ARGV){ + $c =~ s|\\|\\\\|g; + $c =~ s|"|\\"|g; print PLOUT qq{\t,"$c"\n}; } } @@ -100,6 +106,7 @@ while () { } close PLOUT or die "Couldn't close filehandle writing to patchlevel.new : $!"; close PLIN or die "Couldn't close filehandle reading from patchlevel.h : $!"; +close DATA; # needed to allow unlink to work win32. unlink "patchlevel.bak" or warn "Couldn't unlink patchlevel.bak : $!" if -e "patchlevel.bak"; rename "patchlevel.h", "patchlevel.bak" or @@ -114,13 +121,22 @@ hunk. */ - - - #if !defined(PERL_PATCHLEVEL_H_IMPLICIT) && !defined(LOCAL_PATCH_COUNT) -static const char *local_patches[] = { +# if defined(PERL_IS_MINIPERL) +# define PERL_PATCHNUM "UNKNOWN-miniperl" +# define PERL_GIT_UNPUSHED_COMMITS /*leave-this-comment*/ +# elif defined(PERL_MICRO) +# define PERL_PATCHNUM "UNKNOWN-microperl" +# define PERL_GIT_UNPUSHED_COMMITS /*leave-this-comment*/ +# else +#include "git_version.h" +# endif +static const char * const local_patches[] = { NULL - ,'DEVEL24148' +#ifdef PERL_GIT_UNCOMMITTED_CHANGES + ,"uncommitted-changes" +#endif + PERL_GIT_UNPUSHED_COMMITS /* do not remove this line */ ,NULL }; @@ -128,7 +144,7 @@ static const char *local_patches[] = { /* Initial space prevents this variable from being inserted in config.sh */ # define LOCAL_PATCH_COUNT \ - (sizeof(local_patches)/sizeof(local_patches[0])-2) + ((int)(sizeof(local_patches)/sizeof(local_patches[0])-2)) /* the old terms of reference, add them only when explicitly included */ #define PATCHLEVEL PERL_VERSION