Commit 4d93941eccf968ded9fdd284733264a31a4ab5a3
1 parent
a48067ec
tworzenie .tgz z GUI na Linuksie
Showing
3 changed files
with
17 additions
and
5 deletions
gui/CMakeLists.txt
@@ -62,17 +62,23 @@ add_dependencies(gui-proto-jar jmorfeusz) | @@ -62,17 +62,23 @@ add_dependencies(gui-proto-jar jmorfeusz) | ||
62 | add_custom_target(gui-jar | 62 | add_custom_target(gui-jar |
63 | COMMAND zip -q morfeusz.jar "*.png" "*.gif" | 63 | COMMAND zip -q morfeusz.jar "*.png" "*.gif" |
64 | COMMAND zip -q morfeusz.jar "quitaboutpreferenceshandler/*" | 64 | COMMAND zip -q morfeusz.jar "quitaboutpreferenceshandler/*" |
65 | - COMMAND ln -sf ../morfeusz/wrappers/java/pl . | 65 | + COMMAND ln -sf ../morfeusz/wrappers/java/CMakeFiles/jmorfeusz.dir/pl . |
66 | COMMAND zip -qr morfeusz.jar "pl" | 66 | COMMAND zip -qr morfeusz.jar "pl" |
67 | DEPENDS gui-proto-jar | 67 | DEPENDS gui-proto-jar |
68 | ) | 68 | ) |
69 | 69 | ||
70 | - | ||
71 | add_custom_target (gui-deb | 70 | add_custom_target (gui-deb |
72 | COMMAND "${PROJECT_SOURCE_DIR}/createGUIDeb.sh" "${PROJECT_SOURCE_DIR}" "${CMAKE_CURRENT_BINARY_DIR}" "${Morfeusz_DEB_VERSION}" "${ARCHITECTURE}" "${TARGET_DIR}" | 71 | COMMAND "${PROJECT_SOURCE_DIR}/createGUIDeb.sh" "${PROJECT_SOURCE_DIR}" "${CMAKE_CURRENT_BINARY_DIR}" "${Morfeusz_DEB_VERSION}" "${ARCHITECTURE}" "${TARGET_DIR}" |
73 | DEPENDS gui-jar | 72 | DEPENDS gui-jar |
74 | ) | 73 | ) |
75 | 74 | ||
75 | +add_custom_target (gui-tgz | ||
76 | + COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/morfeusz-gui.LD_PATH morfeusz-gui | ||
77 | + COMMAND cp ../morfeusz/wrappers/java/libjmorfeusz.so ../morfeusz/libmorfeusz2.so . | ||
78 | + COMMAND tar czvf "${TARGET_DIR}/morfeusz2-gui-${Morfeusz_LIB_VERSION}.${DICT_VERSION}-Linux-${ARCHITECTURE}.tgz" morfeusz-gui morfeusz.jar libjmorfeusz.so libmorfeusz2.so | ||
79 | + DEPENDS gui-jar | ||
80 | + ) | ||
81 | + | ||
76 | if (${CMAKE_SYSTEM_NAME} MATCHES "Windows") | 82 | if (${CMAKE_SYSTEM_NAME} MATCHES "Windows") |
77 | if (${ARCHITECTURE} MATCHES "amd64") | 83 | if (${ARCHITECTURE} MATCHES "amd64") |
78 | configure_file(morfeusz-gui64.exe morfeusz-gui.exe COPYONLY) | 84 | configure_file(morfeusz-gui64.exe morfeusz-gui.exe COPYONLY) |
@@ -97,8 +103,9 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") | @@ -97,8 +103,9 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") | ||
97 | file(COPY Morfeusz.app/ DESTINATION "${MAC_APP_DIR}") | 103 | file(COPY Morfeusz.app/ DESTINATION "${MAC_APP_DIR}") |
98 | 104 | ||
99 | add_custom_target(gui-dmg | 105 | add_custom_target(gui-dmg |
100 | - COMMAND install -D "${CMAKE_CURRENT_BINARY_DIR}/../morfeusz/libmorfeusz2.dylib" "${MAC_APP_DIR}/Contents/MacOS/libmorfeusz2.dylib" | ||
101 | - COMMAND install -D "${CMAKE_CURRENT_BINARY_DIR}/../morfeusz/wrappers/java/libjmorfeusz.jnilib" "${MAC_APP_DIR}/Contents/MacOS/libjmorfeusz.jnilib" | 106 | + # muszą być dyliby z podkatalogu gui-libs, które mają inaczej ustawione name |
107 | + COMMAND install -D "${CMAKE_CURRENT_BINARY_DIR}/../morfeusz/gui-libs/libmorfeusz2.dylib" "${MAC_APP_DIR}/Contents/MacOS/libmorfeusz2.dylib" | ||
108 | + COMMAND install -D "${CMAKE_CURRENT_BINARY_DIR}/../morfeusz/wrappers/java/gui-libs/libjmorfeusz.jnilib" "${MAC_APP_DIR}/Contents/MacOS/libjmorfeusz.jnilib" | ||
102 | COMMAND install -D "${CMAKE_CURRENT_BINARY_DIR}/morfeusz.jar" "${MAC_APP_DIR}/Contents/Java/morfeusz.jar" | 109 | COMMAND install -D "${CMAKE_CURRENT_BINARY_DIR}/morfeusz.jar" "${MAC_APP_DIR}/Contents/Java/morfeusz.jar" |
103 | # COMMAND install -D "${CMAKE_CURRENT_BINARY_DIR}/../morfeusz/wrappers/java/jmorfeusz.jar" "${MAC_APP_DIR}/Contents/Java/jmorfeusz.jar" | 110 | # COMMAND install -D "${CMAKE_CURRENT_BINARY_DIR}/../morfeusz/wrappers/java/jmorfeusz.jar" "${MAC_APP_DIR}/Contents/Java/jmorfeusz.jar" |
104 | COMMAND genisoimage -V Morfeusz2 -D -R -apple -no-pad -o "${TARGET_DIR}/morfeusz2-gui_${Morfeusz_LIB_VERSION}.${DICT_VERSION}-${CMAKE_SYSTEM_NAME}-${ARCHITECTURE}.dmg" "dmg/" | 111 | COMMAND genisoimage -V Morfeusz2 -D -R -apple -no-pad -o "${TARGET_DIR}/morfeusz2-gui_${Morfeusz_LIB_VERSION}.${DICT_VERSION}-${CMAKE_SYSTEM_NAME}-${ARCHITECTURE}.dmg" "dmg/" |
gui/morfeusz-gui.LD_PATH
0 → 100755
morfeusz/const.cpp
@@ -14,7 +14,7 @@ namespace morfeusz { | @@ -14,7 +14,7 @@ namespace morfeusz { | ||
14 | extern const char FILESYSTEM_PATH_SEPARATOR = '/'; | 14 | extern const char FILESYSTEM_PATH_SEPARATOR = '/'; |
15 | 15 | ||
16 | extern const std::string COPYRIGHT_TEXT = | 16 | extern const std::string COPYRIGHT_TEXT = |
17 | - "Copyright © 2014 by Institute of Computer Science, Polish Academy of\n\ | 17 | + "Copyright © 2014–2019 by Institute of Computer Science, Polish Academy of\n\ |
18 | Science\n\ | 18 | Science\n\ |
19 | \n\ | 19 | \n\ |
20 | All rights reserved.\n\ | 20 | All rights reserved.\n\ |