SGJP / Morfeusz

Commit f02da332fd126c4c0e840831786254b1fda3b09e

Authored by Marcin Woliński
1 parent 620d68da

kolejne drobne poprawki w skryptach

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