Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2906 couchjs sm version #2911

Merged
merged 6 commits into from May 30, 2020
Merged

Conversation

sklassen
Copy link
Contributor

Overview

couchjs returns couchdb version but not the version of spidermonkey used at compile time

Since each version has it's own help.h I just added the directories version number to the end of the first line eg "(SpiderMonkey 60)"

Testing recommendations

I have compiled the code can ran couchjs -V

Related Issues or Pull Requests

This addresses issue #2906

Checklist

  • Code is written and works correctly
  • Changes are covered by tests
  • Any new configurable parameters are documented in rel/overlay/etc/default.ini
  • A PR for documentation changes has been made in https://github.com/apache/couchdb-documentation

@janl
Copy link
Member

janl commented May 28, 2020

this is good!

IIRC the 60 side can also build against 68, so we need to be a little bit smarter there. Or we are more lazy and make it 60 or later, not sure that would help ;)

@wohali
Copy link
Member

wohali commented May 28, 2020

@janl Nope, we ended up having to fork, so the 60/ directory only builds SM60 now. 68/ does 68.

@janl
Copy link
Member

janl commented May 28, 2020

wait., when I looked there was no diff for /68, did this get added behind my back or did I just miss this earlier? Apologies!

In couchjs -h replaced the link to jira with a link to github
Update bug request in rebar.config.script for couchjs -h
@wohali wohali merged commit 0be139a into apache:master May 30, 2020
dottorblaster pushed a commit to dottorblaster/couchdb that referenced this pull request Jun 19, 2020
Closes apache#2906 

* Added a suffix to the first line of couchjs with the (static) version number compiled
* Update rebar.config.script
* In couchjs -h replaced the link to jira with a link to github

Co-authored-by: simon.klassen <simon.klassen>
Co-authored-by: Jan Lehnardt <jan@apache.org
wohali pushed a commit that referenced this pull request Dec 14, 2020
Closes #2906 

* Added a suffix to the first line of couchjs with the (static) version number compiled
* Update rebar.config.script
* In couchjs -h replaced the link to jira with a link to github

Co-authored-by: simon.klassen <simon.klassen>
Co-authored-by: Jan Lehnardt <jan@apache.org
wohali added a commit that referenced this pull request Dec 14, 2020
Closes #2906 

* Added a suffix to the first line of couchjs with the (static) version number compiled
* Update rebar.config.script
* In couchjs -h replaced the link to jira with a link to github

Co-authored-by: simon.klassen <simon.klassen>
Co-authored-by: Jan Lehnardt <jan@apache.org

Co-authored-by: Simon Klassen <6997477+sklassen@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants