romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-24 17:53:33 +03:00
Code Issues Projects Releases Packages Wiki Activity

includes: remove curl/curlbuild.h and curl/curlrules.h

Browse source 
Rely entirely on curl/system.h now.

Introduced in Aug 2008 with commit 14240e9e10. Now gone.

Fixes #1456
This commit is contained in:
Daniel Stenberg 2017-05-22 09:05:10 +02:00
parent 54b636f145
commit 73a2fcea0b
46 changed files with 390 additions and 1997 deletions
Download patch file Download diff file Expand all files Collapse all files

3
tests/data/Makefile.inc
View file

@ -164,8 +164,7 @@ test1520 test1521 \
\
test1525 test1526 test1527 test1528 test1529 test1530 test1531 test1532 \
test1533 test1534 test1535 test1536 test1537 test1538 \
test1540 test1541 \
\
test1540 \
test1600 test1601 test1602 test1603 test1604 test1605 test1606 \
\
test1700 test1701 test1702 \

22
tests/data/test1541
View file

@ -1,22 +0,0 @@
<testcase>
<info>
<keywords>
typecheck
</keywords>
</info>
#
# Client-side
<client>
<server>
none
</server>
<name>
verify curl/system.h detection
</name>
<tool>
lib1541
</tool>
</client>
</testcase>

2
tests/libtest/CMakeLists.txt
View file

@ -7,7 +7,7 @@ function(SETUP_TEST TEST_NAME) # ARGN are the files in the test
include_directories(
${CURL_SOURCE_DIR}/lib # To be able to reach "curl_setup_once.h"
${CURL_BINARY_DIR}/lib # To be able to reach "curl_config.h"
${CURL_BINARY_DIR}/include # To be able to reach "curl/curlbuild.h"
${CURL_BINARY_DIR}/include # To be able to reach "curl/curl.h"
)
if(USE_ARES)
include_directories(${CARES_INCLUDE_DIR})

10
tests/libtest/Makefile.am
View file

@ -26,8 +26,6 @@ AUTOMAKE_OPTIONS = foreign nostdinc
# being currently built and tested are searched before the library which
# might possibly already be installed in the system.
#
# $(top_builddir)/include/curl for generated curlbuild.h included from curl.h
# $(top_builddir)/include for generated curlbuild.h inc. from lib/curl_setup.h
# $(top_srcdir)/include is for libcurl's external include files
# $(top_builddir)/lib is for libcurl's generated lib/curl_config.h file
# $(top_srcdir)/lib for libcurl's lib/curl_setup.h and other "borrowed" files
@ -35,17 +33,13 @@ AUTOMAKE_OPTIONS = foreign nostdinc
# $(top_srcdir)/ares is for in-tree c-ares's external include files
if USE_EMBEDDED_ARES
AM_CPPFLAGS = -I$(top_builddir)/include/curl \
-I$(top_builddir)/include \
-I$(top_srcdir)/include \
AM_CPPFLAGS = -I$(top_srcdir)/include \
-I$(top_builddir)/lib \
-I$(top_srcdir)/lib \
-I$(top_builddir)/ares \
-I$(top_srcdir)/ares
else
AM_CPPFLAGS = -I$(top_builddir)/include/curl \
-I$(top_builddir)/include \
-I$(top_srcdir)/include \
AM_CPPFLAGS = -I$(top_srcdir)/include \
-I$(top_builddir)/lib \
-I$(top_srcdir)/lib
endif

6
tests/libtest/Makefile.inc
View file

@ -25,7 +25,7 @@ noinst_PROGRAMS = chkhostname libauthretry libntlmconnect \
lib1520 lib1521 \
lib1525 lib1526 lib1527 lib1528 lib1529 lib1530 lib1531 lib1532 lib1533 \
lib1534 lib1535 lib1536 lib1537 lib1538 \
lib1540 lib1541 \
lib1540 \
lib1900 \
lib2033
@ -431,10 +431,6 @@ lib1540_SOURCES = lib1540.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
lib1540_LDADD = $(TESTUTIL_LIBS)
lib1540_CPPFLAGS = $(AM_CPPFLAGS)
lib1541_SOURCES = lib1541.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
lib1541_LDADD = $(TESTUTIL_LIBS)
lib1541_CPPFLAGS = $(AM_CPPFLAGS)
lib1900_SOURCES = lib1900.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
lib1900_LDADD = $(TESTUTIL_LIBS)
lib1900_CPPFLAGS = $(AM_CPPFLAGS)

129
tests/libtest/lib1541.c
View file

@ -1,129 +0,0 @@
/***************************************************************************
* _ _ ____ _
* Project ___| | | | _ \| |
* / __| | | | |_) | |
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
* Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, 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 https://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.
*
***************************************************************************/
#include "test.h"
#include "testutil.h"
#include "warnless.h"
#include "memdebug.h"
#define XSTR(x) #x
#define STRING(y) XSTR(y)
int test(char *URL)
{
char detect[512];
char syst[512];
const char *types_h = "No";
const char *socket_h = "No";
const char *ws2tcpip_h = "No";
const char *stypes_h = "No";
const char *ssocket_h = "No";
const char *sws2tcpip_h = "No";
(void)(URL);
#ifdef CURL_PULL_SYS_TYPES_H
types_h = "Yes";
#endif
#ifdef CURL_PULL_SYS_SOCKET_H
socket_h = "Yes";
#endif
#ifdef CURL_PULL_WS2TCPIP_H
ws2tcpip_h = "Yes";
#endif
snprintf(detect, sizeof(detect),
#ifdef CHECK_CURL_OFF_T
"CURL_TYPEOF_CURL_OFF_T: %s\n"
#endif
"CURL_FORMAT_CURL_OFF_T: %s\n"
"CURL_FORMAT_CURL_OFF_TU: %s\n"
"CURL_SUFFIX_CURL_OFF_T: %s\n"
"CURL_SUFFIX_CURL_OFF_TU: %s\n"
"CURL_SIZEOF_CURL_OFF_T: %d\n"
"CURL_SIZEOF_LONG: %d\n"
"CURL_TYPEOF_CURL_SOCKLEN_T: %s\n"
"CURL_PULL_SYS_TYPES_H: %s\n"
"CURL_PULL_SYS_SOCKET_H: %s\n"
"CURL_PULL_WS2TCPIP_H: %s\n"
#ifdef CHECK_CURL_OFF_T
, STRING(CURL_TYPEOF_CURL_OFF_T)
#endif
, CURL_FORMAT_CURL_OFF_T
, CURL_FORMAT_CURL_OFF_TU
, STRING(CURL_SUFFIX_CURL_OFF_T)
, STRING(CURL_SUFFIX_CURL_OFF_TU)
, CURL_SIZEOF_CURL_OFF_T
, CURL_SIZEOF_LONG
, STRING(CURL_TYPEOF_CURL_SOCKLEN_T)
, types_h
, socket_h
, ws2tcpip_h);
#ifdef CURLSYS_PULL_SYS_TYPES_H
stypes_h = "Yes";
#endif
#ifdef CURLSYS_PULL_SYS_SOCKET_H
ssocket_h = "Yes";
#endif
#ifdef CURLSYS_PULL_WS2TCPIP_H
sws2tcpip_h = "Yes";
#endif
snprintf(syst, sizeof(syst),
#ifdef CHECK_CURL_OFF_T
"CURL_TYPEOF_CURL_OFF_T: %s\n"
#endif
"CURL_FORMAT_CURL_OFF_T: %s\n"
"CURL_FORMAT_CURL_OFF_TU: %s\n"
"CURL_SUFFIX_CURL_OFF_T: %s\n"
"CURL_SUFFIX_CURL_OFF_TU: %s\n"
"CURL_SIZEOF_CURL_OFF_T: %d\n"
"CURL_SIZEOF_LONG: %d\n"
"CURL_TYPEOF_CURL_SOCKLEN_T: %s\n"
"CURL_PULL_SYS_TYPES_H: %s\n"
"CURL_PULL_SYS_SOCKET_H: %s\n"
"CURL_PULL_WS2TCPIP_H: %s\n"
#ifdef CHECK_CURL_OFF_T
, STRING(CURLSYS_TYPEOF_CURL_OFF_T)
#endif
, CURLSYS_FORMAT_CURL_OFF_T
, CURLSYS_FORMAT_CURL_OFF_TU
, STRING(CURLSYS_SUFFIX_CURL_OFF_T)
, STRING(CURLSYS_SUFFIX_CURL_OFF_TU)
, CURLSYS_SIZEOF_CURL_OFF_T
, CURLSYS_SIZEOF_LONG
, STRING(CURLSYS_TYPEOF_CURL_SOCKLEN_T)
, stypes_h
, ssocket_h
, sws2tcpip_h);
if(strcmp(detect, syst)) {
printf("===> Type detection failed <====\n");
printf("[Detected]\n%s", detect);
printf("[System]\n%s", syst);
return 1; /* FAIL! */
}
return 0;
}

2
tests/server/CMakeLists.txt
View file

@ -7,7 +7,7 @@ function(SETUP_EXECUTABLE TEST_NAME) # ARGN are the files in the test
include_directories(
${CURL_SOURCE_DIR}/lib # To be able to reach "curl_setup_once.h"
${CURL_BINARY_DIR}/lib # To be able to reach "curl_config.h"
${CURL_BINARY_DIR}/include # To be able to reach "curl/curlbuild.h"
${CURL_BINARY_DIR}/include # To be able to reach "curl/curl.h"
)
if(USE_ARES)
include_directories(${CARES_INCLUDE_DIR})

10
tests/server/Makefile.am
View file

@ -26,8 +26,6 @@ AUTOMAKE_OPTIONS = foreign nostdinc
# being currently built and tested are searched before the library which
# might possibly already be installed in the system.
#
# $(top_builddir)/include/curl for generated curlbuild.h included from curl.h
# $(top_builddir)/include for generated curlbuild.h inc. from lib/curl_setup.h
# $(top_srcdir)/include is for libcurl's external include files
# $(top_builddir)/lib is for libcurl's generated lib/curl_config.h file
# $(top_srcdir)/lib for libcurl's lib/curl_setup.h and other "borrowed" files
@ -35,17 +33,13 @@ AUTOMAKE_OPTIONS = foreign nostdinc
# $(top_srcdir)/ares is for in-tree c-ares's external include files
if USE_EMBEDDED_ARES
AM_CPPFLAGS = -I$(top_builddir)/include/curl \
-I$(top_builddir)/include \
-I$(top_srcdir)/include \
AM_CPPFLAGS = -I$(top_srcdir)/include \
-I$(top_builddir)/lib \
-I$(top_srcdir)/lib \
-I$(top_builddir)/ares \
-I$(top_srcdir)/ares
else
AM_CPPFLAGS = -I$(top_builddir)/include/curl \
-I$(top_builddir)/include \
-I$(top_srcdir)/include \
AM_CPPFLAGS = -I$(top_srcdir)/include \
-I$(top_builddir)/lib \
-I$(top_srcdir)/lib
endif

17
tests/testcurl.pl
View file

@ -6,7 +6,7 @@
# | (__| |_| | _ <| |___
# \___|\___/|_| \_\_____|
#
# Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al.
# Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al.
#
# This software is licensed as described in the file COPYING, which
# you should have received as part of this distribution. The terms
@ -588,7 +588,6 @@ if ($configurebuild) {
elsif ($^O eq 'linux') {
system("cp -afr $CURLDIR/* .");
system("cp -af $CURLDIR/Makefile.dist Makefile");
system("cp -af $CURLDIR/include/curl/curlbuild.h.dist ./include/curl/curlbuild.h");
system("$make -i -C lib -f Makefile.$targetos prebuild");
system("$make -i -C src -f Makefile.$targetos prebuild");
if (-d "$CURLDIR/ares") {
@ -609,20 +608,6 @@ if(-f "./libcurl.pc") {
}
}
if(-f "./include/curl/curlbuild.h") {
logit_spaced "display include/curl/curlbuild.h";
if(open(F, "<./include/curl/curlbuild.h")) {
while(<F>) {
my $ll = $_;
print $ll if(($ll =~ /^ *# *define *CURL_/) && ($ll !~ /__CURL_CURLBUILD_H/));
}
close(F);
}
}
else {
mydie "no curlbuild.h created/found";
}
logit_spaced "display lib/$confheader";
open(F, "lib/$confheader") or die "lib/$confheader: $!";
while (<F>) {

2
tests/unit/CMakeLists.txt
View file

@ -29,7 +29,7 @@ include_directories(
${CURL_SOURCE_DIR}/tests/libtest
${CURL_SOURCE_DIR}/src
${CURL_BINARY_DIR}/lib # To be able to reach "curl_config.h"
${CURL_BINARY_DIR}/include # To be able to reach "curl/curlbuild.h"
${CURL_BINARY_DIR}/include # To be able to reach "curl/curl.h"
)
foreach(_testfile ${UT_SRC})

12
tests/unit/Makefile.am
View file

@ -5,7 +5,7 @@
# | (__| |_| | _ <| |___
# \___|\___/|_| \_\_____|
#
# Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al.
# Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al.
#
# This software is licensed as described in the file COPYING, which
# you should have received as part of this distribution. The terms
@ -26,8 +26,6 @@ AUTOMAKE_OPTIONS = foreign nostdinc
# being currently built and tested are searched before the library which
# might possibly already be installed in the system.
#
# $(top_builddir)/include/curl for generated curlbuild.h included from curl.h
# $(top_builddir)/include for generated curlbuild.h inc. from lib/curl_setup.h
# $(top_srcdir)/include is for libcurl's external include files
# $(top_builddir)/lib is for libcurl's generated lib/curl_config.h file
# $(top_srcdir)/lib for libcurl's lib/curl_setup.h and other "borrowed" files
@ -35,9 +33,7 @@ AUTOMAKE_OPTIONS = foreign nostdinc
# $(top_srcdir)/ares is for in-tree c-ares's external include files
if USE_EMBEDDED_ARES
AM_CPPFLAGS = -I$(top_builddir)/include/curl \
-I$(top_builddir)/include \
-I$(top_srcdir)/include \
AM_CPPFLAGS = -I$(top_srcdir)/include \
-I$(top_builddir)/lib \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/src \
@ -45,9 +41,7 @@ AM_CPPFLAGS = -I$(top_builddir)/include/curl \
-I$(top_builddir)/ares \
-I$(top_srcdir)/ares
else
AM_CPPFLAGS = -I$(top_builddir)/include/curl \
-I$(top_builddir)/include \
-I$(top_srcdir)/include \
AM_CPPFLAGS = -I$(top_srcdir)/include \
-I$(top_builddir)/lib \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/src \