From patchwork Wed Aug 25 06:47:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lev Stipakov X-Patchwork-Id: 1927 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director15.mail.ord1d.rsapps.net ([172.27.255.59]) by backend30.mail.ord1d.rsapps.net with LMTP id mNlYIb9pJ2F5FAAAIUCqbw (envelope-from ) for ; Thu, 26 Aug 2021 06:15:27 -0400 Received: from proxy6.mail.iad3a.rsapps.net ([172.27.255.59]) by director15.mail.ord1d.rsapps.net with LMTP id qJ0qIb9pJ2GcDQAAIcMcQg (envelope-from ) for ; Thu, 26 Aug 2021 06:15:27 -0400 Received: from smtp21.gate.iad3a ([172.27.255.59]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy6.mail.iad3a.rsapps.net with LMTPS id qKulGr9pJ2GLbwAA8udqhg (envelope-from ) for ; Thu, 26 Aug 2021 06:15:27 -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: smtp21.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: 88505a82-0656-11ec-967b-525400e75841-1-1 Received: from [216.105.38.7] ([216.105.38.7:51578] helo=lists.sourceforge.net) by smtp21.gate.iad3a.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 23/7D-05444-FB967216; Thu, 26 Aug 2021 06:15:27 -0400 Received: from [127.0.0.1] (helo=sfs-ml-4.v29.lw.sourceforge.com) by sfs-ml-4.v29.lw.sourceforge.com with esmtp (Exim 4.90_1) (envelope-from ) id 1mJCP8-0002Lb-D3; Thu, 26 Aug 2021 10:14:38 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mJCP7-0002LR-Cf for openvpn-devel@lists.sourceforge.net; Thu, 26 Aug 2021 10:14:37 +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=AT/It1hBuOH+KklVeY6MjoKrVksrznBpa6Yr+7WF7v4=; b=M8q+F70k2YK9qQlzB/l5hetfOi 4xo1cBJMR63CChCZAnCXwYC+HnTdIyjem22Ut1HrESjoDRcD3hxAB7mdeOEuXBvZSHkYCKnHG/tOR aORMcbaUwuiDNX0OuUBkRBvGtmnRSgmIUZXBqP1AK/iDSYrvGvneJOunnIiNoqB7NVuk=; 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=AT/It1hBuOH+KklVeY6MjoKrVksrznBpa6Yr+7WF7v4=; b=CrbzvXqU9omnrqhQVSEBkVqsfc mMEtRBdpULc5jld4JYhIPCEHqivJsOCyYo1M4sUUVNJcPUGhPfutu7fF8fbx2QyYzP7mO6S5F4LIy 2+fo8S0Ho/a9Pc+0sQV11DH77OBGafozWUE2s6Vd9sG0mLmpufuJ+tR8HZR72WzrKtfo=; Received: from mail-lf1-f47.google.com ([209.85.167.47]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.92.3) id 1mJCP6-001bPq-RH for openvpn-devel@lists.sourceforge.net; Thu, 26 Aug 2021 10:14:37 +0000 Received: by mail-lf1-f47.google.com with SMTP id p38so5832008lfa.0 for ; Thu, 26 Aug 2021 03:14:36 -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=AT/It1hBuOH+KklVeY6MjoKrVksrznBpa6Yr+7WF7v4=; b=E8QS1QT4QujxwkzKsXYpp9Kf+5aC0NnOJwBGSwq8KzBcmlLqSBMT4kkhMnxF6Efbr4 OrM/Rp/JR65c/YAeal9UIpUmXY7Pe8p/AG/z4Oqv6r4ZO65S8u7QNABUYlpLg/Q2WEvX YnNTm0T4cuxregK2/o7rvymvAzSTgMAqzJyr0j/qd0Rg7cyDmJlivX4MVaCu0fZosXAb YjN00xElAj0BdUo22EeHmpDWXCGO4stuLRYEq2QGSNXfvyyYNKGej4T9RmoSo8sGLadY m761FJk6kZ6cE2BRxP0/5szGmjm+Clq9own83cpPwtpE0jHEyfJwQMWAjQXY2foTzmiY mtDg== 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=AT/It1hBuOH+KklVeY6MjoKrVksrznBpa6Yr+7WF7v4=; b=a+10Y6+X/2V9AwbBks/NVsrciHBulrTwKQ+ulUZo2WmxI35mxYfZKAmbMAxmnA4viJ 80KlJe46NiY+jyYMnkEtLD4I5iRlK+2rf/PfckjcHqjYGt6ABfPVm50qj8O1IxZBPArC XsDN/F4cyhO4pJvQ2IKLbv/j5Pg6U3uZLaj9p94HqBTPGNZq22OjNfIrwzZdar+4/L87 ECLKNshmtC6TPNzHZUI/gPOayAjohWm/sYDXgDc+RwafvLtyxy5sOmV+/IPj9BbW73MU Dzp5LpT6UcDRJ3tszxLqmWdfM6sbxRMTqi/4YDeJgHAq4vYLokr5BBdJB17V6S8spTxD 8dKQ== X-Gm-Message-State: AOAM5337mkl0zsCDtV1TTncNilX6zbB/4Vqwfcjnt+UT0ZHTQ0NZlytS u1Og/gDj3PryI0dxy2gWpGM0frBKCkk= X-Google-Smtp-Source: ABdhPJxR949L7D4+kv4VzmZ3kHYrpRcPIWU6uwTLCesifAiL+Uio5FZrYcMRGk48GF4PpoZszc53iA== X-Received: by 2002:a05:6512:118c:: with SMTP id g12mr2150998lfr.143.1629972870046; Thu, 26 Aug 2021 03:14: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 u13sm305622lfm.20.2021.08.26.03.14.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Aug 2021 03:14:29 -0700 (PDT) From: Lev Stipakov To: openvpn-devel@lists.sourceforge.net Date: Wed, 25 Aug 2021 19:47:52 +0300 Message-Id: <20210825164752.808-1-lstipakov@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210825164349.755-1-lstipakov@gmail.com> References: <20210825164349.755-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.6 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 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] -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_MSPIKE_H2 RBL: Average reputation (+2) [209.85.167.47 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.167.47 listed in list.dnswl.org] -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: 1mJCP6-001bPq-RH Subject: [Openvpn-devel] [PATCH v4] 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 --- v4: - really replace "python3" with "python" 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..6da859e3 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 python %i "$(INPUT_MAN)" "$(OUTPUT_MAN)" + clean: -del "$(OUTPUT_MSVC_VER)" -del "$(OUTPUT_PLUGIN)" -del "$(OUTPUT_PLUGIN_CONFIG)" + -del "$(OUTPUT_MAN)"