From patchwork Tue Feb 8 00:49:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lev Stipakov X-Patchwork-Id: 2268 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director8.mail.ord1d.rsapps.net ([172.30.191.6]) by backend41.mail.ord1d.rsapps.net with LMTP id UOEcOQRZAmICRgAAqwncew (envelope-from ) for ; Tue, 08 Feb 2022 06:50:28 -0500 Received: from proxy14.mail.ord1d.rsapps.net ([172.30.191.6]) by director8.mail.ord1d.rsapps.net with LMTP id MPlIGgVZAmLoMgAAfY0hYg (envelope-from ) for ; Tue, 08 Feb 2022 06:50:29 -0500 Received: from smtp23.gate.ord1c ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy14.mail.ord1d.rsapps.net with LMTPS id YD5pFgdZAmKKfAAAtEH5vw (envelope-from ) for ; Tue, 08 Feb 2022 06:50:31 -0500 X-Spam-Threshold: 95 X-Spam-Score: 0 X-Spam-Flag: NO X-Virus-Scanned: OK X-Orig-To: openvpnslackdevel@openvpn.net X-Originating-Ip: [216.105.38.7] Authentication-Results: smtp23.gate.ord1c.rsapps.net; iprev=pass policy.iprev="216.105.38.7"; spf=pass smtp.mailfrom="openvpn-devel-bounces@lists.sourceforge.net" smtp.helo="lists.sourceforge.net"; dkim=fail (signature verification failed) header.d=sourceforge.net; dkim=fail (signature verification failed) header.d=sf.net; dkim=fail (signature verification failed) header.d=gmail.com; dmarc=fail (p=none; dis=none) header.from=gmail.com X-Suspicious-Flag: YES X-Classification-ID: 4f8047ba-88d5-11ec-91e7-b8ca3a678528-1-1 Received: from [216.105.38.7] ([216.105.38.7:42484] helo=lists.sourceforge.net) by smtp23.gate.ord1c.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 62/04-01526-40952026; Tue, 08 Feb 2022 06:50:29 -0500 Received: from [127.0.0.1] (helo=sfs-ml-2.v29.lw.sourceforge.com) by sfs-ml-2.v29.lw.sourceforge.com with esmtp (Exim 4.94.2) (envelope-from ) id 1nHOzy-0001Ax-IX; Tue, 08 Feb 2022 11:49:29 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nHOzx-0001Ar-2w for openvpn-devel@lists.sourceforge.net; Tue, 08 Feb 2022 11:49:27 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=Qq2zOWRggv86n5OzwGqAD4FPeZoqd2p6ABzGFEfaHZc=; b=DRbgg+mm5E3/GQ5FWj8+7JVS1A su42yxz/Tvm1hWV7hpyqqw5959zXv4aQwC+esuj1uxUNoUvQlJ5ZjY3ORy0zjy97S1ia+QCfhZDB8 Gxr4HCPEjjLxJFE6GQSA0brrHA344378kCCy8ilEQxtqc6gJsccf0q/sxVX38/STVu9I=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:MIME-Version: Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=Qq2zOWRggv86n5OzwGqAD4FPeZoqd2p6ABzGFEfaHZc=; b=b7hvjuqMLQdMUoZWI4P1gvZp9e EaY2GQqW3GmPcN0wdXhIZLM0ppw51Ee/D2h+WxyIfpQsYp/+hM3ky2b4v69W+Vus0lJHBcuXnq3qW qjaW/JaJach1WiBrTpTgyNKOrRIzKicgCFE6MBbI7dXuzGPy18wsAoCN3qlsmWzXunwQ=; Received: from mail-wm1-f45.google.com ([209.85.128.45]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.94.2) id 1nHOzt-0003fT-FE for openvpn-devel@lists.sourceforge.net; Tue, 08 Feb 2022 11:49:27 +0000 Received: by mail-wm1-f45.google.com with SMTP id bg21-20020a05600c3c9500b0035283e7a012so1445281wmb.0 for ; Tue, 08 Feb 2022 03:49:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id; bh=Qq2zOWRggv86n5OzwGqAD4FPeZoqd2p6ABzGFEfaHZc=; b=i5FJnH6TRksiqFhAUA/WN4MGLmWVXOxaKMVvpG74I6P+haq9S9GHhNjq6Gaa8Nr+T4 +iwMVZY3FipctTwtw7uJpqL97z7xbW8/s9ouEIEpFOOwnYMH9NIAkftqDHYl4/2RkWRc fohhQ4km7MQhPX/KV6s+Pn+NQ8NI0G6Rg5O/Et2PmGDoxAXZV0N7sG5dbtC676EQ+q3g OGnteniYg3pcxaxZqFX2OVyCZhEj8rCgjNrMi8zZyiqyHaP8te+hCq0pAs8UQWcJGy9c 2Gd+D1Q/VvXAw9Vyq+nPHOkG2YgU6uRyo5oDOcxnPHfRT7EtVFPGS62Kb2+F6R4FYOk2 zf0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=Qq2zOWRggv86n5OzwGqAD4FPeZoqd2p6ABzGFEfaHZc=; b=tTFEF42lqGnAgdd44EUSDmHsl7NlpD4vh9cF9cNYg0HeKEXMDM3RJeAaxn3V6/hrwM X4qZ+T741hlH0+bzdN2JeiB6Xcl/6zKStkV+huCIRs+g1sH6K6/5yJ20u3Nq8XDpSRa1 GPJDHaf+BACVlR688F9hOqKKtPeG+TQtmrR5wMnb/mWX7ibItDYPfwyBeEAhcrFwklkx 0YTaherKqRVMZiV9sM2CMacKbVUfn8yv/QvqyU/TDowVhp4V6WQKqooMeoM0uT/eaczy a9b5vNpoYttR8nCig89gg8+Mz9cL8W0NvwfvvUN81ApvJtTEdFBXWUfHqb8xI99GV5dX tpZA== X-Gm-Message-State: AOAM533LCVygFDW1AZO5Tb2hnQ9SQiPB93w/oA+3I/O8DV/Ty6yN0Det DWsmrvmvTAwIiiP8PVSBGqkJdOIStlg= X-Google-Smtp-Source: ABdhPJyHmp1kEJXlBTTWm/w2GUbzvBusvrL2nWr/toCHV3wnujjpEPUbbNtBoXuXP7uAMh4hRbBieA== X-Received: by 2002:a05:600c:3d95:: with SMTP id bi21mr849879wmb.54.1644320957744; Tue, 08 Feb 2022 03:49:17 -0800 (PST) Received: from LAPTOP-4L3N7KFS.localdomain (nat2.panoulu.net. [185.38.2.2]) by smtp.gmail.com with ESMTPSA id m6sm14401685wrw.54.2022.02.08.03.49.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Feb 2022 03:49:16 -0800 (PST) From: Lev Stipakov To: openvpn-devel@lists.sourceforge.net Date: Tue, 8 Feb 2022 13:49:05 +0200 Message-Id: <20220208114905.100-1-lstipakov@gmail.com> X-Mailer: git-send-email 2.17.1 X-Spam-Report: Spam detection software, running on the system "util-spamd-1.v13.lw.sourceforge.com", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: From: Lev Stipakov Remove unused macros for dependency directories, since dependencies are handled by vcpkg. Remove unused .bat files. Content analysis details: (-0.2 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.128.45 listed in list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [lstipakov[at]gmail.com] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.128.45 listed in wl.mailspike.net] -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-Headers-End: 1nHOzt-0003fT-FE Subject: [Openvpn-devel] [PATCH] msvc: cleanup X-BeenThere: openvpn-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Lev Stipakov MIME-Version: 1.0 Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox From: Lev Stipakov Remove unused macros for dependency directories, since dependencies are handled by vcpkg. Remove unused .bat files. Reported-by: Frank Lichtenheld Signed-off-by: Lev Stipakov Acked-By: Frank Lichtenheld --- Makefile.am | 5 +-- build/msvc/msvc-generate/Makefile.mak | 14 ++++---- msvc-build.bat | 50 --------------------------- msvc-dev.bat | 28 --------------- msvc-env.bat | 30 ---------------- src/compat/PropertySheet.props | 38 ++++---------------- src/openvpn/openvpn.vcxproj | 12 +++---- src/openvpnmsica/openvpnmsica.props | 1 - 8 files changed, 20 insertions(+), 158 deletions(-) delete mode 100644 msvc-build.bat delete mode 100644 msvc-dev.bat delete mode 100644 msvc-env.bat diff --git a/Makefile.am b/Makefile.am index 3f0fdd4c..28a7ef76 100644 --- a/Makefile.am +++ b/Makefile.am @@ -66,10 +66,7 @@ dist_noinst_DATA = \ PORTS \ README.IPv6 TODO.IPv6 \ README.mbedtls \ - openvpn.sln \ - msvc-env.bat \ - msvc-dev.bat \ - msvc-build.bat + openvpn.sln dist_noinst_HEADERS = \ config-msvc.h \ diff --git a/build/msvc/msvc-generate/Makefile.mak b/build/msvc/msvc-generate/Makefile.mak index 6da859e3..1cb43102 100644 --- a/build/msvc/msvc-generate/Makefile.mak +++ b/build/msvc/msvc-generate/Makefile.mak @@ -1,18 +1,18 @@ # Copyright (C) 2008-2012 Alon Bar-Lev -CONFIG=$(SOURCEBASE)/version.m4 +CONFIG=$(SOLUTIONDIR)/version.m4 -INPUT_MSVC_VER=$(SOURCEBASE)/config-msvc-version.h.in -OUTPUT_MSVC_VER=$(SOURCEBASE)/config-msvc-version.h +INPUT_MSVC_VER=$(SOLUTIONDIR)/config-msvc-version.h.in +OUTPUT_MSVC_VER=$(SOLUTIONDIR)/config-msvc-version.h -INPUT_PLUGIN=$(SOURCEBASE)/include/openvpn-plugin.h.in -OUTPUT_PLUGIN=$(SOURCEBASE)/include/openvpn-plugin.h +INPUT_PLUGIN=$(SOLUTIONDIR)/include/openvpn-plugin.h.in +OUTPUT_PLUGIN=$(SOLUTIONDIR)/include/openvpn-plugin.h INPUT_PLUGIN_CONFIG=version.m4.in OUTPUT_PLUGIN_CONFIG=version.m4 -INPUT_MAN=$(SOURCEBASE)/doc/openvpn.8.rst -OUTPUT_MAN=$(SOURCEBASE)/doc/openvpn.8.html +INPUT_MAN=$(SOLUTIONDIR)/doc/openvpn.8.rst +OUTPUT_MAN=$(SOLUTIONDIR)/doc/openvpn.8.html all: $(OUTPUT_MSVC_VER) $(OUTPUT_PLUGIN) $(OUTPUT_MAN) diff --git a/msvc-build.bat b/msvc-build.bat deleted file mode 100644 index 8256c62d..00000000 --- a/msvc-build.bat +++ /dev/null @@ -1,50 +0,0 @@ -@echo off -rem Copyright (C) 2008-2012 Alon Bar-Lev - -@rem this stupid command needed for SetEnv.cmd to operate -setlocal ENABLEDELAYEDEXPANSION - -cd /d %0\.. -call msvc-env.bat - -set PLATFORMS=x64 -set CONFIGURATIONS=Debug Release - -if exist "%VCHOME%\vcvarsall.bat" ( - call "%VCHOME%\vcvarsall.bat" -) else if exist "%VCHOME%\bin\vcvars32.bat" ( - call "%VCHOME%\bin\vcvars32.bat" -) else if exist "%VCHOME%\Auxiliary\Build\vcvars32.bat" ( - call "%VCHOME%\Auxiliary\Build\vcvars32.bat" -) else ( - echo Cannot detect visual studio - goto error -) - -msbuild /help > nul 2>&1 -if errorlevel 1 set DO_VCBUILD=1 - -for %%p in (%PLATFORMS%) do ( - for %%c in (%CONFIGURATIONS%) do ( - rmdir /q /s %SOURCEBASE%\%%p\%%c > nul 2>&1 - - if "%DO_VCBUILD%" NEQ "" ( - vcbuild /errfile:error.log /showenv "%SOLUTION%" /rebuild /platform:%%p "%%c|%%p" - for %%f in (error.log) do if %%~zf GTR 0 goto error - ) else ( - msbuild "%SOLUTION%" /p:Configuration="%%c" /p:Platform="%%p" - if errorlevel 1 goto error - ) - ) -) - -exit /b 0 -goto end - -:error -exit /b 1 -goto end - -:end - -endlocal diff --git a/msvc-dev.bat b/msvc-dev.bat deleted file mode 100644 index 74aee0b0..00000000 --- a/msvc-dev.bat +++ /dev/null @@ -1,28 +0,0 @@ -@echo off - -setlocal -cd /d %0\.. -call msvc-env.bat - -if exist "%VSHOME%\Common7\IDE\VCExpress.exe" ( - set IDE=%VSHOME%\Common7\IDE\VCExpress.exe -) else if exist "%VSHOME%\Common7\IDE\devenv.exe" ( - set IDE=%VSHOME%\Common7\IDE\devenv.exe -) else if exist "%VCHOME%\Auxiliary\Build\vcvars64.bat" ( - call "%VCHOME%\Auxiliary\Build\vcvars64.bat" -) else ( - echo "Cannot detect visual studio environment" - goto error -) -start "" "%IDE%" "%SOLUTION%" - -exit /b 0 -goto end - -:error -exit /b 1 -goto end - -:end - -endlocal diff --git a/msvc-env.bat b/msvc-env.bat deleted file mode 100644 index cc9663df..00000000 --- a/msvc-env.bat +++ /dev/null @@ -1,30 +0,0 @@ -@echo off - -rem Put your own settings at msvc-env-local.bat -if exist msvc-env-local.bat call msvc-env-local.bat - -if "%ProgramFiles(x86)%"=="" set ProgramFiles(x86)=%ProgramFiles% -if "%VSCOMNTOOLS%"=="" set VSCOMNTOOLS=%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Professional\Common7\Tools -if not exist "%VSCOMNTOOLS%" set VSCOMNTOOLS=%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Community\Common7\Tools -if "%VSHOME%"=="" SET VSHOME=%VSCOMNTOOLS%\..\.. -if "%VCHOME%"=="" SET VCHOME=%VSHOME%\VC - -set SOURCEBASE=%cd% -set SOLUTION=openvpn.sln -set CPPFLAGS=%CPPFLAGS%;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS -set CPPFLAGS=%CPPFLAGS%;NTDDI_VERSION=NTDDI_VISTA;_WIN32_WINNT=_WIN32_WINNT_VISTA -set CPPFLAGS=%CPPFLAGS%; -set CPPFLAGS=%CPPFLAGS%;%EXTRA_CPPFLAGS% - -if exist config-msvc-local.h set CPPFLAGS="%CPPFLAGS%;HAVE_CONFIG_MSVC_LOCAL_H" - -if "%OPENVPN_DEPROOT%" == "" set OPENVPN_DEPROOT=c:\Temp\openvpn-deps -if "%OPENSSL_HOME%" == "" set OPENSSL_HOME=%OPENVPN_DEPROOT% -if "%LZO_HOME%" == "" set LZO_HOME=%OPENVPN_DEPROOT% -if "%PKCS11H_HOME%" == "" set PKCS11H_HOME=%OPENVPN_DEPROOT% -if "%TAP_WINDOWS_HOME%" == "" set TAP_WINDOWS_HOME=%OPENVPN_DEPROOT% - -if not exist "%OPENSSL_HOME%" echo WARNING: openssl '%OPENSSL_HOME%' does not exist -if not exist "%LZO_HOME%" echo WARNING: lzo '%LZO_HOME%' does not exist -if not exist "%PKCS11H_HOME%" echo WARNING: pkcs11-helper '%PKCS11H_HOME%' does not exist -if not exist "%TAP_WINDOWS_HOME%" echo WARNING: tap-windows '%TAP_WINDOWS_HOME%' does not exist diff --git a/src/compat/PropertySheet.props b/src/compat/PropertySheet.props index 4f94b972..57f6995f 100644 --- a/src/compat/PropertySheet.props +++ b/src/compat/PropertySheet.props @@ -1,14 +1,7 @@ - - $(SolutionDir) - $(SOURCEBASE)\..\openvpn-build\msvc\image$(PlatformArchitecture) - $(OPENVPN_DEPROOT) - $(OPENVPN_DEPROOT) - $(OPENVPN_DEPROOT) - $(OPENVPN_DEPROOT) - + $(SolutionDir)$(Platform)-Output\$(Configuration)\ <_PropertySheetDisplayName>compat @@ -17,38 +10,19 @@ Level3 WIN32;$(CPPFLAGS);%(PreprocessorDefinitions) - $(SOURCEBASE);$(SOURCEBASE)/include;%(AdditionalIncludeDirectories) + $(SolutionDir);$(SolutionDir)include;%(AdditionalIncludeDirectories) true + - $(SOURCEBASE);%(AdditionalIncludeDirectories) + $(SOLUTIONDIR) - - $(SOURCEBASE) - true - - - $(OPENVPN_DEPROOT) - true - - - $(OPENSSL_HOME) - true - - - $(TAP_WINDOWS_HOME) - true - - - $(LZO_HOME) - true - - - $(PKCS11H_HOME) + + $(SOLUTIONDIR) true diff --git a/src/openvpn/openvpn.vcxproj b/src/openvpn/openvpn.vcxproj index 33b8f19a..91d5ebbe 100644 --- a/src/openvpn/openvpn.vcxproj +++ b/src/openvpn/openvpn.vcxproj @@ -151,7 +151,7 @@ %(UndefinePreprocessorDefinitions) Level2 true - ..\compat;$(SolutionDir);%(AdditionalIncludeDirectories) + ..\compat;%(AdditionalIncludeDirectories) @@ -166,7 +166,7 @@ %(UndefinePreprocessorDefinitions) Level2 true - ..\compat;$(SolutionDir)include;$(SolutionDir);%(AdditionalIncludeDirectories) + ..\compat;%(AdditionalIncludeDirectories) @@ -181,7 +181,7 @@ %(UndefinePreprocessorDefinitions) Level2 true - ..\compat;$(SolutionDir);%(AdditionalIncludeDirectories) + ..\compat;%(AdditionalIncludeDirectories) @@ -196,7 +196,7 @@ %(UndefinePreprocessorDefinitions) Level2 true - ..\compat;$(SolutionDir);%(AdditionalIncludeDirectories) + ..\compat;%(AdditionalIncludeDirectories) Guard @@ -212,7 +212,7 @@ %(UndefinePreprocessorDefinitions) Level2 true - ..\compat;$(SolutionDir);%(AdditionalIncludeDirectories) + ..\compat;%(AdditionalIncludeDirectories) Guard @@ -228,7 +228,7 @@ %(UndefinePreprocessorDefinitions) Level2 true - ..\compat;$(SolutionDir);%(AdditionalIncludeDirectories) + ..\compat;%(AdditionalIncludeDirectories) Guard diff --git a/src/openvpnmsica/openvpnmsica.props b/src/openvpnmsica/openvpnmsica.props index 074635d0..1091c9f4 100644 --- a/src/openvpnmsica/openvpnmsica.props +++ b/src/openvpnmsica/openvpnmsica.props @@ -7,7 +7,6 @@ - ..\compat;$(TAP_WINDOWS_HOME)/include;%(AdditionalIncludeDirectories) _WIN32_WINNT=_WIN32_WINNT_VISTA;%(PreprocessorDefinitions)