From 2b89ec37701ea07edf4d10e0804c8b952c51bfba Mon Sep 17 00:00:00 2001 From: chanyub Park Date: Thu, 31 Mar 2022 09:11:36 +0900 Subject: [PATCH 1/3] fix -Wreorder --- configure | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index e56d7df..5d9e757 100755 --- a/configure +++ b/configure @@ -4,7 +4,7 @@ PKG_TEST_HEADER="" 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 @@ -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 --filter=blob:limit=5m https://github.com/mrchypark/Kiwi cd Kiwi git rm third_party/googletest git rm third_party/cpuinfo From a698dc2175dadaa5aa53b490db021b175e14b702 Mon Sep 17 00:00:00 2001 From: chanyub Park Date: Thu, 31 Mar 2022 09:23:14 +0900 Subject: [PATCH 2/3] Increment version number to 0.1.1 --- DESCRIPTION | 2 +- NEWS.md | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index de38ed7..229f776 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -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"), diff --git a/NEWS.md b/NEWS.md index 17d9560..a25a127 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,5 @@ +# elbird 0.1.1 + # elbird 0.1.0 * Change backend python to cpp. From b733c566ffec5b60bb3b82b3076bddd51846c4c2 Mon Sep 17 00:00:00 2001 From: chanyub Park Date: Thu, 31 Mar 2022 11:11:13 +0900 Subject: [PATCH 3/3] fix -Wreorder warn --- NEWS.md | 2 ++ configure | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/NEWS.md b/NEWS.md index a25a127..40fdda9 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,5 +1,7 @@ # elbird 0.1.1 +* Fix -Wreorder warnning for cran. + # elbird 0.1.0 * Change backend python to cpp. diff --git a/configure b/configure index 5d9e757..d7fbcee 100755 --- a/configure +++ b/configure @@ -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/mrchypark/Kiwi + git clone -b v$LIB_VER https://github.com/mrchypark/Kiwi cd Kiwi git rm third_party/googletest git rm third_party/cpuinfo @@ -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 @@ -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