This is an automated email from the ASF dual-hosted git repository.
ronny pushed a commit to branch fix/align-configure-scripts
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit a95a2e68691cf810454a284bcb988b35e45311f5
Author: Ronny Berndt <ro...@apache.org>
AuthorDate: Sun Sep 15 15:00:31 2024 +0200
(dev): Align both configure scripts (*nix / Windows) even more
Additional detections:
- if we are in a release tarball and don't have proper, disable it
- use quickjs, if spidermonkey isn't available and/or set
---
configure.ps1 | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/configure.ps1 b/configure.ps1
index 6fd731914..faf3669ec 100644
--- a/configure.ps1
+++ b/configure.ps1
@@ -157,8 +157,20 @@ if ($JSEngine -eq "quickjs") {
# If spidermonkey was disabled but JS_ENGINE set to "spidermonkey", reset it
to "quickjs"
if ( ($WithSpiderMonkey -eq "false" ) -and ($JsEngine -eq "spidermonkey" ) ) {
- Write-Verbose "NOTICE: Spidermonkey was disabled, but
JsEngine=spidermonkey. Setting JsEngine=quickjs"
- $JsEngine = "quickjs"
+ Write-Verbose "NOTICE: Spidermonkey was disabled, but
JsEngine=spidermonkey. Setting JsEngine=quickjs"
+ $JsEngine = "quickjs"
+}
+
+# If we're in a release tarball and we don't have proper, then mark it as
skipped
+if ( (-Not (Test-Path ".git")) -and ($WithProper -eq "true") -and (-Not
(Test-Path "src\proper")) ) {
+ $WithProper = "false"
+}
+
+# If we're in a release tarball and we don't have spidermonkey, then mark it
as skipped and enable quickjs
+if ( (-Not (Test-Path ".git")) -and ($WithSpiderMonkey -eq "true") -and (-Not
(Test-Path "src\couch\priv\couch_js")) ) {
+ Write-Verbose "NOTICE: Spidermonkey was disabled in release tarball.
Setting JsEngine=quickjs"
+ $WithSpiderMonkey = "false"
+ $JsEngine = "quickjs"
}
Write-Verbose "==> configuring couchdb in rel\couchdb.config"
