configure.ac: Fix out of source tree builds #2088
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The code to detect the available drivers does so by parsing `Makefile.am` but it does not do so relative to "$srcdir" so trying to do a configure outside of the source directory will fail. Signed-off-by: Axel Gembe <[email protected]>
|
I use this with VSCode and the following {
// See https://go.microsoft.com/fwlink/?LinkId=733558
// for the documentation about the tasks.json format
"version": "2.0.0",
"tasks": [
{
"label": "autogen",
"type": "process",
"command": "/bin/sh",
"args": [ "${workspaceFolder}/autogen.sh" ],
"options": {
"cwd": "${workspaceFolder}"
},
"problemMatcher": []
},
{
"label": "configure",
"type": "process",
"command": "/bin/sh",
"args": [
"${workspaceFolder}/configure",
"--with-drivers=usbhid-ups,apc_modbus",
"--with-usb",
"--prefix=/home/ago/src/nut/prefix",
"--with-modbus",
"--with-modbus-includes=-I/home/ago/src/libmodbus/prefix/include/modbus",
"--with-modbus-libs=-L/home/ago/src/libmodbus/prefix/lib -lmodbus",
"--enable-warnings",
"--enable-spellcheck",
"CPPFLAGS=-DDEBUG",
"CFLAGS=-g -O0"
],
"options": {
"cwd": "${workspaceFolder}/build/dev"
},
"dependsOn": ["autogen"],
"problemMatcher": []
},
{
"label": "configure debian",
"type": "process",
"command": "/bin/sh",
"args": [
"${workspaceFolder}/configure",
"--with-drivers=usbhid-ups,apc_modbus",
"--with-usb",
"--prefix=",
"--sysconfdir=/etc/nut",
"--with-statepath=/run/nut",
"--with-user=nut",
"--with-group=nut",
"--with-modbus",
"--with-modbus-includes=-I/home/ago/src/libmodbus/prefix/include/modbus",
"--with-modbus-libs=-L/home/ago/src/libmodbus/prefix/lib -lmodbus"
],
"options": {
"cwd": "${workspaceFolder}/build/debian"
},
"dependsOn": ["autogen"],
"problemMatcher": []
},
{
"label": "configure distcheck",
"type": "process",
"command": "/bin/sh",
"args": [
"${workspaceFolder}/configure",
"--with-usb",
"--with-modbus",
"--with-modbus-includes=-I/home/ago/src/libmodbus/prefix/include/modbus",
"--with-modbus-libs=-L/home/ago/src/libmodbus/prefix/lib -lmodbus"
],
"options": {
"cwd": "${workspaceFolder}/build/distcheck"
},
"dependsOn": ["autogen"],
"problemMatcher": []
},
{
"label": "make",
"type": "process",
"command": "make",
"args": [ "-j", "64" ],
"problemMatcher": [ "$gcc" ],
"options": {
"cwd": "${workspaceFolder}/build/dev"
},
"group": {
"kind": "build",
"isDefault": true
}
},
{
"label": "make debian",
"type": "process",
"command": "make",
"args": [ "-j", "64" ],
"problemMatcher": [ "$gcc" ],
"options": {
"cwd": "${workspaceFolder}/build/debian"
},
"group": {
"kind": "build",
"isDefault": false
}
},
{
"label": "make distcheck",
"type": "process",
"command": "make",
"args": [ "-j", "64", "distcheck" ],
"problemMatcher": [ "$gcc" ],
"options": {
"cwd": "${workspaceFolder}/build/distcheck"
},
"group": {
"kind": "build",
"isDefault": false
}
}
]
} |
|
Note that this is only needed when selecting drivers via the |
jimklimov
added
bug
packaging
CI
|
Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The code to detect the available drivers does so by parsing
Makefile.ambut it does not do so relative to "$srcdir" so trying to do a configure outside of the source directory will fail.General points
Described the changes in the PR submission or a separate issue, e.g.
known published or discovered protocols, applicable hardware (expected
compatible and actually tested/developed against), limitations, etc.
There may be multiple commits in the PR, aligned and commented with
a functional change. Notably, coding style changes better belong in a
separate PR, but certainly in a dedicated commit to simplify reviews
of "real" changes in the other commits. Similarly for typo fixes in
comments or text documents.
Frequent "underwater rocks" for driver addition/update PRs
Revised existing driver families and added a sub-driver if applicable
(
nutdrv_qx,usbhid-ups...) or added a brand new driver in the othercase.
Did not extend obsoleted drivers with new hardware support features
(notably
blazerand other single-device family drivers for Qx protocols,except the new
nutdrv_qxwhich should cover them all).For updated existing device drivers, bumped the
DRIVER_VERSIONmacroor its equivalent.
For USB devices (HID or not), revised that the driver uses unique
VID/PID combinations, or raised discussions when this is not the case
(several vendors do use same interface chips for unrelated protocols).
For new USB devices, built and committed the changes for the
scripts/upower/95-upower-hid.hwdbfileProposed NUT data mapping is aligned with existing
docs/nut-names.txtfile. If the device exposes useful data points not listed in the file, the
experimental.*namespace can be used as documented there, and discussionshould be raised on the NUT Developers mailing list to standardize the new
concept.
Updated
data/driver.list.inif applicable (new tested device info)Frequent "underwater rocks" for general C code PRs
structure layout and alignment in memory, endianness (layout of bytes and
bits in memory for multi-byte numeric types), or use of generic
intwherelanguage or libraries dictate the use of
size_t(orssize_tsometimes).Progress and errors are handled with
upsdebugx(),upslogx(),fatalx()and related methods, not with directprintf()orexit().Similarly, NUT helpers are used for error-checked memory allocation and
string operations (except where customized error handling is needed,
such as unlocking device ports, etc.)
Coding style (including whitespace for indentations) follows precedent
in the code of the file, and examples/guide in
docs/developers.txtfile.For newly added files, the
Makefile.amrecipes were updated and themake distchecktarget passes.General documentation updates
Updated
docs/acknowledgements.txt(for vendor-backed device support)Added or updated manual page information in
docs/man/*.txtfilesand corresponding recipe lists in
docs/man/Makefile.amfor new pagesPassed
make spellcheck, updated spell-checking dictionary in thedocs/nut.dictfile if needed (did not remove any words -- themakerule printout in case of changes suggests how to maintain it).
Additional work may be needed after posting this PR
Propose a PR for NUT DDL with detailed device data dumps from tests
against real hardware (the more models, the better).
Address NUT CI farm build failures for the PR: testing on numerous
platforms and toolkits can expose issues not seen on just one system.
the changed codebase.