support of spidermonkey 60 #2345
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -30,6 +30,7 @@ ERLANG_MD5="false" | |
| SKIP_DEPS=0 | ||
|
|
||
| COUCHDB_USER="$(whoami 2>/dev/null || echo couchdb)" | ||
| SM_VSN="1.8.5" | ||
|
|
||
| . ${rootdir}/version.mk | ||
| COUCHDB_VERSION=${vsn_major}.${vsn_minor}.${vsn_patch} | ||
|
|
@@ -50,6 +51,7 @@ Options: | |
| --disable-docs do not build any documentation or manpages | ||
| --erlang-md5 use erlang for md5 hash operations | ||
| --dev alias for --with-curl --disable-docs --disable-fauxton | ||
| --spidermonkey-version VSN specify the version of SpiderMonkey to use (defaults to $SM_VSN) | ||
| --skip-deps do not update erlang dependencies | ||
| --rebar=PATH use rebar by specified path (version >=2.6.0 && <3.0 required) | ||
| EOF | ||
|
|
@@ -140,6 +142,24 @@ parse_opts() { | |
| printf 'ERROR: "--user" requires a non-empty argument.\n' >&2 | ||
| exit 1 | ||
| ;; | ||
|
|
||
| --spidermonkey-version) | ||
| if [ -n "$2" ]; then | ||
| eval SM_VSN=$2 | ||
| shift 2 | ||
| continue | ||
| else | ||
| printf 'ERROR: "--spidermonkey-version" requires a non-empty argument.\n' >&2 | ||
| exit 1 | ||
| fi | ||
| ;; | ||
| --spidermonkey-version=?*) | ||
| eval SM_VSN=${1#*=} | ||
| ;; | ||
| --spidermonkey-version=) | ||
| printf 'ERROR: "--spidermonkey-version" requires a non-empty argument.\n' >&2 | ||
| exit 1 | ||
| ;; | ||
| --) # End of options | ||
| shift | ||
| break | ||
|
|
@@ -180,6 +200,7 @@ cat > rel/couchdb.config << EOF | |
| {log_file, "$LOG_FILE"}. | ||
| {fauxton_root, "./share/www"}. | ||
| {user, "$COUCHDB_USER"}. | ||
| {spidermonkey_version, "$SM_VSN"}. | ||
| {node_name, "-name [email protected]"}. | ||
| {cluster_port, 5984}. | ||
| {backend_port, 5986}. | ||
|
|
@@ -206,12 +227,14 @@ with_fauxton = $WITH_FAUXTON | |
| with_docs = $WITH_DOCS | ||
|
|
||
| user = $COUCHDB_USER | ||
| spidermonkey_version = $SM_VSN | ||
| EOF | ||
|
|
||
| cat > $rootdir/config.erl << EOF | ||
| {with_curl, $WITH_CURL}. | ||
| {with_proper, $WITH_PROPER}. | ||
| {erlang_md5, $ERLANG_MD5}. | ||
| {spidermonkey_version, "$SM_VSN"}. | ||
| EOF | ||
|
|
||
| install_local_rebar() { | ||
|
|
||
This file contains hidden or 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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looking good.
We still need to place a copy of these upstream dependencies untouched into an Apache repository, as @janl said on IRC. If we made modifications, we should track those in a branch in that repo as well. If we can't solve the build problem now (how to generate these files from those repos), please open a new ticket and mention Jan and Garren in it so we can look at fixing that for the future.
I want to be sure that if these libraries change in the future, we can easily absorb the fixes and improvements into our code, especially if they're security-related patches.
@davisp can help you with the repo importation into Apache, he's done it recently for part of the 4.0 libraries.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for your suggestions, @wohali I created #2372 for now.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@wohali @jiangphcn Yap, will do that in a few minute after I finish testing this PR.