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

uw-maps sync with master #28

Merged
merged 17 commits into from
Apr 16, 2017
Merged

uw-maps sync with master #28

merged 17 commits into from
Apr 16, 2017

Conversation

c-bik
Copy link
Contributor

@c-bik c-bik commented Apr 16, 2017

Hi Ulf,

uw-maps branch was missing support of rebar3. This PR will bring uw-maps branch up to speed with master (including rebar3).

This is essentially nothing but a merge with master -- to save you some time.

Thanks,
Bikram

uwiger and others added 17 commits December 14, 2014 22:08
Using rebar3 script installed locally [1] return "compile" in rebar.config
script, so instead we now check against the exported function.

This also fix the issue with edown, by not adding it at compilation but only
when using the doc target under rebar3. Under rebar2 or erlang.mk it works as
usual.

fix uwiger#23

[1] http://www.rebar3.org/v3.0/docs#extracting-and-upgrading
`CONFIG = CONFIG ++ Rebar2Config` won't match
@uwiger uwiger merged commit fa67ab7 into uwiger:uw-maps Apr 16, 2017
@uwiger
Copy link
Owner

uwiger commented Apr 16, 2017

Looks good. Thanks.

@c-bik
Copy link
Contributor Author

c-bik commented Apr 16, 2017

Thanks to you too.

Do you have any plans to merge this branch to master anytime soon?

@c-bik c-bik deleted the uw-maps branch April 16, 2017 09:09
@uwiger
Copy link
Owner

uwiger commented Apr 16, 2017

I'd forgotten about it, but I guess now would be a good time. :)

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

7 participants