SGJP / Morfeusz

Commit 94d94779a43b7b9aba6cb6424da60b3b7188ce41

Authored by Michał Lenart
1 parent a7f712c5

poprawki w skrypcie buildAll.sh, próba usunięcia części błędów lintiana 

git-svn-id: svn://svn.nlp.ipipan.waw.pl/morfeusz/morfeusz@200 ff4e3ee1-f430-4e82-ade0-24591c43f1fd
Inline Side-by-side
Showing 4 changed files with 63 additions and 50 deletions
CMakeLists.txt
  View file @94d9477
... ... @@ -5,7 +5,15 @@ project (Morfeusz)
5 5 set (Morfeusz_VERSION_MAJOR 2)
6 6 set (Morfeusz_VERSION_MINOR 0)
7 7 set (Morfeusz_VERSION_PATCH 0)
  8 +set (Morfeusz_VERSION "${Morfeusz_VERSION_MAJOR}.${Morfeusz_VERSION_MINOR}.${Morfeusz_VERSION_PATCH}")
  9 +if (NOT ${VERSION_SUFFIX} STREQUAL "")
  10 + set (Morfeusz_VERSION_TWEAK "${VERSION_SUFFIX}")
  11 + set (Morfeusz_VERSION "${Morfeusz_VERSION}_${Morfeusz_VERSION_TWEAK}")
  12 +endif ()
8 13 set (CMAKE_BUILD_TYPE Release)
  14 +set (CMAKE_SKIP_RPATH ON)
  15 +
  16 +message ("Version=${Morfeusz_VERSION}")
9 17  
10 18 enable_testing()
11 19  
... ... @@ -25,7 +33,7 @@ else ()
25 33 endif ()
26 34  
27 35 # PROJECT_VERSION
28   -set (PROJECT_VERSION "${Morfeusz_VERSION_MAJOR}.${Morfeusz_VERSION_MINOR}.${Morfeusz_VERSION_PATCH}")
  36 +#~ set (PROJECT_VERSION "${Morfeusz_VERSION_MAJOR}.${Morfeusz_VERSION_MINOR}.${Morfeusz_VERSION_PATCH}")
29 37  
30 38 ### USER DEFINED VARIABLES
31 39  
... ... @@ -103,7 +111,7 @@ set (CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
103 111 ########## Configure CPack ##########
104 112  
105 113 # general
106   -set (CPACK_PACKAGE_FILE_NAME "morfeusz2-${PROJECT_VERSION}-${CMAKE_SYSTEM_NAME}-${ARCHITECTURE}")
  114 +set (CPACK_PACKAGE_FILE_NAME "morfeusz2-${Morfeusz_VERSION}-${CMAKE_SYSTEM_NAME}-${ARCHITECTURE}")
107 115 set (CPACK_PACKAGE_VENDOR "Michał Lenart")
108 116 set (CPACK_PACKAGE_CONTACT "michal.lenart@ipipan.waw.pl")
109 117 set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "Morphological analyzer for the Polish language.")
... ...
buildAll.sh
  View file @94d9477
... ... @@ -4,6 +4,7 @@ set -e -o pipefail
4 4  
5 5 export CROSSMORFEUSZ_ROOT="$1"
6 6 export INPUT_DICTIONARIES="$2"
  7 +export VERSION_SUFFIX="$3"
7 8  
8 9 function build {
9 10 set -e -o pipefail
... ... @@ -12,12 +13,12 @@ function build {
12 13 shift
13 14 shift
14 15 targets=$@
15   -
  16 +
16 17 srcDir=`pwd`
17 18 buildDir=buildall/$os-$arch
18   - targetDir=$srcDir/target/$os-$arch
  19 + targetDir=$srcDir/target
19 20 toolchain=$srcDir/morfeusz/Toolchain-$os-$arch.cmake
20   -
  21 +
21 22 echo "Will use $toolchain toolchain"
22 23  
23 24 rm -rf $buildDir
... ... @@ -26,10 +27,11 @@ function build {
26 27 mkdir -p $targetDir
27 28 cd $buildDir
28 29 cmake -D CROSSMORFEUSZ_ROOT=$CROSSMORFEUSZ_ROOT \
29   - -D CMAKE_TOOLCHAIN_FILE=$toolchain \
30   - -D TARGET_DIR=$targetDir \
31   - -D INPUT_DICTIONARIES=$INPUT_DICTIONARIES \
32   - $srcDir
  30 + -D CMAKE_TOOLCHAIN_FILE=$toolchain \
  31 + -D TARGET_DIR=$targetDir \
  32 + -D INPUT_DICTIONARIES=$INPUT_DICTIONARIES \
  33 + -D VERSION_SUFFIX=$VERSION_SUFFIX \
  34 + $srcDir 2>&1
33 35 echo "building $toolchain" >&2
34 36 make
35 37 make $targets
... ... @@ -42,23 +44,23 @@ function build {
42 44 cd "$srcDir"
43 45 }
44 46  
  47 +function log {
  48 + os=$1
  49 + arch=$2
  50 + stdbuf -oL sed -e $"s/^/$os-$arch:\t/" | tee "log/$os-$arch.out"
  51 +}
  52 +
45 53 export -f build
  54 +export -f log
46 55  
47 56 rm -rf log
48 57 mkdir -p log
49   -#{
50   -# echo "build Linux amd64 package package-java package-python package-builder &> log/linux-amd64.out"
51   -# echo "LDFLAGS=-m32;CFLAGS=-m32;CXXFLAGS=-m32 build Linux i386 package package-java package-builder &> log/linux-i386.out"
52   -# echo "build Windows amd64 package package-java package-builder &> log/windows-amd64.out"
53   -# echo "build Windows i386 package package-java package-builder &> log/windows-i386.out"
54   -# echo "build Darwin amd64 package package-builder package-java &> log/darwin-amd64.out"
55   -#} | xargs --null |
56 58  
57 59 parallel -j5 bash -c -- \
58   - "build Linux amd64 package package-java package-python package-builder 2>&1 | tee log/linux-amd64.out" \
59   - "LDFLAGS=-m32;CFLAGS=-m32;CXXFLAGS=-m32 build Linux i386 package package-java package-builder 2>&1 | tee log/linux-i386.out" \
60   - "build Windows amd64 package package-java package-builder 2>&1 | tee log/windows-amd64.out" \
61   - "build Windows i386 package package-java package-builder 2>&1 | tee log/windows-i386.out" \
62   - "build Darwin amd64 package package-builder package-java 2>&1 | tee log/darwin-amd64.out"
  60 + "build Linux amd64 package package-java package-python package-builder 2>&1 | log Linux amd64" \
  61 + "LDFLAGS=-m32;CFLAGS=-m32;CXXFLAGS=-m32 build Linux i386 package package-java 2>&1 | log Linux i386" \
  62 + "build Windows amd64 package package-java 2>&1 | log Windows amd64" \
  63 + "build Windows i386 package package-java 2>&1 | log Windows i386" \
  64 + "build Darwin amd64 package package-java 2>&1 | log Darwin amd64"
63 65  
64 66  
... ...
fsabuilder/CMakeLists.txt
  View file @94d9477
... ... @@ -16,37 +16,40 @@ add_custom_command (OUTPUT ${SETUP_PY}
16 16  
17 17 add_custom_target (builder-setup DEPENDS ${SETUP_PY})
18 18  
19   -if (${UNIX})
20   - add_custom_target (install-builder
21   - COMMAND python ${SETUP_PY} install --home=${CMAKE_INSTALL_PREFIX}
  19 +add_custom_target (install-builder
  20 + COMMAND python ${SETUP_PY} install --home=${CMAKE_INSTALL_PREFIX}
  21 + DEPENDS builder-setup
  22 +)
  23 +#~ add_custom_target (package-builder-tgz
  24 + #~ COMMAND python ${SETUP_PY} bdist -d "${TARGET_DIR}" --plat-name='all'
  25 + #~ DEPENDS builder-setup
  26 +#~ )
  27 +add_custom_target (package-builder-egg
  28 + COMMAND python ${SETUP_PY} bdist_egg -d "${TARGET_DIR}"
  29 + DEPENDS builder-setup
  30 +)
  31 +add_custom_target (package-builder-sdist
  32 + COMMAND python ${SETUP_PY} sdist -d "${TARGET_DIR}"
  33 + DEPENDS builder-setup
  34 +)
  35 +
  36 +set (PACKAGE_DEPENDS "package-builder-egg" "package-builder-sdist")
  37 +
  38 +if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
  39 + add_custom_target (package-builder-deb-sdist
  40 + COMMAND python ${SETUP_PY} --command-packages=stdeb.command sdist_dsc --package "${MORFEUSZBUILDER}" --depends "${CPACK_DEBIAN_PACKAGE_NAME}" --depends python-pyparsing
22 41 DEPENDS builder-setup
23 42 )
24   - add_custom_target (package-builder-tgz
25   - COMMAND python ${SETUP_PY} bdist -d "${TARGET_DIR}"
26   - DEPENDS builder-setup
  43 + add_custom_target (package-builder-deb-build
  44 + COMMAND debuild -us -uc
  45 + WORKING_DIRECTORY deb_dist/${MORFEUSZBUILDER}-${MORFEUSZBUILDER_VERSION}
  46 + DEPENDS package-builder-deb-sdist
27 47 )
28   - add_custom_target (package-builder-egg
29   - COMMAND python ${SETUP_PY} bdist_egg -d "${TARGET_DIR}"
30   - DEPENDS builder-setup
  48 + add_custom_target(package-builder-deb
  49 + COMMAND mkdir -p "${TARGET_DIR}" && cp ${CMAKE_CURRENT_BINARY_DIR}/deb_dist/${MORFEUSZBUILDER}*.deb "${TARGET_DIR}"
  50 + DEPENDS package-builder-deb-build
31 51 )
32   - set (PACKAGE_DEPENDS "package-builder-egg" "package-builder-tgz")
33   -
34   - if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
35   - add_custom_target (package-builder-deb-sdist
36   - COMMAND python ${SETUP_PY} --command-packages=stdeb.command sdist_dsc --package "${MORFEUSZBUILDER}" --depends "${CPACK_DEBIAN_PACKAGE_NAME}" --depends python-pyparsing
37   - DEPENDS builder-setup
38   - )
39   - add_custom_target (package-builder-deb-build
40   - COMMAND debuild -us -uc
41   - WORKING_DIRECTORY deb_dist/${MORFEUSZBUILDER}-${MORFEUSZBUILDER_VERSION}
42   - DEPENDS package-builder-deb-sdist
43   - )
44   - add_custom_target(package-builder-deb
45   - COMMAND mkdir -p "${TARGET_DIR}" && cp ${CMAKE_CURRENT_BINARY_DIR}/deb_dist/${MORFEUSZBUILDER}*.deb "${TARGET_DIR}"
46   - DEPENDS package-builder-deb-build
47   - )
48   - list (APPEND PACKAGE_DEPENDS package-builder-deb)
49   - endif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
  52 + list (APPEND PACKAGE_DEPENDS package-builder-deb)
50 53 elseif (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
51 54 #~ add_custom_target (package-python-win-installer
52 55 #~ COMMAND python ${SETUP_PY} bdist_wininst -d ${TARGET_DIR} --plat-name "${CMAKE_SYSTEM_NAME}-${ARCHITECTURE}"
... ...
morfeusz/python/CMakeLists.txt
  View file @94d9477
... ... @@ -16,7 +16,7 @@ set (SWIG_PYTHON_OUTFILE_CXX "${CMAKE_CURRENT_BINARY_DIR}/swigPYTHON.cpp")
16 16 set (SWIG_PYTHON_OUTFILE_PY "${CMAKE_CURRENT_BINARY_DIR}/morfeusz2.py")
17 17 add_custom_command (
18 18 OUTPUT "${SWIG_PYTHON_OUTFILE_CXX}" "${SWIG_PYTHON_OUTFILE_PY}"
19   - COMMAND swig -python -c++ -o "${SWIG_PYTHON_OUTFILE_CXX}" ${CMAKE_SOURCE_DIR}/morfeusz/morfeusz.i
  19 + COMMAND swig -python -c++ -o "${SWIG_PYTHON_OUTFILE_CXX}" "${CMAKE_SOURCE_DIR}/morfeusz/morfeusz.i"
20 20 DEPENDS libmorfeusz
21 21 )
22 22 add_custom_target (generate_python_wrapper
... ... @@ -56,7 +56,7 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
56 56 set (PACKAGE_DEPENDS "package-python-bin")
57 57  
58 58 add_custom_target (package-python-deb-sdist
59   - COMMAND python ${SETUP_PY} --command-packages=stdeb.command sdist_dsc --depends "${CPACK_DEBIAN_PACKAGE_NAME}"
  59 + COMMAND python ${SETUP_PY} --command-packages=stdeb.command sdist_dsc --depends "${CPACK_DEBIAN_PACKAGE_NAME}" --copyright-file "${PROJECT_SOURCE_DIR}/License.txt"
60 60 DEPENDS pymorfeusz
61 61 )
62 62 add_custom_target (package-python-deb-build
... ...