Control nouveau.yaml in configure and dev/run #4956
Merged
Conversation
This file contains 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
rnewson
commented
Jan 9, 2024
| @@ -265,7 +265,7 @@ private IndexDefinition loadIndexDefinition(final String name) throws IOExceptio | |||
| } | |||
|
|
|||
| private Path indexRootPath(final String name) { | |||
| final Path result = rootDir.resolve(name).normalize(); | |||
There was a problem hiding this comment.
removed this because we send a relative path in a common setup prefixed with ./. For reasons best known to the Great Java In The Sky, data/foo does not 'startsWith' ./data
rnewson
force-pushed
the
nouveau-package-2
branch
2 times, most recently
from
90be6fb
to
a32ac66
Compare
nickva
approved these changes
Jan 9, 2024
big-r81
reviewed
Jan 10, 2024
| @@ -140,7 +140,6 @@ $InstallDir="$LibDir\couchdb" | |||
| $LogFile="$LogDir\couch.log" | |||
| $BuildFauxton = [int](-not $DisableFauxton) | |||
| $BuildDocs = [int](-not $DisableDocs) | |||
| $BuildNouveau = $(If ($EnableNouveau) {1} else {0}) | |||
There was a problem hiding this comment.
iirc, there was a reason to do it that way. $false will get to False, but I need to test this in powershell ...
There was a problem hiding this comment.
Example:
$EnableNouveau = $false
$CouchDBConfig = @"
{nouveau_enable, "$EnableNouveau"}.
"@
Write-Output "$CouchDBConfig"Result:
PS F:\> .\test.ps1
{nouveau_enable, "False"}.
Can this be a problem later with the capital "F"?
Note: as we traditionally use relative paths for _dir variables, I had to modify IndexManager to not normalize() the root dir.
rnewson
force-pushed
the
nouveau-package-2
branch
from
a32ac66
to
a6a1ae0
Compare
jiahuili430
added a commit
that referenced
this pull request
Jan 10, 2024
Fix `dev/run` setup_configs, generate nouveau configuration when nouveau is enabled Related PR: #4956
5 tasks
jiahuili430
added a commit
that referenced
this pull request
Jan 10, 2024
Fix `dev/run` setup_configs, generate nouveau configuration when nouveau is enabled Related PR: #4956
pgj
pushed a commit
to pgj/couchdb
that referenced
this pull request
Jan 10, 2024
Fix `dev/run` setup_configs, generate nouveau configuration when nouveau is enabled Related PR: apache#4956
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Move the generation/templating of nouveau.yaml to couchdb side to make packaging of nouveau simpler and more consistent with the rest.