diff options
Diffstat (limited to 'src/3rdparty/freetype/src/tools')
| -rw-r--r-- | src/3rdparty/freetype/src/tools/afblue.pl | 2 | ||||
| -rw-r--r-- | src/3rdparty/freetype/src/tools/apinames.c | 22 | ||||
| -rwxr-xr-x | src/3rdparty/freetype/src/tools/chktrcmp.py | 4 | ||||
| -rw-r--r-- | src/3rdparty/freetype/src/tools/ftrandom/ftrandom.c | 2 | ||||
| -rw-r--r-- | src/3rdparty/freetype/src/tools/glnames.py | 2 | ||||
| -rw-r--r-- | src/3rdparty/freetype/src/tools/no-copyright | 4 | ||||
| -rwxr-xr-x | src/3rdparty/freetype/src/tools/update-copyright-year | 65 |
7 files changed, 68 insertions, 33 deletions
diff --git a/src/3rdparty/freetype/src/tools/afblue.pl b/src/3rdparty/freetype/src/tools/afblue.pl index bbc4f472c9..f4f3845e7a 100644 --- a/src/3rdparty/freetype/src/tools/afblue.pl +++ b/src/3rdparty/freetype/src/tools/afblue.pl @@ -5,7 +5,7 @@ # # Process a blue zone character data file. # -# Copyright (C) 2013-2020 by +# Copyright (C) 2013-2022 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, diff --git a/src/3rdparty/freetype/src/tools/apinames.c b/src/3rdparty/freetype/src/tools/apinames.c index aeecf88d22..8a8b0822b1 100644 --- a/src/3rdparty/freetype/src/tools/apinames.c +++ b/src/3rdparty/freetype/src/tools/apinames.c @@ -22,7 +22,7 @@ #include <ctype.h> #define PROGRAM_NAME "apinames" -#define PROGRAM_VERSION "0.3" +#define PROGRAM_VERSION "0.4" #define LINEBUFF_SIZE 1024 @@ -33,6 +33,7 @@ typedef enum OutputFormat_ OUTPUT_WINDOWS_DEF, /* output a Windows .DEF file for Visual C++ or Mingw */ OUTPUT_BORLAND_DEF, /* output a Windows .DEF file for Borland C++ */ OUTPUT_WATCOM_LBC, /* output a Watcom Linker Command File */ + OUTPUT_VMS_OPT, /* output an OpenVMS Linker Option File */ OUTPUT_NETWARE_IMP, /* output a NetWare ImportFile */ OUTPUT_GNU_VERMAP /* output a version map for GNU or Solaris linker */ @@ -167,7 +168,6 @@ names_dump( FILE* out, case OUTPUT_WATCOM_LBC: { const char* dot; - char temp[512]; if ( !dll_name ) @@ -181,7 +181,8 @@ names_dump( FILE* out, dot = strchr( dll_name, '.' ); if ( dot ) { - int len = dot - dll_name; + char temp[512]; + int len = dot - dll_name; if ( len > (int)( sizeof ( temp ) - 1 ) ) @@ -200,6 +201,16 @@ names_dump( FILE* out, break; + case OUTPUT_VMS_OPT: + fprintf( out, "GSMATCH=LEQUAL,2,0\n" + "CASE_SENSITIVE=YES\n" + "SYMBOL_VECTOR=(-\n" ); + for ( nn = 0; nn < num_names - 1; nn++ ) + fprintf( out, " %s=PROCEDURE,-\n", the_names[nn].name ); + fprintf( out, " %s=PROCEDURE)\n", the_names[num_names - 1].name ); + + break; + case OUTPUT_NETWARE_IMP: if ( dll_name ) fprintf( out, " (%s)\n", dll_name ); @@ -352,6 +363,7 @@ usage( void ) " -w output .DEF file for Visual C++ and Mingw\n" " -wB output .DEF file for Borland C++\n" " -wW output Watcom Linker Response File\n" + " -wV output OpenVMS Linker Options File\n" " -wN output NetWare Import File\n" " -wL output version map for GNU or Solaris linker\n" "\n"; @@ -445,6 +457,10 @@ main( int argc, format = OUTPUT_WATCOM_LBC; break; + case 'V': + format = OUTPUT_VMS_OPT; + break; + case 'N': format = OUTPUT_NETWARE_IMP; break; diff --git a/src/3rdparty/freetype/src/tools/chktrcmp.py b/src/3rdparty/freetype/src/tools/chktrcmp.py index 4c40bdafdb..244a24a6c3 100755 --- a/src/3rdparty/freetype/src/tools/chktrcmp.py +++ b/src/3rdparty/freetype/src/tools/chktrcmp.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # # Check trace components in FreeType 2 source. -# Author: suzuki toshiya, 2009, 2013 +# Author: suzuki toshiya, 2009, 2013, 2020 # # This code is explicitly into the public domain. @@ -50,7 +50,7 @@ for i in range( 1, len( sys.argv ) ): # c_pathname_pat = re.compile( '^.*\.[ch]$', re.IGNORECASE ) -trace_use_pat = re.compile( '^[ \t]*#define[ \t]+FT_COMPONENT[ \t]+trace_' ) +trace_use_pat = re.compile( '^[ \t]*#define[ \t]+FT_COMPONENT[ \t]+' ) for d in SRC_FILE_DIRS: for ( p, dlst, flst ) in os.walk( d ): diff --git a/src/3rdparty/freetype/src/tools/ftrandom/ftrandom.c b/src/3rdparty/freetype/src/tools/ftrandom/ftrandom.c index ab62429787..4f912cd21d 100644 --- a/src/3rdparty/freetype/src/tools/ftrandom/ftrandom.c +++ b/src/3rdparty/freetype/src/tools/ftrandom/ftrandom.c @@ -29,7 +29,7 @@ /* This file is now part of the FreeType library */ -#define _XOPEN_SOURCE 500 /* for `kill', `strdup', `random', and `srandom' */ +#define _XOPEN_SOURCE 600 /* for `kill', `strdup', `random', and `srandom' */ #include <stdio.h> diff --git a/src/3rdparty/freetype/src/tools/glnames.py b/src/3rdparty/freetype/src/tools/glnames.py index a19ce178b8..ad7786d291 100644 --- a/src/3rdparty/freetype/src/tools/glnames.py +++ b/src/3rdparty/freetype/src/tools/glnames.py @@ -6,7 +6,7 @@ # -# Copyright (C) 1996-2020 by +# Copyright (C) 1996-2022 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/src/3rdparty/freetype/src/tools/no-copyright b/src/3rdparty/freetype/src/tools/no-copyright index d639aa4a84..1eaa630967 100644 --- a/src/3rdparty/freetype/src/tools/no-copyright +++ b/src/3rdparty/freetype/src/tools/no-copyright @@ -7,8 +7,6 @@ # # Don't put empty lines into this file! # -.gitignore -# builds/unix/pkg.m4 # docs/FTL.TXT @@ -62,4 +60,6 @@ src/gzip/zutil.h src/tools/apinames.c src/tools/ftrandom/ftrandom.c # +subprojects/dlg +# # EOF diff --git a/src/3rdparty/freetype/src/tools/update-copyright-year b/src/3rdparty/freetype/src/tools/update-copyright-year index c659bbafb8..f699db76e9 100755 --- a/src/3rdparty/freetype/src/tools/update-copyright-year +++ b/src/3rdparty/freetype/src/tools/update-copyright-year @@ -2,7 +2,7 @@ eval '(exit $?0)' && eval 'exec perl -wS -i "$0" ${1+"$@"}' & eval 'exec perl -wS -i "$0" $argv:q' if 0; -# Copyright (C) 2015-2020 by +# Copyright (C) 2015-2022 by # Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, @@ -28,20 +28,20 @@ eval '(exit $?0)' && eval 'exec perl -wS -i "$0" ${1+"$@"}' # # or # -# /* Copyright 2000, 2001, 2004-2007 by */ -# /* foobar */ +# /* Copyright (c) 2000, 2001, 2004-2007 by */ +# /* foobar */ # # and replaces them uniformly with # -# Copyright 2000-2015 +# Copyright (C) 2000-2021 # foobar # # and # -# /* Copyright 2000-2015 by */ -# /* foobar */ +# /* Copyright (C) 2000-2021 by */ +# /* foobar */ # -# (assuming that the current year is 2015). As can be seen, the line length +# (assuming that the current year is 2021). As can be seen, the line length # is retained if there is non-whitespace after the word `by' on the same # line. @@ -80,11 +80,11 @@ while (<>) { # Fill line to the same length (if appropriate); we skip the middle # part but insert `(C)', three spaces, and `-'. - my $space = length($+{space1}) - 1 - + length($+{middle}) - 1 - + length($+{space2}) - 1 + my $space = length($+{space1}) + + length($+{middle}) + + length($+{space2}) + length($+{space3}) - - (length("(C)") + 1); + - (length("(C)") + 3 + 1); print "$+{begin}"; print "Copyright\ (C)\ $+{first}-$year\ by"; @@ -106,19 +106,38 @@ while (<>) (?<end>.*) } { - # Fill line to the same length (if appropriate); we insert three - # spaces, a `-', and the current year. - my $space = length($+{space1}) - 1 - + length($+{space2}) - 1 - + length($+{space3}) - - (length($year) + 1); + if ($+{first} < $year) + { + # Fill line to the same length (if appropriate); we insert three + # spaces, the string `(C)', a `-', and the current year. + my $space = length($+{space1}) + + length($+{space2}) + + length($+{space3}) + - (length($year) + length("(C)") + 3 + 1); - print "$+{begin}"; - print "Copyright\ (C)\ $+{first}-$year\ by"; - # If $space is negative this inserts nothing. - print ' ' x $space if length($+{end}); - print "$+{end}\n"; - $replaced = 1; + print "$+{begin}"; + print "Copyright\ (C)\ $+{first}-$year\ by"; + # If $space is negative this inserts nothing. + print ' ' x $space if length($+{end}); + print "$+{end}\n"; + $replaced = 1; + } + else + { + # Fill line to the same length (if appropriate); we insert three + # spaces and the string `(C)'. + my $space = length($+{space1}) + + length($+{space2}) + + length($+{space3}) + - (length("(C)") + 3); + + print "$+{begin}"; + print "Copyright\ (C)\ $+{first}\ by"; + # If $space is negative this inserts nothing. + print ' ' x $space if length($+{end}); + print "$+{end}\n"; + $replaced = 1; + } }ex || # Otherwise print line unaltered. |