Commit d2095876f3abcde07d3bdcae4ce3e0906cbf3199

Authored by Marcin Woliński
1 parent 3727078a

poprawki generowania setupu

gui/CMakeLists.txt
... ... @@ -62,7 +62,7 @@ add_dependencies(gui-proto-jar jmorfeusz)
62 62 add_custom_target(gui-jar
63 63 COMMAND zip -q morfeusz.jar "*.png" "*.gif"
64 64 COMMAND zip -q morfeusz.jar "quitaboutpreferenceshandler/*"
65   - COMMAND ln -s ../morfeusz/wrappers/java/pl .
  65 + COMMAND ln -sf ../morfeusz/wrappers/java/pl .
66 66 COMMAND zip -qr morfeusz.jar "pl"
67 67 DEPENDS gui-proto-jar
68 68 )
... ... @@ -75,14 +75,18 @@ add_custom_target (gui-deb
75 75  
76 76 if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
77 77 if (${ARCHITECTURE} MATCHES "amd64")
78   - file(COPY morfeusz-gui64.exe DESTINATION ./morfeusz-gui.exe)
  78 + configure_file(morfeusz-gui64.exe morfeusz-gui.exe COPYONLY)
  79 + # file(COPY morfeusz-gui64.exe DESTINATION .)
  80 + # file(RENAME morfeusz-gui64.exe morfeusz-gui.exe)
79 81 else ()
80   - file(COPY morfeusz-gui32.exe DESTINATION ./morfeusz-gui.exe)
  82 + configure_file(morfeusz-gui32.exe morfeusz-gui.exe COPYONLY)
  83 + # file(COPY morfeusz-gui32.exe DESTINATION .)
  84 + # file(RENAME morfeusz-gui32.exe morfeusz-gui.exe)
81 85 endif ()
82   - set (NSIS_SCRIPT "${PROJECT_SOURCE_DIR}/morfeusz.nsi")
  86 + set (NSIS_SCRIPT "${PROJECT_SOURCE_DIR}/gui/morfeusz.nsi")
83 87  
84 88 add_custom_target (gui-installer
85   - COMMAND makensis -NOCD "-DVERSION=${Morfeusz_LIB_VERSION}.${DICT_VERSION}" "$-DARCHITECTURE={ARCHITECTURE}" "-DTARGET_DIR=${TARGET_DIR}" "${NSIS_SCRIPT}"
  89 + COMMAND makensis -NOCD "-DVERSION=${Morfeusz_LIB_VERSION}.${DICT_VERSION}" "-DARCHITECTURE=${ARCHITECTURE}" "-DTARGET_DIR=${TARGET_DIR}" "${NSIS_SCRIPT}"
86 90 DEPENDS gui-jar "${NSIS_SCRIPT}"
87 91 )
88 92  
... ... @@ -98,6 +102,6 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
98 102 COMMAND install -D "${CMAKE_CURRENT_BINARY_DIR}/morfeusz.jar" "${MAC_APP_DIR}/Contents/Java/morfeusz.jar"
99 103 # COMMAND install -D "${CMAKE_CURRENT_BINARY_DIR}/../morfeusz/wrappers/java/jmorfeusz.jar" "${MAC_APP_DIR}/Contents/Java/jmorfeusz.jar"
100 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/"
101   - DEPENDS gui-jar "${NSIS_SCRIPT}"
  105 + DEPENDS gui-jar
102 106 )
103 107 endif ()
... ...
gui/morfeusz.nsi
... ... @@ -9,7 +9,7 @@
9 9 !define WEB_SITE "morfeusz.sgjp.pl/"
10 10 !define COPYRIGHT "Institute of Computer Science, Polish Academy of Sciences"
11 11 !define DESCRIPTION "Morfological analyzer and generator for Polish"
12   -!define INSTALLER_NAME "morfeusz-gui${VERSION}-Windows-${ARCHITECTURE}.exe"
  12 +!define INSTALLER_NAME "${TARGET_DIR}/morfeusz-gui${VERSION}-Windows-${ARCHITECTURE}.exe"
13 13 !define MAIN_APP_EXE "morfeusz-gui.exe"
14 14 !define INSTALL_TYPE "SetShellVarContext all"
15 15 !define REG_ROOT "HKLM"
... ...