Commit f02da332fd126c4c0e840831786254b1fda3b09e

Authored by Marcin Woliński
1 parent 620d68da

kolejne drobne poprawki w skryptach

CMakeLists.txt
@@ -91,6 +91,8 @@ if ("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64") @@ -91,6 +91,8 @@ if ("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")
91 set (ARCHITECTURE "amd64") 91 set (ARCHITECTURE "amd64")
92 elseif ("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86") 92 elseif ("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86")
93 set (ARCHITECTURE "i386") 93 set (ARCHITECTURE "i386")
  94 +elseif ("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "i686")
  95 + set (ARCHITECTURE "i386")
94 elseif ("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "") 96 elseif ("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "")
95 message (FATAL_ERROR "CMAKE_SYSTEM_PROCESSOR is not set (should be x86 or x86_64)") 97 message (FATAL_ERROR "CMAKE_SYSTEM_PROCESSOR is not set (should be x86 or x86_64)")
96 elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") 98 elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
createDictionaryDeb.sh
@@ -6,12 +6,13 @@ DICT_DIR="$1" @@ -6,12 +6,13 @@ DICT_DIR="$1"
6 DICT_NAME="$2" 6 DICT_NAME="$2"
7 DICT_VERSION="$3" 7 DICT_VERSION="$3"
8 TARGET_DIR="$4" 8 TARGET_DIR="$4"
  9 +DICT_INSTALL_DIR="$5"
9 10
10 PKG_NAME="morfeusz2-dictionary-${DICT_NAME}" 11 PKG_NAME="morfeusz2-dictionary-${DICT_NAME}"
11 12
12 TMP_DIR=`mktemp -d` 13 TMP_DIR=`mktemp -d`
13 PKG_DIR="$TMP_DIR"/"$PKG_NAME"_"$DICT_VERSION" 14 PKG_DIR="$TMP_DIR"/"$PKG_NAME"_"$DICT_VERSION"
14 -TARGET_DICT_DIR="$PKG_DIR/usr/share/morfeusz/dictionaries" 15 +TARGET_DICT_DIR="$PKG_DIR/usr/$DICT_INSTALL_DIR"
15 mkdir -p "$TARGET_DICT_DIR" 16 mkdir -p "$TARGET_DICT_DIR"
16 cp "$DICT_DIR/$DICT_NAME-a.dict" "$TARGET_DICT_DIR" 17 cp "$DICT_DIR/$DICT_NAME-a.dict" "$TARGET_DICT_DIR"
17 cp "$DICT_DIR/$DICT_NAME-s.dict" "$TARGET_DICT_DIR" 18 cp "$DICT_DIR/$DICT_NAME-s.dict" "$TARGET_DICT_DIR"
morfeusz/CMakeLists.txt
@@ -39,7 +39,7 @@ else () @@ -39,7 +39,7 @@ else ()
39 endif () 39 endif ()
40 add_custom_target ( dictionary DEPENDS analyzer-dictionary generator-dictionary) 40 add_custom_target ( dictionary DEPENDS analyzer-dictionary generator-dictionary)
41 add_custom_target ( dictionary-deb 41 add_custom_target ( dictionary-deb
42 - COMMAND "${PROJECT_SOURCE_DIR}/createDictionaryDeb.sh" "${DEFAULT_DICT_DIR}" "${DEFAULT_DICT_NAME}" "${DICT_VERSION}" "${TARGET_DIR}" 42 + COMMAND "${PROJECT_SOURCE_DIR}/createDictionaryDeb.sh" "${DEFAULT_DICT_DIR}" "${DEFAULT_DICT_NAME}" "${DICT_VERSION}" "${TARGET_DIR}" "${DEFAULT_DICT_INSTALL_DIR}"
43 DEPENDS dictionary) 43 DEPENDS dictionary)
44 add_custom_target ( bin-deb 44 add_custom_target ( bin-deb
45 COMMAND "${PROJECT_SOURCE_DIR}/createBinDeb.sh" "${CMAKE_CURRENT_BINARY_DIR}" "${Morfeusz_DEB_VERSION}" "${ARCHITECTURE}" "${TARGET_DIR}" 45 COMMAND "${PROJECT_SOURCE_DIR}/createBinDeb.sh" "${CMAKE_CURRENT_BINARY_DIR}" "${Morfeusz_DEB_VERSION}" "${ARCHITECTURE}" "${TARGET_DIR}"
morfeusz/wrappers/python3/setup.py.in
@@ -11,7 +11,7 @@ if __name__ == '__main__': @@ -11,7 +11,7 @@ if __name__ == '__main__':
11 setup(name='morfeusz2', 11 setup(name='morfeusz2',
12 author='${CPACK_PACKAGE_VENDOR}', 12 author='${CPACK_PACKAGE_VENDOR}',
13 author_email='${CPACK_PACKAGE_CONTACT}', 13 author_email='${CPACK_PACKAGE_CONTACT}',
14 - description='Python bindings for Morfeusz', 14 + description='Python3 bindings for Morfeusz',
15 version='${PY3MORFEUSZ_VERSION}', 15 version='${PY3MORFEUSZ_VERSION}',
16 package_dir={ '': '${CMAKE_CURRENT_BINARY_DIR}'}, 16 package_dir={ '': '${CMAKE_CURRENT_BINARY_DIR}'},
17 py_modules = ['morfeusz2'], 17 py_modules = ['morfeusz2'],
profile.sh
@@ -8,5 +8,5 @@ @@ -8,5 +8,5 @@
8 rm -f /tmp/morfeusz.prof 8 rm -f /tmp/morfeusz.prof
9 export LD_PRELOAD="/usr/lib/libprofiler.so" 9 export LD_PRELOAD="/usr/lib/libprofiler.so"
10 export CPUPROFILE="/tmp/morfeusz.prof" 10 export CPUPROFILE="/tmp/morfeusz.prof"
11 -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 11 +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
12 ### pprof --gv profbuild/morfeusz/morfeusz_analyzer /tmp/morfeusz.prof 12 ### pprof --gv profbuild/morfeusz/morfeusz_analyzer /tmp/morfeusz.prof