From patchwork Tue Aug 24 03:46:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lev Stipakov X-Patchwork-Id: 1918 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director14.mail.ord1d.rsapps.net ([172.27.255.7]) by backend30.mail.ord1d.rsapps.net with LMTP id qPrWIZz4JGFjCwAAIUCqbw (envelope-from ) for ; Tue, 24 Aug 2021 09:48:12 -0400 Received: from proxy3.mail.iad3a.rsapps.net ([172.27.255.7]) by director14.mail.ord1d.rsapps.net with LMTP id uH2eIZz4JGHqYAAAeJ7fFg (envelope-from ) for ; Tue, 24 Aug 2021 09:48:12 -0400 Received: from smtp31.gate.iad3a ([172.27.255.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy3.mail.iad3a.rsapps.net with LMTPS id mBOjGpz4JGGHHwAAYaqY3Q (envelope-from ) for ; Tue, 24 Aug 2021 09:48:12 -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: smtp31.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: ebebaf7c-04e1-11ec-a903-5254003d9392-1-1 Received: from [216.105.38.7] ([216.105.38.7:45970] helo=lists.sourceforge.net) by smtp31.gate.iad3a.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id CD/23-01526-B98F4216; Tue, 24 Aug 2021 09:48:12 -0400 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.92.3) (envelope-from ) id 1mIWlh-0006JB-TC; Tue, 24 Aug 2021 13:47:09 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.3) (envelope-from ) id 1mIWlg-0006J3-Ba for openvpn-devel@lists.sourceforge.net; Tue, 24 Aug 2021 13:47:08 +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=ubzsR9Hv3wFFa1C+kVXZWsRIsoI0eH6kcAJNn76XqzY=; b=dE66GXjNysGqc2Gibbq3xniLr8 JP6siFvhaovl1B08wwtJob3u9LaEjr3Y64/g+T4fhqWGrfvubFZiVyrKlJn0Wtw8NqIdKABI1B5iL omT137chefwojIj2uWF1C9eFZ/wW2gB8oXvzaToyKNMBsNFwf/Y9d9Uj2SItZAb4d5uI=; 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=ubzsR9Hv3wFFa1C+kVXZWsRIsoI0eH6kcAJNn76XqzY=; b=G098T2d/CA17G7/wYKAy+a4bfh F1Yle0r0R4h7BdEOyGDa26mn0T6uSlQJ+bbP9COUlXCXv4GlnSfITbBCLvV8yBoBDKY75Z98OVY/7 4Z1G5q6yAAqRC8uQ3X3fFfnQ4J/AGyH5ZVFG6Q7N4qhrHi18vgAPnwO9JJv/sHY6aPV0=; Received: from mail-lf1-f42.google.com ([209.85.167.42]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.92.3) id 1mIWld-00Gupu-1c for openvpn-devel@lists.sourceforge.net; Tue, 24 Aug 2021 13:47:08 +0000 Received: by mail-lf1-f42.google.com with SMTP id k5so45698070lfu.4 for ; Tue, 24 Aug 2021 06:47:04 -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=ubzsR9Hv3wFFa1C+kVXZWsRIsoI0eH6kcAJNn76XqzY=; b=C88GK9M4BRGJWvqhMU/QHdCMou/d92SGqtzeYGmErP8cIKrLsr7m3WRjQ1mvFShKlu IE8Sch2S30llRWtlv4YOJYp1UUJY5kZEuBJ0jaUfKrAMAsm8CxJV8nTQkD87dV+rEV0D I7u/tJaPGJl88f36+4J6bZcOP4t+cMktj0kJn0xtYR3FFCXbFt6ogZUbpbVDZtu0MLTE M9Ie2HqCZITpm1umQ6VotvlwSIecw3Bzk0nAjSsgBvziWhC4s5zyifc0Spho5BTM0rg8 KTFln1I+KA9HASaqGeDMm/r1xrCmNi+J6Eg/JaKcU8/nmj8tBjt8BReoj2NtEBaklaKQ 34Xw== 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=ubzsR9Hv3wFFa1C+kVXZWsRIsoI0eH6kcAJNn76XqzY=; b=lTnzHTI6n4Kb1qNhtCBE6pP6dt7n3S/u8TVIqQS8EUbcZ2QYZz7fH+6m1WmQ4YvO9g aHCpPVr8ticpJCqG1rAX/NDxIfUjUQgDgDzS3E6gJemmOw7UuqBSBbPSRbvPPh/Mjk0h FPNC7Eb9c2fkwrSc1Z9t+Af2R6vXzW/O50mx7l31aDezDGfIF/z4vuahYj3Y1Ll8vyUn IyUyWnTWwI9KON4xypA1Z3pYKKxhB1Ynk/zhp540+KLQWf0W1biX/9HDKAzIzNB88qAL pByt7mYeqZAjNfhWp2iV8IPceWVse4w31mpNSMp9ft2+wGAioGwmyHAO7VoYEGz0HWEV Ri7w== X-Gm-Message-State: AOAM532c+y1fUg4n39A5iMhTbywBnVDH5JbCvqIiBJt4hv61UZgCHUMh 4JUhr1o7VdlV49shVY0BWvmQpL4cv4w= X-Google-Smtp-Source: ABdhPJx+BJWDFvxeiary+3tVC55B6jKGJYvLBL1fr7Xf/Qqofu8zFf3Wj+fO8axXf9gez8YhTHXXaw== X-Received: by 2002:a05:6512:3ca1:: with SMTP id h33mr5215521lfv.468.1629812818247; Tue, 24 Aug 2021 06:46:58 -0700 (PDT) Received: from LAPTOP-4L3N7KFS.localdomain (81-175-157-115.bb.dnainternet.fi. [81.175.157.115]) by smtp.gmail.com with ESMTPSA id z8sm1762799lfs.177.2021.08.24.06.46.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Aug 2021 06:46:57 -0700 (PDT) From: Lev Stipakov To: openvpn-devel@lists.sourceforge.net Date: Tue, 24 Aug 2021 16:46:41 +0300 Message-Id: <20210824134641.154-1-lstipakov@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210824091058.93-1-lstipakov@gmail.com> References: <20210824091058.93-1-lstipakov@gmail.com> 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.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.167.42 listed in list.dnswl.org] -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.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.167.42 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 X-Headers-End: 1mIWld-00Gupu-1c Subject: [Openvpn-devel] [PATCH v2] 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 --- 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)"