From 4d93941eccf968ded9fdd284733264a31a4ab5a3 Mon Sep 17 00:00:00 2001
From: Marcin Woliński <wolinski@ipipan.waw.pl>
Date: Fri, 5 Jul 2019 12:50:39 +0200
Subject: [PATCH] tworzenie .tgz z GUI na Linuksie
---
gui/CMakeLists.txt | 15 +++++++++++----
gui/morfeusz-gui.LD_PATH | 5 +++++
morfeusz/const.cpp | 2 +-
3 files changed, 17 insertions(+), 5 deletions(-)
create mode 100755 gui/morfeusz-gui.LD_PATH
diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt
index 88b49c4..92f95cf 100644
--- a/gui/CMakeLists.txt
+++ b/gui/CMakeLists.txt
@@ -62,17 +62,23 @@ add_dependencies(gui-proto-jar jmorfeusz)
add_custom_target(gui-jar
COMMAND zip -q morfeusz.jar "*.png" "*.gif"
COMMAND zip -q morfeusz.jar "quitaboutpreferenceshandler/*"
- COMMAND ln -sf ../morfeusz/wrappers/java/pl .
+ COMMAND ln -sf ../morfeusz/wrappers/java/CMakeFiles/jmorfeusz.dir/pl .
COMMAND zip -qr morfeusz.jar "pl"
DEPENDS gui-proto-jar
)
-
add_custom_target (gui-deb
COMMAND "${PROJECT_SOURCE_DIR}/createGUIDeb.sh" "${PROJECT_SOURCE_DIR}" "${CMAKE_CURRENT_BINARY_DIR}" "${Morfeusz_DEB_VERSION}" "${ARCHITECTURE}" "${TARGET_DIR}"
DEPENDS gui-jar
)
+add_custom_target (gui-tgz
+ COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/morfeusz-gui.LD_PATH morfeusz-gui
+ COMMAND cp ../morfeusz/wrappers/java/libjmorfeusz.so ../morfeusz/libmorfeusz2.so .
+ COMMAND tar czvf "${TARGET_DIR}/morfeusz2-gui-${Morfeusz_LIB_VERSION}.${DICT_VERSION}-Linux-${ARCHITECTURE}.tgz" morfeusz-gui morfeusz.jar libjmorfeusz.so libmorfeusz2.so
+ DEPENDS gui-jar
+ )
+
if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
if (${ARCHITECTURE} MATCHES "amd64")
configure_file(morfeusz-gui64.exe morfeusz-gui.exe COPYONLY)
@@ -97,8 +103,9 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
file(COPY Morfeusz.app/ DESTINATION "${MAC_APP_DIR}")
add_custom_target(gui-dmg
- COMMAND install -D "${CMAKE_CURRENT_BINARY_DIR}/../morfeusz/libmorfeusz2.dylib" "${MAC_APP_DIR}/Contents/MacOS/libmorfeusz2.dylib"
- COMMAND install -D "${CMAKE_CURRENT_BINARY_DIR}/../morfeusz/wrappers/java/libjmorfeusz.jnilib" "${MAC_APP_DIR}/Contents/MacOS/libjmorfeusz.jnilib"
+ # muszą być dyliby z podkatalogu gui-libs, które mają inaczej ustawione name
+ COMMAND install -D "${CMAKE_CURRENT_BINARY_DIR}/../morfeusz/gui-libs/libmorfeusz2.dylib" "${MAC_APP_DIR}/Contents/MacOS/libmorfeusz2.dylib"
+ COMMAND install -D "${CMAKE_CURRENT_BINARY_DIR}/../morfeusz/wrappers/java/gui-libs/libjmorfeusz.jnilib" "${MAC_APP_DIR}/Contents/MacOS/libjmorfeusz.jnilib"
COMMAND install -D "${CMAKE_CURRENT_BINARY_DIR}/morfeusz.jar" "${MAC_APP_DIR}/Contents/Java/morfeusz.jar"
# COMMAND install -D "${CMAKE_CURRENT_BINARY_DIR}/../morfeusz/wrappers/java/jmorfeusz.jar" "${MAC_APP_DIR}/Contents/Java/jmorfeusz.jar"
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/"
diff --git a/gui/morfeusz-gui.LD_PATH b/gui/morfeusz-gui.LD_PATH
new file mode 100755
index 0000000..61d01cd
--- /dev/null
+++ b/gui/morfeusz-gui.LD_PATH
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+GUI_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+LD_LIBRARY_PATH="${GUI_DIR}" java -jar morfeusz.jar
diff --git a/morfeusz/const.cpp b/morfeusz/const.cpp
index c1e8ed9..cd5dae6 100644
--- a/morfeusz/const.cpp
+++ b/morfeusz/const.cpp
@@ -14,7 +14,7 @@ namespace morfeusz {
extern const char FILESYSTEM_PATH_SEPARATOR = '/';
extern const std::string COPYRIGHT_TEXT =
- "Copyright © 2014 by Institute of Computer Science, Polish Academy of\n\
+ "Copyright © 2014–2019 by Institute of Computer Science, Polish Academy of\n\
Science\n\
\n\
All rights reserved.\n\
--
libgit2 0.22.2