Commit 284e87db95371f3c2d62dc0e607f86d1134e1efb

Authored by Michał Lenart
1 parent cd550c5b

wyrzucenie pythona z cross-kompilacji (bo i tak nie działał), poprawki w buildAll.sh

git-svn-id: svn://svn.nlp.ipipan.waw.pl/morfeusz/morfeusz@197 ff4e3ee1-f430-4e82-ade0-24591c43f1fd
buildAll.sh
... ... @@ -22,7 +22,11 @@ function build {
22 22 mkdir -p $buildDir
23 23 mkdir -p $targetDir
24 24 cd $buildDir
25   - cmake -D CROSSMORFEUSZ_ROOT=/mnt/storage/crossmorfeusz -D CMAKE_TOOLCHAIN_FILE=$toolchain -D TARGET_DIR=$targetDir $srcDir
  25 + cmake -D CROSSMORFEUSZ_ROOT=/home/mlenart/opt/crossmorfeusz \
  26 + -D CMAKE_TOOLCHAIN_FILE=$toolchain \
  27 + -D TARGET_DIR=$targetDir \
  28 + -D INPUT_DICTIONARIES=/home/jszejko/morfeusz/morfeusz/input/dodatki.tab,/home/jszejko/morfeusz/morfeusz/input/PoliMorfSmall.tab \
  29 + $srcDir
26 30 echo "building $toolchain" >&2
27 31 make
28 32 make $targets
... ... @@ -47,11 +51,11 @@ mkdir -p log
47 51 # echo "build Darwin amd64 package package-builder package-java &> log/darwin-amd64.out"
48 52 #} | xargs --null |
49 53  
50   -parallel -j2 bash -c -- \
51   - "build Linux amd64 package package-java package-python package-builder &> log/linux-amd64.out" \
52   - "LDFLAGS=-m32;CFLAGS=-m32;CXXFLAGS=-m32 build Linux i386 package package-java package-builder &> log/linux-i386.out" \
53   - "build Windows amd64 package package-java package-builder &> log/windows-amd64.out" \
54   - "build Windows i386 package package-java package-builder &> log/windows-i386.out" \
55   - "build Darwin amd64 package package-builder package-java &> log/darwin-amd64.out"
  54 +parallel -j5 bash -c -- \
  55 + "build Linux amd64 package package-java package-python package-builder 2>&1 | tee log/linux-amd64.out" \
  56 + "LDFLAGS=-m32;CFLAGS=-m32;CXXFLAGS=-m32 build Linux i386 package package-java package-builder 2>&1 | tee log/linux-i386.out" \
  57 + "build Windows amd64 package package-java package-builder 2>&1 | tee log/windows-amd64.out" \
  58 + "build Windows i386 package package-java package-builder 2>&1 | tee log/windows-i386.out" \
  59 + "build Darwin amd64 package package-builder package-java 2>&1 | tee log/darwin-amd64.out"
56 60  
57 61  
... ...
morfeusz/python/CMakeLists.txt
... ... @@ -19,7 +19,7 @@ add_custom_command (
19 19 COMMAND swig -python -c++ -o "${SWIG_PYTHON_OUTFILE_CXX}" ${CMAKE_SOURCE_DIR}/morfeusz/morfeusz.i
20 20 DEPENDS libmorfeusz
21 21 )
22   -add_custom_target (generate_python_wrapper ALL
  22 +add_custom_target (generate_python_wrapper
23 23 DEPENDS "${SWIG_PYTHON_OUTFILE_CXX}" "${SWIG_PYTHON_OUTFILE_PY}")
24 24  
25 25 set (SETUP_PY_IN "${CMAKE_CURRENT_SOURCE_DIR}/setup.py.in")
... ... @@ -30,18 +30,18 @@ set (OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/build")
30 30  
31 31 configure_file (${SETUP_PY_IN} ${SETUP_PY})
32 32  
33   -add_custom_target (generate_python_setup_file ALL
  33 +add_custom_target (generate_python_setup_file
34 34 DEPENDS ${SETUP_PY})
35 35  
36 36 add_custom_command (OUTPUT ${OUTPUT}
37 37 COMMAND python
38 38 ARGS ${SETUP_PY} build
39   - DEPENDS generate_python_wrapper generate_python_setup_file)
  39 + DEPENDS generate_python_wrapper generate_python_setup_file libmorfeusz)
40 40  
41   -add_custom_target (build_python_wrapper ALL
  41 +add_custom_target (build_python_wrapper
42 42 DEPENDS ${OUTPUT})
43 43  
44   -add_custom_target (pymorfeusz ALL
  44 +add_custom_target (pymorfeusz
45 45 DEPENDS generate_python_wrapper generate_python_setup_file libmorfeusz build_python_wrapper)
46 46  
47 47 if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
... ...