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.

Sign up for GitHub

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

Jump to bottom

Users can remove regexp dependency at compile time #8

Merged
merged 2 commits into from Jun 17, 2014
Merged

Users can remove regexp dependency at compile time #8

merged 2 commits into from Jun 17, 2014

Conversation

kmaehashi
Copy link
Member

Fix for jubatus/jubatus#645.

This patch removes --enable-re2 configuration option.
Instead, we now provide 3-value configuration option as follows:

--regexp-library=oniguruma (default)
--regexp-library=re2
--regexp-library=none

@kmaehashi kmaehashi added this to the 0.0.1 milestone Jun 9, 2014
@kmaehashi kmaehashi modified the milestone: 0.0.1 Jun 9, 2014
@kmaehashi kmaehashi mentioned this pull request Jun 10, 2014
Merged
@suma suma assigned gwtnb and unassigned suma Jun 16, 2014
@gwtnb
Copy link
Member

gwtnb commented Jun 16, 2014

./waf configure --regexp-library=oniguruma && ./waf AND ./waf configure --regexp-library=re2 && ./waf fail in my environment (Ubuntu 13.10).

gwtnb
gwtnb reviewed Jun 16, 2014
View reviewed changes
jubatus/core/fv_converter/wscript
source.append('re2_match.cpp')
source.append('re2_filter.cpp')
source.append('re2_splitter.cpp')
test_source.append(regex_test_source)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Replace append with +=.

@kmaehashi
Copy link
Member Author

Sorry, I fixed.

@gwtnb
Copy link
Member

gwtnb commented Jun 17, 2014

I intended that only test_.source.append() should be replaced, but the new one looks good to me. 👍

gwtnb added a commit that referenced this pull request Jun 17, 2014
@gwtnb
Merge pull request #8 from jubatus/remove-regexp-dependency
4ec84ae 
Users can remove regexp dependency at compile time
@gwtnb gwtnb merged commit 4ec84ae into develop Jun 17, 2014
@gwtnb gwtnb deleted the remove-regexp-dependency branch June 17, 2014 04:41
This was referenced Jun 17, 2014
Closed
Merged
kmaehashi added a commit that referenced this pull request Jun 19, 2014
@kmaehashi
fix to pass cpplint (refs #8)
9a06222
@kmaehashi
Copy link
Member Author

Added minor fix to pass cpplint. 9a06222

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@gwtnb gwtnb

Labels
None yet
Projects
None yet
Milestone
0.0.1
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@kmaehashi @gwtnb @suma