From patchwork Wed Aug 25 06:43:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lev Stipakov X-Patchwork-Id: 1926 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director8.mail.ord1d.rsapps.net ([172.27.255.59]) by backend30.mail.ord1d.rsapps.net with LMTP id wK4GHNVoJ2FpDwAAIUCqbw (envelope-from ) for ; Thu, 26 Aug 2021 06:11:33 -0400 Received: from proxy16.mail.iad3a.rsapps.net ([172.27.255.59]) by director8.mail.ord1d.rsapps.net with LMTP id oErgG9VoJ2FLKgAAfY0hYg (envelope-from ) for ; Thu, 26 Aug 2021 06:11:33 -0400 Received: from smtp36.gate.iad3a ([172.27.255.59]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy16.mail.iad3a.rsapps.net with LMTPS id 0Ks3FdVoJ2FORQAADc5QwQ (envelope-from ) for ; Thu, 26 Aug 2021 06:11:33 -0400 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: smtp36.gate.iad3a.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: fcb1c092-0655-11ec-b315-525400575b2b-1-1 Received: from [216.105.38.7] ([216.105.38.7:51446] helo=lists.sourceforge.net) by smtp36.gate.iad3a.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id EA/9D-28688-4D867216; Thu, 26 Aug 2021 06:11:33 -0400 Received: from [127.0.0.1] (helo=sfs-ml-1.v29.lw.sourceforge.com) by sfs-ml-1.v29.lw.sourceforge.com with esmtp (Exim 4.90_1) (envelope-from ) id 1mJCLI-0006HG-Jh; Thu, 26 Aug 2021 10:10:40 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-1.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mJCLH-0006Gr-I8 for openvpn-devel@lists.sourceforge.net; Thu, 26 Aug 2021 10:10:39 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=References:In-Reply-To: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:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=LJvlbdPZtdfhYaUrR43mqayPV6gJ71tOpFAdVD+QScc=; b=ecJnp/CpeTCAiHBH+0nQG6GRdj dKngqwDRWrpO0pwfp9hEMMGAmbabrpgW/C9QX9/FbqVvyF3QKoG1zi3nGDuYr6J2Kk010eP7X1Sp7 yBqi4Pknt62/QezTUMQ1iJDKLY+fvSEbJgyvA2uMfQMXbbIaHVyIKssrBx3OHbUSfgmw=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=References:In-Reply-To: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:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=LJvlbdPZtdfhYaUrR43mqayPV6gJ71tOpFAdVD+QScc=; b=G2qOu6c1PFDXdPpABLJVk/CCcC 3U1ZqUKbddcqr2iOh528gDuVMvwe2E0nXtQOvT/XUGRy07xXaMXEhD7wBQJK6iJZPSqtyZyTlzD5r GlYhLy/+3a5JB+0pg7r7uctn0GA/gpckanXKEQ7NB2ah7EhJ+Ny8eCOxbw2RTNXOP++Y=; Received: from mail-lf1-f53.google.com ([209.85.167.53]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.92.3) id 1mJCLF-001b6t-NW for openvpn-devel@lists.sourceforge.net; Thu, 26 Aug 2021 10:10:39 +0000 Received: by mail-lf1-f53.google.com with SMTP id m28so5648547lfj.6 for ; Thu, 26 Aug 2021 03:10:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=LJvlbdPZtdfhYaUrR43mqayPV6gJ71tOpFAdVD+QScc=; b=cvtfKaUp2fVE7kqD/5Lz4l02mVspqwk48FcF7T+8TYmonX71NJDNjVfMy50Hahk6bZ +KF5ACH1emklFfJv6kyNK1zh7qaIEfHHphtgvFGLMNO/QzAs8k5+70RZnVPv7dWB+W1y iY4fd22Wiy7H8SKroXjcvnW8SwMu3dYijBA9HH5399jX49XCcP1AAvTOlLm6Ua0z+TDQ 6eBa7O1sF5cJYeV+WyKvcAix0vhh7+WklnUnymcY0X2ES5DDaxVvDM3qjHS56PfvFBAp 9rw5zTDaz6elMM7FEs14yMexQUcx4NZ11eVhYLPTeY/jwY9Frc/psoXgh8KpojxGr8Dh wZrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=LJvlbdPZtdfhYaUrR43mqayPV6gJ71tOpFAdVD+QScc=; b=LLDHJDa8evCG6gTL22A2u9AtYWLPhFSM6oLfKrRnW2L64g8dnV5QxHlZT7gbqxO8QV ZzYkPW5eqXDecdkDRnWtpYyrYKrxWH7ARH1Ll/ZnXdLK+3nwcZI/5gnmuZrzt5IvWlOY eG5a2DzK0QnpQ15SyN7mmiduFKvdeXjzhSEouUzBvyFHmpYUDgdNqYbXYEuDObwq+RKb oF7cJ2tm5z4gmHJOFl7xBxyDfsJRlB+WlBNzzwXwDQtQJWiF0gE11/P/HOaZjFNSx9mH PzNWxQlWEqlB/8gLDNTNwL+2hGULwGiixnc+vuQ2qfNSzYkPFMvguKYTNSDZKgSQt744 PwZg== X-Gm-Message-State: AOAM533uJjCZHQBdvF1nt8NCV1u6sI/1ON2boS7bvrtA84gwO34Uz6jv CZaPuExNm1Bd0lQr32hC6RlitLeUE2A= X-Google-Smtp-Source: ABdhPJxH3iDLzd8boPiIbsldEWQ8yQR/EFKj/C4CHB0tRcwSCVsZ2xLeKcbGhyaMuWZ/4XvM8e7HGQ== X-Received: by 2002:a05:6512:3f8c:: with SMTP id x12mr2246801lfa.320.1629972630832; Thu, 26 Aug 2021 03:10:30 -0700 (PDT) Received: from LAPTOP-4L3N7KFS.localdomain (37-33-213-50.bb.dnainternet.fi. [37.33.213.50]) by smtp.gmail.com with ESMTPSA id m16sm275038lfh.243.2021.08.26.03.10.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Aug 2021 03:10:30 -0700 (PDT) From: Lev Stipakov To: openvpn-devel@lists.sourceforge.net Date: Wed, 25 Aug 2021 19:43:49 +0300 Message-Id: <20210825164349.755-1-lstipakov@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <241c7c18-7deb-3aff-e221-32d33ba5031e@openvpn.net> References: <241c7c18-7deb-3aff-e221-32d33ba5031e@openvpn.net> 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 Use rst2html to build html from rst. Ignore errors, this is not fatal and affects only MSI build. Modify MSVC GitHub Actions to install python3/rst2html and add html man page to artifacts. Content analysis details: (0.6 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [lstipakov[at]gmail.com] 0.8 DATE_IN_PAST_12_24 Date: is 12 to 24 hours before Received: date -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.167.53 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.167.53 listed in wl.mailspike.net] -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -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.0 URIBL_BLOCKED ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [URIs: m4.in] X-Headers-End: 1mJCLF-001b6t-NW Subject: [Openvpn-devel] [PATCH v3] Add building man page on Windows 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 Use rst2html to build html from rst. Ignore errors, this is not fatal and affects only MSI build. Modify MSVC GitHub Actions to install python3/rst2html and add html man page to artifacts. Signed-off-by: Lev Stipakov --- v3: - replace "python3" with "python" v2: - change implementation to support GitHub Actions .github/workflows/build.yaml | 9 +++++++++ build/msvc/msvc-generate/Makefile.mak | 9 ++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 5d7dd37b..4cb2f4cc 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -206,6 +206,14 @@ jobs: - name: Add MSBuild to PATH uses: microsoft/setup-msbuild@v1 + - name: Set up Python + uses: actions/setup-python@v2 + with: + python-version: '3.x' + + - name: Install rst2html + run: python -m pip install --upgrade pip rst2html + - name: Restore artifacts, or run vcpkg, build and cache artifacts uses: lukka/run-vcpkg@main with: @@ -227,3 +235,4 @@ jobs: path: | ${{ matrix.plat }}-Output/${{env.BUILD_CONFIGURATION}}/*.exe ${{ matrix.plat }}-Output/${{env.BUILD_CONFIGURATION}}/*.dll + doc/openvpn.8.html diff --git a/build/msvc/msvc-generate/Makefile.mak b/build/msvc/msvc-generate/Makefile.mak index 59fc9f0e..4924a6ce 100644 --- a/build/msvc/msvc-generate/Makefile.mak +++ b/build/msvc/msvc-generate/Makefile.mak @@ -11,7 +11,10 @@ OUTPUT_PLUGIN=$(SOURCEBASE)/include/openvpn-plugin.h INPUT_PLUGIN_CONFIG=version.m4.in OUTPUT_PLUGIN_CONFIG=version.m4 -all: $(OUTPUT_MSVC_VER) $(OUTPUT_PLUGIN) +INPUT_MAN=$(SOURCEBASE)/doc/openvpn.8.rst +OUTPUT_MAN=$(SOURCEBASE)/doc/openvpn.8.html + +all: $(OUTPUT_MSVC_VER) $(OUTPUT_PLUGIN) $(OUTPUT_MAN) $(OUTPUT_MSVC_VER): $(INPUT_MSVC_VER) $(CONFIG) cscript //nologo msvc-generate.js --config="$(CONFIG)" --input="$(INPUT_MSVC_VER)" --output="$(OUTPUT_MSVC_VER)" @@ -22,7 +25,11 @@ $(OUTPUT_PLUGIN_CONFIG): $(INPUT_PLUGIN_CONFIG) $(OUTPUT_PLUGIN): $(INPUT_PLUGIN) $(OUTPUT_PLUGIN_CONFIG) cscript //nologo msvc-generate.js --config="$(OUTPUT_PLUGIN_CONFIG)" --input="$(INPUT_PLUGIN)" --output="$(OUTPUT_PLUGIN)" +$(OUTPUT_MAN): $(INPUT_MAN) + -FOR /F %i IN ('where rst2html.py') DO python3 %i "$(INPUT_MAN)" "$(OUTPUT_MAN)" + clean: -del "$(OUTPUT_MSVC_VER)" -del "$(OUTPUT_PLUGIN)" -del "$(OUTPUT_PLUGIN_CONFIG)" + -del "$(OUTPUT_MAN)"