References: <20210825164349.755-1-lstipakov@...277...> <20210825164752.808-1-lstipakov@...277...> From: =?UTF-8?Q?Samuli_Sepp=c3=a4nen?= Message-ID: <71f211d3-d153-ba74-4576-b187d12e01af@...515...> Date: Thu, 26 Aug 2021 14:14:17 +0300 MIME-Version: 1.0 In-Reply-To: <20210825164752.808-1-lstipakov@...277...> Content-Language: en-US Subject: Re: [Openvpn-devel] [PATCH v4] Add building man page on Windows List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset=iso-8859-15; format=flowed Content-Transfer-Encoding: 7bit To: Lev Stipakov , openvpn-devel@lists.sourceforge.net Cc: Lev Stipakov Il 25/08/21 19:47, Lev Stipakov ha scritto: > 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@...2621... > > + - name: Set up Python > + uses: actions/setup-python@...2620... > + 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@...2622... > 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)" > Works. ACK. Samuli