Skip to content

Commit 5d4f3a3

Browse files
authored
(dev): Align both configure scripts (*nix / Windows) even more (#5245)
1 parent 9ba4d31 commit 5d4f3a3

File tree

1 file changed

+14
-2
lines changed

1 file changed

+14
-2
lines changed

configure.ps1

+14-2
Original file line numberDiff line numberDiff line change
@@ -157,8 +157,20 @@ if ($JSEngine -eq "quickjs") {
157157

158158
# If spidermonkey was disabled but JS_ENGINE set to "spidermonkey", reset it to "quickjs"
159159
if ( ($WithSpiderMonkey -eq "false" ) -and ($JsEngine -eq "spidermonkey" ) ) {
160-
Write-Verbose "NOTICE: Spidermonkey was disabled, but JsEngine=spidermonkey. Setting JsEngine=quickjs"
161-
$JsEngine = "quickjs"
160+
Write-Verbose "NOTICE: Spidermonkey was disabled, but JsEngine=spidermonkey. Setting JsEngine=quickjs"
161+
$JsEngine = "quickjs"
162+
}
163+
164+
# If we're in a release tarball and we don't have proper, then mark it as skipped
165+
if ( (-Not (Test-Path ".git")) -and ($WithProper -eq "true") -and (-Not (Test-Path "src\proper")) ) {
166+
$WithProper = "false"
167+
}
168+
169+
# If we're in a release tarball and we don't have spidermonkey, then mark it as skipped and enable quickjs
170+
if ( (-Not (Test-Path ".git")) -and ($WithSpiderMonkey -eq "true") -and (-Not (Test-Path "src\couch\priv\couch_js")) ) {
171+
Write-Verbose "NOTICE: Spidermonkey was disabled in release tarball. Setting JsEngine=quickjs"
172+
$WithSpiderMonkey = "false"
173+
$JsEngine = "quickjs"
162174
}
163175

164176
Write-Verbose "==> configuring couchdb in rel\couchdb.config"

0 commit comments

Comments
 (0)