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

build: sync curlx build variables and script

Browse source 
Between src and tests, both in autotools and cmake.

Closes #17675
This commit is contained in:
Viktor Szakats 2025-06-19 17:14:47 +02:00
parent 614febca51
commit 11c211c33c
No known key found for this signature in database
GPG key ID: B5ABD165E2AEF201
10 changed files with 36 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tests/server/CMakeLists.txt
View file

@ -22,17 +22,17 @@
#
###########################################################################
# Get BUNDLE, BUNDLE_SRC, FIRSTFILES, UTILS, CURLX_SRCS, TESTFILES variables
# Get BUNDLE, BUNDLE_SRC, FIRSTFILES, UTILS, CURLX_CFILES, TESTFILES variables
curl_transform_makefile_inc("Makefile.inc" "${CMAKE_CURRENT_BINARY_DIR}/Makefile.inc.cmake")
include("${CMAKE_CURRENT_BINARY_DIR}/Makefile.inc.cmake")
add_custom_command(OUTPUT "${BUNDLE_SRC}"
COMMAND ${PERL_EXECUTABLE} "${PROJECT_SOURCE_DIR}/scripts/mk-unity.pl"
--include ${UTILS} ${CURLX_SRCS} --test ${TESTFILES}
--include ${UTILS} ${CURLX_CFILES} --test ${TESTFILES}
${CURL_MK_UNITY_OPTION} --srcdir "${CMAKE_CURRENT_SOURCE_DIR}" > "${BUNDLE_SRC}"
DEPENDS
"${PROJECT_SOURCE_DIR}/scripts/mk-unity.pl" "${CMAKE_CURRENT_SOURCE_DIR}/Makefile.inc"
${FIRSTFILES} ${UTILS} ${CURLX_SRCS} ${TESTFILES}
${FIRSTFILES} ${UTILS} ${CURLX_CFILES} ${TESTFILES}
VERBATIM)
add_executable(${BUNDLE} EXCLUDE_FROM_ALL "${BUNDLE_SRC}")

6
tests/server/Makefile.am
View file

@ -39,7 +39,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include \
-I$(top_srcdir)/lib/curlx \
-I$(srcdir)
# Get BUNDLE, BUNDLE_SRC, FIRSTFILES, UTILS, CURLX_SRCS, TESTFILES variables
# Get BUNDLE, BUNDLE_SRC, FIRSTFILES, UTILS, CURLX_CFILES, TESTFILES variables
include Makefile.inc
EXTRA_DIST = CMakeLists.txt .checksrc $(FIRSTFILES) $(UTILS) $(TESTFILES)
@ -55,8 +55,8 @@ if DOING_NATIVE_WINDOWS
AM_CPPFLAGS += -DCURL_STATICLIB
endif
$(BUNDLE_SRC): $(top_srcdir)/scripts/mk-unity.pl Makefile.inc $(FIRSTFILES) $(UTILS) $(CURLX_SRCS) $(TESTFILES)
@PERL@ $(top_srcdir)/scripts/mk-unity.pl --include $(UTILS) $(CURLX_SRCS) --test $(TESTFILES) > $(BUNDLE_SRC)
$(BUNDLE_SRC): $(top_srcdir)/scripts/mk-unity.pl Makefile.inc $(FIRSTFILES) $(UTILS) $(CURLX_CFILES) $(TESTFILES)
@PERL@ $(top_srcdir)/scripts/mk-unity.pl --include $(UTILS) $(CURLX_CFILES) --test $(TESTFILES) > $(BUNDLE_SRC)
noinst_PROGRAMS = $(BUNDLE)
nodist_SOURCES = $(BUNDLE_SRC)

2
tests/server/Makefile.inc
View file

@ -32,7 +32,7 @@ FIRSTFILES = first.c first.h
# Common files used by test programs
UTILS = getpart.c getpart.h util.c
CURLX_SRCS = \
CURLX_CFILES = \
../../lib/curlx/base64.c \
../../lib/curlx/inet_pton.c \
../../lib/curlx/multibyte.c \