diff --git a/CMakeLists.txt b/CMakeLists.txt index c156b32..f07b28f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -91,6 +91,8 @@ if ("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64") set (ARCHITECTURE "amd64") elseif ("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86") set (ARCHITECTURE "i386") +elseif ("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "i686") + set (ARCHITECTURE "i386") elseif ("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "") message (FATAL_ERROR "CMAKE_SYSTEM_PROCESSOR is not set (should be x86 or x86_64)") elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") diff --git a/createDictionaryDeb.sh b/createDictionaryDeb.sh index e4a0ea5..64735ab 100755 --- a/createDictionaryDeb.sh +++ b/createDictionaryDeb.sh @@ -6,12 +6,13 @@ DICT_DIR="$1" DICT_NAME="$2" DICT_VERSION="$3" TARGET_DIR="$4" +DICT_INSTALL_DIR="$5" PKG_NAME="morfeusz2-dictionary-${DICT_NAME}" TMP_DIR=`mktemp -d` PKG_DIR="$TMP_DIR"/"$PKG_NAME"_"$DICT_VERSION" -TARGET_DICT_DIR="$PKG_DIR/usr/share/morfeusz/dictionaries" +TARGET_DICT_DIR="$PKG_DIR/usr/$DICT_INSTALL_DIR" mkdir -p "$TARGET_DICT_DIR" cp "$DICT_DIR/$DICT_NAME-a.dict" "$TARGET_DICT_DIR" cp "$DICT_DIR/$DICT_NAME-s.dict" "$TARGET_DICT_DIR" diff --git a/morfeusz/CMakeLists.txt b/morfeusz/CMakeLists.txt index 3621f54..305dde5 100644 --- a/morfeusz/CMakeLists.txt +++ b/morfeusz/CMakeLists.txt @@ -39,7 +39,7 @@ else () endif () add_custom_target ( dictionary DEPENDS analyzer-dictionary generator-dictionary) add_custom_target ( dictionary-deb - COMMAND "${PROJECT_SOURCE_DIR}/createDictionaryDeb.sh" "${DEFAULT_DICT_DIR}" "${DEFAULT_DICT_NAME}" "${DICT_VERSION}" "${TARGET_DIR}" + COMMAND "${PROJECT_SOURCE_DIR}/createDictionaryDeb.sh" "${DEFAULT_DICT_DIR}" "${DEFAULT_DICT_NAME}" "${DICT_VERSION}" "${TARGET_DIR}" "${DEFAULT_DICT_INSTALL_DIR}" DEPENDS dictionary) add_custom_target ( bin-deb COMMAND "${PROJECT_SOURCE_DIR}/createBinDeb.sh" "${CMAKE_CURRENT_BINARY_DIR}" "${Morfeusz_DEB_VERSION}" "${ARCHITECTURE}" "${TARGET_DIR}" diff --git a/morfeusz/wrappers/python3/setup.py.in b/morfeusz/wrappers/python3/setup.py.in index 2b70bef..585d155 100644 --- a/morfeusz/wrappers/python3/setup.py.in +++ b/morfeusz/wrappers/python3/setup.py.in @@ -11,7 +11,7 @@ if __name__ == '__main__': setup(name='morfeusz2', author='${CPACK_PACKAGE_VENDOR}', author_email='${CPACK_PACKAGE_CONTACT}', - description='Python bindings for Morfeusz', + description='Python3 bindings for Morfeusz', version='${PY3MORFEUSZ_VERSION}', package_dir={ '': '${CMAKE_CURRENT_BINARY_DIR}'}, py_modules = ['morfeusz2'], diff --git a/profile.sh b/profile.sh index db7daa4..d7ab4e5 100755 --- a/profile.sh +++ b/profile.sh @@ -8,5 +8,5 @@ rm -f /tmp/morfeusz.prof export LD_PRELOAD="/usr/lib/libprofiler.so" export CPUPROFILE="/tmp/morfeusz.prof" -morfeusz/morfeusz_analyzer --dict sgjp --dict-dir /home/mlenart/opt/morfeusz/buildall/Linux-i386-false/_CPack_Packages/Linux/DEB/morfeusz2-2.0.0_sgjp-Linux-i386/usr/share/morfeusz/dictionaries < /mnt/storage/morfeusz/sents10k > /dev/null +morfeusz/morfeusz_analyzer --dict sgjp --dict-dir /home/mlenart/opt/morfeusz/buildall/Linux-i386-false/_CPack_Packages/Linux/DEB/morfeusz2-2.0.0_sgjp-Linux-i386/usr/share/morfeusz2/dictionaries < /mnt/storage/morfeusz/sents10k > /dev/null ### pprof --gv profbuild/morfeusz/morfeusz_analyzer /tmp/morfeusz.prof