Skip to content

Commit

Permalink
Remove Spidermonkey 1.8.5
Browse files Browse the repository at this point in the history
Removes the old Spidermonkey 1.8.5 source code.
Spidermonkey 91 is set as the new default version.
  • Loading branch information
big-r81 authored and janl committed Jan 11, 2023
1 parent b5693fd commit 9a92fbb
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion configure
Original file line number Diff line number Diff line change
Expand Up @@ -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)"

Expand Down
4 changes: 2 additions & 2 deletions configure.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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()]
Expand Down
4 changes: 2 additions & 2 deletions src/couch/rebar.config.script
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down

0 comments on commit 9a92fbb

Please sign in to comment.