Skip to content

Commit

Permalink
Rename scripts/Windows/README => scripts/Windows/README.adoc
Browse files Browse the repository at this point in the history
Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
  • Loading branch information
jimklimov committed Oct 31, 2023
1 parent 71c5b37 commit 167fdb2
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 14 deletions.
6 changes: 3 additions & 3 deletions INSTALL.nut.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -633,8 +633,8 @@ It should currently be possible to build the codebase in native Windows
with MSYS2/MinGW and cross-building from Linux with mingw (preferably
in a Debian/Ubuntu container). Refer to
link:config-prereqs.txt[Prerequisites for building NUT on different OSes]
and link:scripts/Windows/README[scripts/Windows/README file] for respective
build environment preparation instructions.
and link:scripts/Windows/README.adoc[scripts/Windows/README.adoc file]
for respective build environment preparation instructions.
Note that to use NUT for Windows, non-system dependency DLL files must
be located in same directory as each EXE file that uses them. This can be
Expand Down Expand Up @@ -679,7 +679,7 @@ Building for Windows

For suggestions about setting up the NUT build environment variants
for Windows, please see link:docs/config-prereqs.txt and/or
link:scripts/Windows/README files. Note this is rather experimental
link:scripts/Windows/README.adoc files. Note this is rather experimental
at this point.


Expand Down
3 changes: 2 additions & 1 deletion NEWS.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,8 @@ as part of https://github.com/networkupstools/nut/issues/1410 solution.
It is known that at this time some features are not complete, for more
details see https://github.com/orgs/networkupstools/projects/2/views/1
* Cross-builds of NUT for Windows using Linux and MinGW (and many custom
built dependency packages, as documented in link:scripts/Windows/README[])
built dependency packages, as documented in the
link:scripts/Windows/README.adoc[scripts/Windows/README.adoc file])
are now regularly tested on NUT CI farm with moderate integration via
custom build script `scripts/Windows/build-mingw-nut.sh` [#1489]
* Semi-native NUT for Windows builds with MSYS2/MinGW x64 environment are
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ install:
before_build:
- cmd: |
REM Ensure we have a net-snmp to build against
REM Adapted from scripts/Windows/README document.
REM Adapted from scripts/Windows/README.adoc document.
REM Here we hope to build it once, then use the
REM stashed version across Appveyor rebuilds.
REM Preserve the current working directory:
Expand Down
6 changes: 3 additions & 3 deletions ci_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -1982,9 +1982,9 @@ bindings)

# These mingw modes below are currently experimental and not too integrated
# with this script per se; it is intended to run for NUT CI farm on prepared
# Linux+mingw worker nodes (see scripts/Windows/README) in an uniform manner,
# using mostly default settings (warnings in particular) and some hardcoded
# in that script (ARCH, CFLAGS, ...).
# Linux+mingw worker nodes (see scripts/Windows/README.adoc) in an uniform
# manner, using mostly default settings (warnings in particular) and some
# values hardcoded in that script (ARCH, CFLAGS, ...).
# Note that semi-native builds with e.g. MSYS2 on Windows should "just work" as
# on any other supported platform (more details in docs/config-prereqs.txt).
cross-windows-mingw*)
Expand Down
6 changes: 3 additions & 3 deletions docs/config-prereqs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1191,7 +1191,7 @@ antivirus completely or exempt at least the NUT build area from protection.
Windows with mingw
------------------

See `scripts/Windows/README` for original recommendations for the effort,
See `scripts/Windows/README.adoc` for original recommendations for the effort,
including possibilities of cross-builds with mingw available in Linux.

Unfortunately these did not work for me at the time of testing, yielding
Expand All @@ -1209,7 +1209,7 @@ and redirect on SourceForge. You can download and unpack 7z archives from
https://sourceforge.net/projects/mingw-w64/files/mingw-w64/mingw-w64-release/
into e.g. `C:\Progra~1\mingw-w64\x86_64-8.1.0-release-posix-seh-rt_v6-rev0`
location on your Windows system. Then for building further NUT dependencies
see `scripts/Windows/README`.
see `scripts/Windows/README.adoc`.

Windows with MSYS2
------------------
Expand Down Expand Up @@ -1344,7 +1344,7 @@ involved is very important.

Notable packages *not found* in the repo:

* snmp (net-snmp, ucd-snmp) -- instructions in `scripts/Windows/README`
* snmp (net-snmp, ucd-snmp) -- instructions in `scripts/Windows/README.adoc`
document now covers building it from source in MSYS2 MinGW x64 environment,
essentially same as for Linux cross builds with proper `ARCH` and `PREFIX`
* libregex (C version, direct NUT `configure` script support was added by
Expand Down
2 changes: 1 addition & 1 deletion scripts/Windows/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ AM_CFLAGS = -I$(top_srcdir)/include
../include/nut_version.h: FORCE
(cd ../include/ && $(MAKE) $(AM_MAKEFLAGS) nut_version.h)

EXTRA_DIST = winevent.mc build-mingw-nut.sh README
EXTRA_DIST = winevent.mc build-mingw-nut.sh README.adoc

FORCE:

Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions scripts/Windows/build-mingw-prereqs.sh
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#!/bin/sh

# Copyright (C) 2022 by Jim Klimov <jimklimov+nut@gmail.com>
# Copyright (C) 2022-2023 by Jim Klimov <jimklimov+nut@gmail.com>
# Licensed same as NUT
#
# Helper automating the nuances from NUT::scripts/Windows/README
# Helper automating the nuances from NUT::scripts/Windows/README.adoc
# to provide prerequisites needed in semi-native or cross-builds.
#
# NOTE: Currently constrained to providing net-snmp under MSYS2.
Expand Down

0 comments on commit 167fdb2

Please sign in to comment.