Backed out updated libcurl.
This commit is contained in:
@@ -1,72 +0,0 @@
|
||||
# ***************************************************************************
|
||||
# * _ _ ____ _
|
||||
# * Project ___| | | | _ \| |
|
||||
# * / __| | | | |_) | |
|
||||
# * | (__| |_| | _ <| |___
|
||||
# * \___|\___/|_| \_\_____|
|
||||
# *
|
||||
# * Copyright (C) 1998 - 2012, Daniel Stenberg, <[email protected]>, et al.
|
||||
# *
|
||||
# * This software is licensed as described in the file COPYING, which
|
||||
# * you should have received as part of this distribution. The terms
|
||||
# * are also available at http://curl.haxx.se/docs/copyright.html.
|
||||
# *
|
||||
# * You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
||||
# * copies of the Software, and permit persons to whom the Software is
|
||||
# * furnished to do so, under the terms of the COPYING file.
|
||||
# *
|
||||
# * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
||||
# * KIND, either express or implied.
|
||||
# *
|
||||
# ***************************************************************************
|
||||
# awk script which fetches curl function symbols from public header input
|
||||
# files and write them to STDOUT. Here you can get an awk version for Win32:
|
||||
# http://www.gknw.net/development/prgtools/awk-20100523.zip
|
||||
#
|
||||
BEGIN {
|
||||
add_symbol("curl_strequal")
|
||||
add_symbol("curl_strnequal")
|
||||
}
|
||||
|
||||
function add_symbol(sym_name) {
|
||||
sub(" ", "", sym_name)
|
||||
exports[++idx] = sym_name
|
||||
}
|
||||
|
||||
|
||||
/^CURL_EXTERN .* [*]?curl_.*[(]/ {
|
||||
sub("[(].*", "")
|
||||
sub("^.* ", "")
|
||||
sub("^[*]", "")
|
||||
add_symbol($0)
|
||||
}
|
||||
|
||||
END {
|
||||
printf("Added %d symbols to export list.\n", idx) > "/dev/stderr"
|
||||
# sort symbols with shell sort
|
||||
increment = int(idx / 2)
|
||||
while (increment > 0) {
|
||||
for (i = increment+1; i <= idx; i++) {
|
||||
j = i
|
||||
temp = exports[i]
|
||||
while ((j >= increment+1) && (exports[j-increment] > temp)) {
|
||||
exports[j] = exports[j-increment]
|
||||
j -= increment
|
||||
}
|
||||
exports[j] = temp
|
||||
}
|
||||
if (increment == 2)
|
||||
increment = 1
|
||||
else
|
||||
increment = int(increment*5/11)
|
||||
}
|
||||
# print the array
|
||||
if (EXPPREFIX) {
|
||||
printf(" (%s)\n", EXPPREFIX)
|
||||
}
|
||||
while (x < idx - 1) {
|
||||
printf(" %s,\n", exports[++x])
|
||||
}
|
||||
printf(" %s\n", exports[++x])
|
||||
}
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
# * | (__| |_| | _ <| |___
|
||||
# * \___|\___/|_| \_\_____|
|
||||
# *
|
||||
# * Copyright (C) 1998 - 2012, Daniel Stenberg, <[email protected]>, et al.
|
||||
# * Copyright (C) 1998 - 2008, Daniel Stenberg, <[email protected]>, et al.
|
||||
# *
|
||||
# * This software is licensed as described in the file COPYING, which
|
||||
# * you should have received as part of this distribution. The terms
|
||||
@@ -18,27 +18,59 @@
|
||||
# * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
||||
# * KIND, either express or implied.
|
||||
# *
|
||||
# * $Id: get_ver.awk,v 1.7 2008-01-24 15:39:51 gknauf Exp $
|
||||
# ***************************************************************************
|
||||
# awk script which fetches curl version number and copyright string from input
|
||||
# awk script which fetches curl / ares version number and string from input
|
||||
# file and writes them to STDOUT. Here you can get an awk version for Win32:
|
||||
# http://www.gknw.net/development/prgtools/awk-20100523.zip
|
||||
# http://www.gknw.net/development/prgtools/awk-20070501.zip
|
||||
#
|
||||
BEGIN {
|
||||
while ((getline < ARGV[1]) > 0) {
|
||||
sub("\r", "") # make MSYS gawk work with CRLF header input.
|
||||
if (match ($0, /^#define LIBCURL_COPYRIGHT "([^"]+)"$/))
|
||||
copyright_string = substr($0, 28, length($0)-28)
|
||||
else if (match ($0, /^#define LIBCURL_VERSION "[^"]+"$/))
|
||||
version_string = substr($3, 2, length($3)-2)
|
||||
else if (match ($0, /^#define LIBCURL_VERSION_MAJOR [0-9]+$/))
|
||||
version_major = $3
|
||||
else if (match ($0, /^#define LIBCURL_VERSION_MINOR [0-9]+$/))
|
||||
version_minor = $3
|
||||
else if (match ($0, /^#define LIBCURL_VERSION_PATCH [0-9]+$/))
|
||||
version_patch = $3
|
||||
if (match (ARGV[1], /curlver.h/)) {
|
||||
while ((getline < ARGV[1]) > 0) {
|
||||
if (match ($0, /^#define LIBCURL_COPYRIGHT "[^"]+"$/)) {
|
||||
libcurl_copyright_str = substr($0, 28, length($0)-28);
|
||||
}
|
||||
else if (match ($0, /^#define LIBCURL_VERSION "[^"]+"$/)) {
|
||||
libcurl_ver_str = substr($3, 2, length($3)-2);
|
||||
}
|
||||
else if (match ($0, /^#define LIBCURL_VERSION_MAJOR [0-9]+$/)) {
|
||||
libcurl_ver_major = substr($3, 1, length($3));
|
||||
}
|
||||
else if (match ($0, /^#define LIBCURL_VERSION_MINOR [0-9]+$/)) {
|
||||
libcurl_ver_minor = substr($3, 1, length($3));
|
||||
}
|
||||
else if (match ($0, /^#define LIBCURL_VERSION_PATCH [0-9]+$/)) {
|
||||
libcurl_ver_patch = substr($3, 1, length($3));
|
||||
}
|
||||
}
|
||||
libcurl_ver = libcurl_ver_major "," libcurl_ver_minor "," libcurl_ver_patch;
|
||||
print "LIBCURL_VERSION = " libcurl_ver "";
|
||||
print "LIBCURL_VERSION_STR = " libcurl_ver_str "";
|
||||
print "LIBCURL_COPYRIGHT_STR = " libcurl_copyright_str "";
|
||||
}
|
||||
if (match (ARGV[1], /ares_version.h/)) {
|
||||
while ((getline < ARGV[1]) > 0) {
|
||||
if (match ($0, /^#define ARES_COPYRIGHT "[^"]+"$/)) {
|
||||
libcares_copyright_str = substr($0, 25, length($0)-25);
|
||||
}
|
||||
else if (match ($0, /^#define ARES_VERSION_STR "[^"]+"$/)) {
|
||||
libcares_ver_str = substr($3, 2, length($3)-2);
|
||||
}
|
||||
else if (match ($0, /^#define ARES_VERSION_MAJOR [0-9]+$/)) {
|
||||
libcares_ver_major = substr($3, 1, length($3));
|
||||
}
|
||||
else if (match ($0, /^#define ARES_VERSION_MINOR [0-9]+$/)) {
|
||||
libcares_ver_minor = substr($3, 1, length($3));
|
||||
}
|
||||
else if (match ($0, /^#define ARES_VERSION_PATCH [0-9]+$/)) {
|
||||
libcares_ver_patch = substr($3, 1, length($3));
|
||||
}
|
||||
}
|
||||
libcares_ver = libcares_ver_major "," libcares_ver_minor "," libcares_ver_patch;
|
||||
print "LIBCARES_VERSION = " libcares_ver "";
|
||||
print "LIBCARES_VERSION_STR = " libcares_ver_str "";
|
||||
print "LIBCARES_COPYRIGHT_STR = " libcares_copyright_str "";
|
||||
}
|
||||
print "LIBCURL_VERSION = " version_major "," version_minor "," version_patch
|
||||
print "LIBCURL_VERSION_STR = " version_string
|
||||
print "LIBCURL_COPYRIGHT_STR = " copyright_string
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user