From: Viktor Szakats Date: Thu, 31 Oct 2024 09:17:47 +0000 (+0100) Subject: winbuild: drop `gen_resp_file.bat` X-Git-Tag: curl-8_11_0~14 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=97d69ec0dad41bbd7c22e81c3fef400dfa1b49ba;p=thirdparty%2Fcurl.git winbuild: drop `gen_resp_file.bat` `gen_resp_file.bat` could be reduced to 3 lines. Those lines are simple to use from `Makefile.vc` as-is. Also drop the unnecessary tabs. Closes #15463 --- diff --git a/Makefile.am b/Makefile.am index be3f520bba..fbfb8b0447 100644 --- a/Makefile.am +++ b/Makefile.am @@ -69,7 +69,7 @@ VC_DIST = projects/README.md \ projects/wolfssl_options.h \ projects/wolfssl_override.props -WINBUILD_DIST = winbuild/README.md winbuild/gen_resp_file.bat \ +WINBUILD_DIST = winbuild/README.md \ winbuild/MakefileBuild.vc winbuild/Makefile.vc winbuild/makedebug.bat PLAN9_DIST = plan9/include/mkfile \ diff --git a/winbuild/Makefile.vc b/winbuild/Makefile.vc index 1876ebda09..bc20d05d85 100644 --- a/winbuild/Makefile.vc +++ b/winbuild/Makefile.vc @@ -284,15 +284,13 @@ CURL_DIROBJ = ..\builds\$(CONFIG_NAME_LIB)-obj-curl DIRDIST = ..\builds\$(CONFIG_NAME_LIB)\ $(MODE): - @SET DIROBJ=$(LIBCURL_DIROBJ) - @SET MACRO_NAME=LIBCURL_OBJS - @SET OUTFILE=LIBCURL_OBJS.inc - @CALL gen_resp_file.bat $(LIBCURL_OBJS) - - @SET DIROBJ=$(CURL_DIROBJ) - @SET MACRO_NAME=CURL_OBJS - @SET OUTFILE=CURL_OBJS.inc - @CALL gen_resp_file.bat $(CURL_OBJS) + @echo LIBCURL_OBJS = \> LIBCURL_OBJS.inc + @for %%i in ($(LIBCURL_OBJS)) do @echo $(LIBCURL_DIROBJ)/%%i \>> LIBCURL_OBJS.inc + @echo. >> LIBCURL_OBJS.inc + + @echo CURL_OBJS = \> CURL_OBJS.inc + @for %%i in ($(CURL_OBJS)) do @echo $(CURL_DIROBJ)/%%i \>> CURL_OBJS.inc + @echo. >> CURL_OBJS.inc @SET CONFIG_NAME_LIB=$(CONFIG_NAME_LIB) @SET MACHINE=$(MACHINE) diff --git a/winbuild/gen_resp_file.bat b/winbuild/gen_resp_file.bat deleted file mode 100755 index d0735daac6..0000000000 --- a/winbuild/gen_resp_file.bat +++ /dev/null @@ -1,34 +0,0 @@ -@echo off -rem *************************************************************************** -rem * _ _ ____ _ -rem * Project ___| | | | _ \| | -rem * / __| | | | |_) | | -rem * | (__| |_| | _ <| |___ -rem * \___|\___/|_| \_\_____| -rem * -rem * Copyright (C) Daniel Stenberg, , et al. -rem * -rem * This software is licensed as described in the file COPYING, which -rem * you should have received as part of this distribution. The terms -rem * are also available at https://curl.se/docs/copyright.html. -rem * -rem * You may opt to use, copy, modify, merge, publish, distribute and/or sell -rem * copies of the Software, and permit persons to whom the Software is -rem * furnished to do so, under the terms of the COPYING file. -rem * -rem * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY -rem * KIND, either express or implied. -rem * -rem * SPDX-License-Identifier: curl -rem * -rem *************************************************************************** - -if exist %OUTFILE% ( - del %OUTFILE% -) - -echo %MACRO_NAME% = \> %OUTFILE% -for %%i in (%*) do echo %DIROBJ%/%%i \>> %OUTFILE% -echo. >> %OUTFILE% - -:END