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

Cpp11 package #42

Merged
merged 3 commits into from
Mar 31, 2022
Merged

Cpp11 package #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2b89ec3
fix -Wreorder
mrchypark Mar 31, 2022
a698dc2
Increment version number to 0.1.1
mrchypark Mar 31, 2022
b733c56
fix -Wreorder warn
mrchypark Mar 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DESCRIPTION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: elbird
Title: Blazing Fast Morphological Analyzer Based on Kiwi(Korean Intelligent Word Identifier)
Version: 0.1.0
Version: 0.1.1
Authors@R: person(given = "Chanyub",
family = "Park",
role = c("aut","cre"),
Expand Down
4 changes: 4 additions & 0 deletions NEWS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# elbird 0.1.1

* Fix -Wreorder warnning for cran.

# elbird 0.1.0

* Change backend python to cpp.
Expand Down
8 changes: 4 additions & 4 deletions configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
PKG_TEST_HEADER="<kiwi/Kiwi.h>"
PKG_LIBS="-lkiwi"
PKG_CPPFLAGS=""
LIB_VER="0.11.0"
LIB_VER="0.11.1"

# Copy libcache for local development.
if [ -f "`pwd`/kiwilibtmp/libs/libkiwi.a" ]; then
Expand All @@ -27,7 +27,7 @@ elif [ -d "`pwd`/kiwilibs/libs/" ]; then
else
echo "Prior system libkiwi installation not found"
echo "Preparing to download and build library from source..."
git clone -b v$LIB_VER --filter=blob:limit=5m https://github.com/bab2min/Kiwi
git clone -b v$LIB_VER https://github.com/mrchypark/Kiwi
cd Kiwi
git rm third_party/googletest
git rm third_party/cpuinfo
Expand Down Expand Up @@ -58,7 +58,7 @@ echo "Using PKG_LIBS=$PKG_LIBS"

# Find compiler
CXX11=`${R_HOME}/bin/R CMD config CXX11`
CXXFLAGS="`${R_HOME}/bin/R CMD config CXXFLAGS` -Wreorder -Wpedantic"
CXXFLAGS=`${R_HOME}/bin/R CMD config CXXFLAGS`

# Test for libkiwi
echo "#include $PKG_TEST_HEADER" | ${CXX11} ${PKG_CPPFLAGS} ${CXXFLAGS} -E -xc++ - >/dev/null 2>&1
Expand All @@ -75,7 +75,7 @@ if [ $? -ne 0 ]; then
else
echo "Attempt to use system libkiwi failed"
echo "Preparing to download and build library from source..."
git clone -b v$LIB_VER --filter=blob:limit=5m https://github.com/bab2min/Kiwi
git clone -b v$LIB_VER https://github.com/mrchypark/Kiwi
cd Kiwi
git rm third_party/googletest
git rm third_party/cpuinfo
Expand Down