[couchdb] branch main updated: Remove Spidermonkey 1.8.5

[jan]

This is an automated email from the ASF dual-hosted git repository.

jan pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/couchdb.git


The following commit(s) were added to refs/heads/main by this push:
     new 9a92fbbe3 Remove Spidermonkey 1.8.5
9a92fbbe3 is described below

commit 9a92fbbe3130127703db004614d836348e13ad16
Author: Ronny Berndt <ro...@apache.org>
AuthorDate: Wed Jan 4 13:45:03 2023 +0100

    Remove Spidermonkey 1.8.5
    
    Removes the old Spidermonkey 1.8.5 source code.
    Spidermonkey 91 is set as the new default version.
---
 configure                     | 2 +-
 configure.ps1                 | 4 ++--
 src/couch/rebar.config.script | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/configure b/configure
index 79377ea1a..7c9fb56a3 100755
--- a/configure
+++ b/configure
@@ -31,7 +31,7 @@ ERLANG_MD5="false"
 SKIP_DEPS=0
 
 COUCHDB_USER="$(whoami 2>/dev/null || echo couchdb)"
-SM_VSN=${SM_VSN:-"1.8.5"}
+SM_VSN=${SM_VSN:-"91"}
 ARCH="$(uname -m)"
 ERLANG_VER="$(erl -eval 'io:put_chars(erlang:system_info(otp_release)), 
halt().' -noshell)"
 
diff --git a/configure.ps1 b/configure.ps1
index 626a22545..ad08f80f4 100644
--- a/configure.ps1
+++ b/configure.ps1
@@ -9,7 +9,7 @@
   -DisableDocs               request build process skip building documentation 
(default false)
   -SkipDeps                  do not update Erlang dependencies (default false)
   -CouchDBUser USER          set the username to run as (defaults to current 
user)
-  -SpiderMonkeyVersion VSN   select the version of SpiderMonkey to use 
(defaults to 1.8.5)
+  -SpiderMonkeyVersion VSN   select the version of SpiderMonkey to use 
(default 91)
 
   Installation directories:
   -Prefix PREFIX             install architecture-independent files in PREFIX
@@ -48,7 +48,7 @@ Param(
     [ValidateNotNullOrEmpty()]
     [string]$CouchDBUser = [Environment]::UserName, # set the username to run 
as (defaults to current user)
     [ValidateNotNullOrEmpty()]
-    [string]$SpiderMonkeyVersion = "1.8.5", # select the version of 
SpiderMonkey to use (default 1.8.5)
+    [string]$SpiderMonkeyVersion = "91", # select the version of SpiderMonkey 
to use (default 91)
     [ValidateNotNullOrEmpty()]
     [string]$Prefix = "C:\Program Files\Apache\CouchDB", # install 
architecture-independent file location (default C:\Program Files\Apache\CouchDB)
     [ValidateNotNullOrEmpty()]
diff --git a/src/couch/rebar.config.script b/src/couch/rebar.config.script
index f0b465135..2769de841 100644
--- a/src/couch/rebar.config.script
+++ b/src/couch/rebar.config.script
@@ -70,12 +70,12 @@ SMVsn = case lists:keyfind(spidermonkey_version, 1, 
CouchConfig) of
     {_, "91"} ->
         "91";
     undefined ->
-        "1.8.5";
+        "91";
     {_, Unsupported} ->
         io:format(standard_error, "Unsupported SpiderMonkey version: ~s~n", 
[Unsupported]),
         erlang:halt(1);
     false ->
-        "1.8.5"
+        "91"
 end.
 
 ConfigH = [