diff --git a/CMakeLists.txt b/CMakeLists.txt
index f8bdee8..288fc9a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,22 +14,20 @@ else ()
endif ()
if (DEFAULT_DICT_NAME)
- set (Morfeusz_VERSION_TWEAK "${DEFAULT_DICT_NAME}")
- if (DICT_VERSION)
- set (Morfeusz_VERSION_TWEAK "${Morfeusz_VERSION_TWEAK}.${DICT_VERSION}")
- endif()
- set (Morfeusz_VERSION "${Morfeusz_VERSION}.${Morfeusz_VERSION_TWEAK}")
- if (NOT DICT_VERSION)
- set (DICT_VERSION "1.0")
- message (WARNING "Dictionary version is missing. Setting default value=1.0")
- endif()
-
-set (CPACK_PACKAGE_VERSION "${Morfeusz_VERSION}")
-
+ set (Morfeusz_VERSION_TWEAK "${DEFAULT_DICT_NAME}")
+ if (DICT_VERSION)
+ set (Morfeusz_VERSION_TWEAK "${Morfeusz_VERSION_TWEAK}.${DICT_VERSION}")
+ endif()
+ set (Morfeusz_VERSION "${Morfeusz_VERSION}.${Morfeusz_VERSION_TWEAK}")
+ if (NOT DICT_VERSION)
+ set (DICT_VERSION "1.0")
+ message (WARNING "Dictionary version is missing. Setting default value=1.0")
+ endif()
+ set (CPACK_PACKAGE_VERSION "${Morfeusz_VERSION}")
elseif (INPUT_DICTIONARIES)
- message (FATAL_ERROR "DEFAULT_DICT_NAME option is missing.")
+ message (FATAL_ERROR "DEFAULT_DICT_NAME option is missing.")
elseif (NOT SKIP_DICTIONARY_BUILDING)
- message (WARNING "Will build WITHOUT DICTIONARY. Set INPUT_DICTIONARIES option to build with dictionary.")
+ message (WARNING "Will build WITHOUT DICTIONARY. Set INPUT_DICTIONARIES option to build with dictionary.")
endif ()
if (NOT CMAKE_BUILD_TYPE)
diff --git a/createGUIDeb.sh b/createGUIDeb.sh
index 30f669e..cf763aa 100755
--- a/createGUIDeb.sh
+++ b/createGUIDeb.sh
@@ -16,7 +16,7 @@ install -D "$SRC_DIR/gui/morfeusz.desktop" "$PKG_DIR/usr/share/applications/morf
install -D "$BIN_DIR/morfeusz.jar" "$PKG_DIR/usr/share/java/morfeusz.jar"
install -D "$SRC_DIR/gui/morfeusz.svg" "$PKG_DIR/usr/share/morfeusz2/morfeusz.svg"
install -D "$SRC_DIR/gui/morfeusz2-gui.menu" "$PKG_DIR/usr/share/menu/morfeusz2-gui"
-install -D "$SRC_DIR/gui/morfeusz2-gui" "$PKG_DIR/usr/bin/morfeusz2-gui"
+install -D "$SRC_DIR/gui/morfeusz-gui" "$PKG_DIR/usr/bin/morfeusz-gui"
#SRC_DIR="$( cd "$( dirname "$0" )" && pwd )"
diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt
index 1bf4ae2..1f650a1 100644
--- a/gui/CMakeLists.txt
+++ b/gui/CMakeLists.txt
@@ -48,17 +48,22 @@ add_jar (gui-proto-jar
# INCLUDE_JARS jmorfeusz.jar QuitAboutPreferencesHandler.jar images.jar
# INCLUDE_JARS ${CMAKE_CURRENT_BINARY_DIR}/../morfeusz/wrappers/java/jmorfeusz.jar QuitAboutPreferencesHandler.jar Images/*.png
INCLUDE_JARS jmorfeusz QuitAboutPreferencesHandler.jar
- # ENTRY_POINT morfeusz/Morfeusz
- MANIFEST MANIFEST.MF
+ ENTRY_POINT morfeusz/Morfeusz
+# Moim zdaniem byłoby eleganciej z Manifestem włączającym systemowy
+# jmorfeusz.jar, ale 14.04 (cmake 2.8.12) nie rozumie tego, więc
+# zamiast wzipowujemy całe jmorfeusz poniżej do gui-jar:
+#
+# MANIFEST MANIFEST.MF
OUTPUT_NAME morfeusz
)
add_dependencies(gui-proto-jar jmorfeusz)
add_custom_target(gui-jar
- COMMAND zip -q morfeusz.jar "*.png"
- COMMAND zip -q morfeusz.jar "*.gif"
+ COMMAND zip -q morfeusz.jar "*.png" "*.gif"
COMMAND zip -q morfeusz.jar "quitaboutpreferenceshandler/*"
+ COMMAND ln -s ../morfeusz/wrappers/java/pl .
+ COMMAND zip -qr morfeusz.jar "pl"
DEPENDS gui-proto-jar
)
@@ -68,14 +73,31 @@ add_custom_target (gui-deb
DEPENDS gui-jar
)
+if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+ if (${ARCHITECTURE} MATCHES "amd64")
+ file(COPY morfeusz-gui64.exe DESTINATION ./morfeusz-gui.exe)
+ else ()
+ file(COPY morfeusz-gui32.exe DESTINATION ./morfeusz-gui.exe)
+ endif ()
+ set (NSIS_SCRIPT "${PROJECT_SOURCE_DIR}/morfeusz.nsi")
+
+ add_custom_target (gui-installer
+ COMMAND makensis -NOCD "-DVERSION=${Morfeusz_LIB_VERSION}.${DICT_VERSION}" "$-DARCHITECTURE={ARCHITECTURE}" "-DTARGET_DIR=${TARGET_DIR}" "${NSIS_SCRIPT}"
+ DEPENDS gui-jar "${NSIS_SCRIPT}"
+ )
+
+endif ()
+
if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
set(MAC_APP_DIR "dmg/Morfeusz.app")
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"
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/"
+# 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/"
+ DEPENDS gui-jar "${NSIS_SCRIPT}"
)
endif ()
diff --git a/gui/launch4j-config32.xml b/gui/launch4j-config32.xml
new file mode 100644
index 0000000..ac5b668
--- /dev/null
+++ b/gui/launch4j-config32.xml
@@ -0,0 +1,21 @@
+<launch4jConfig>
+ <headerType>gui</headerType>
+ <jar>morfeusz.jar</jar>
+ <dontWrapJar>true</dontWrapJar>
+ <outfile>morfeusz-gui32.exe</outfile>
+ <errTitle>Morfeusz 2</errTitle>
+ <chdir>.</chdir>
+ <icon>morfeusz.ico</icon>
+ <restartOnCrash>false</restartOnCrash>
+ <jre>
+ <minVersion>1.8.0</minVersion>
+ <!-- <runtimeBits>64|64/32|32/64|32</runtimeBits> -->
+ <runtimeBits>32</runtimeBits>
+ </jre>
+ <!-- <splash> -->
+ <!-- <file>splash.bmp</file> -->
+ <!-- <waitForWindow>true</waitForWindow> -->
+ <!-- <timeout>60</timeout> -->
+ <!-- <timeoutErr>true</timeoutErr> -->
+ <!-- </splash> -->
+</launch4jConfig>
diff --git a/gui/launch4j-config64.xml b/gui/launch4j-config64.xml
new file mode 100644
index 0000000..624dedd
--- /dev/null
+++ b/gui/launch4j-config64.xml
@@ -0,0 +1,21 @@
+<launch4jConfig>
+ <headerType>gui</headerType>
+ <jar>morfeusz.jar</jar>
+ <dontWrapJar>true</dontWrapJar>
+ <outfile>morfeusz-gui64.exe</outfile>
+ <errTitle>Morfeusz 2</errTitle>
+ <chdir>.</chdir>
+ <icon>morfeusz.ico</icon>
+ <restartOnCrash>false</restartOnCrash>
+ <jre>
+ <minVersion>1.8.0</minVersion>
+ <!-- <runtimeBits>64|64/32|32/64|32</runtimeBits> -->
+ <runtimeBits>64</runtimeBits>
+ </jre>
+ <!-- <splash> -->
+ <!-- <file>splash.bmp</file> -->
+ <!-- <waitForWindow>true</waitForWindow> -->
+ <!-- <timeout>60</timeout> -->
+ <!-- <timeoutErr>true</timeoutErr> -->
+ <!-- </splash> -->
+</launch4jConfig>
diff --git a/gui/morfeusz2-gui b/gui/morfeusz-gui
index e8e9b43..e8e9b43 100755
--- a/gui/morfeusz2-gui
+++ b/gui/morfeusz-gui
diff --git a/gui/morfeusz-gui32.exe b/gui/morfeusz-gui32.exe
new file mode 100755
index 0000000..cb40ba2
--- /dev/null
+++ b/gui/morfeusz-gui32.exe
diff --git a/gui/morfeusz-gui64.exe b/gui/morfeusz-gui64.exe
new file mode 100755
index 0000000..5267523
--- /dev/null
+++ b/gui/morfeusz-gui64.exe
diff --git a/gui/morfeusz.desktop b/gui/morfeusz.desktop
index d0aad1d..c861f2e 100644
--- a/gui/morfeusz.desktop
+++ b/gui/morfeusz.desktop
@@ -5,6 +5,6 @@ Name=Morfeusz
Comment=Morphological analyzer and generator Morfeusz 2
Comment[pl]=Analizator i generator fleksyjny Morfeusz 2
Icon=/usr/share/morfeusz2/morfeusz.svg
-Exec=/usr/bin/morfeusz2-gui
+Exec=/usr/bin/morfeusz-gui
Terminal=false
Categories=Office;Dictionary;GTK;
diff --git a/gui/morfeusz.ico b/gui/morfeusz.ico
new file mode 100644
index 0000000..a4da7a2
--- /dev/null
+++ b/gui/morfeusz.ico
diff --git a/gui/morfeusz32.nsi b/gui/morfeusz.nsi
index 7b4fcc3..0a4b685 100644
--- a/gui/morfeusz32.nsi
+++ b/gui/morfeusz.nsi
@@ -4,14 +4,13 @@
# by Vlasis K. Barkas aka Red Wine red_wine@freemail.gr Sep 2006
############################################################################################
-!define APP_NAME "Morfeusz 2.0"
+!define APP_NAME "Morfeusz 2"
!define COMP_NAME "Institute of Computer Science, Polish Academy of Sciences"
-!define WEB_SITE "sgjp.pl/morfeusz"
-!define VERSION "02.00.00.00"
+!define WEB_SITE "morfeusz.sgjp.pl/"
!define COPYRIGHT "Institute of Computer Science, Polish Academy of Sciences"
-!define DESCRIPTION "Morfological analyzer for Polish"
-!define INSTALLER_NAME "Morfeusz_Setup.exe"
-!define MAIN_APP_EXE "morfeusz32.exe"
+!define DESCRIPTION "Morfological analyzer and generator for Polish"
+!define INSTALLER_NAME "morfeusz-gui${VERSION}-Windows-${ARCHITECTURE}.exe"
+!define MAIN_APP_EXE "morfeusz-gui.exe"
!define INSTALL_TYPE "SetShellVarContext all"
!define REG_ROOT "HKLM"
!define REG_APP_PATH "Software\Microsoft\Windows\CurrentVersion\App Paths\${MAIN_APP_EXE}"
@@ -39,7 +38,7 @@ OutFile "${INSTALLER_NAME}"
BrandingText "${APP_NAME}"
XPStyle on
InstallDirRegKey "${REG_ROOT}" "${REG_APP_PATH}" ""
-InstallDir "$PROGRAMFILES\Morfeusz 2.0"
+InstallDir "$PROGRAMFILES\Morfeusz 2"
######################################################################
@@ -61,7 +60,7 @@ InstallDir "$PROGRAMFILES\Morfeusz 2.0"
!insertmacro MUI_PAGE_DIRECTORY
!ifdef REG_START_MENU
-!define MUI_STARTMENUPAGE_DEFAULTFOLDER "Morfeusz 2.0"
+!define MUI_STARTMENUPAGE_DEFAULTFOLDER "Morfeusz 2"
!define MUI_STARTMENUPAGE_REGISTRY_ROOT "${REG_ROOT}"
!define MUI_STARTMENUPAGE_REGISTRY_KEY "${UNINSTALL_PATH}"
!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "${REG_START_MENU}"
@@ -96,10 +95,12 @@ Section -MainProgram
${INSTALL_TYPE}
SetOverwrite ifnewer
SetOutPath "$INSTDIR"
-File "morfeusz32.exe"
-File "jmorfeusz.dll"
-File "morfeusz2.dll"
-File "libwinpthread-1.dll"
+File "morfeusz-gui.exe"
+File "morfeusz.jar"
+#File "../morfeusz/wrappers/java/jmorfeusz.jar"
+File "../morfeusz/wrappers/java/jmorfeusz.dll"
+File "../morfeusz/morfeusz2.dll"
+#File "/usr/x86_64-w64-mingw32/lib/libwinpthread-1.dll"
SectionEnd
######################################################################
@@ -123,14 +124,14 @@ CreateShortCut "$SMPROGRAMS\$SM_Folder\${APP_NAME} Website.lnk" "$INSTDIR\${APP_
!endif
!ifndef REG_START_MENU
-CreateDirectory "$SMPROGRAMS\Morfeusz 2.0"
-CreateShortCut "$SMPROGRAMS\Morfeusz 2.0\${APP_NAME}.lnk" "$INSTDIR\${MAIN_APP_EXE}"
+CreateDirectory "$SMPROGRAMS\Morfeusz 2"
+CreateShortCut "$SMPROGRAMS\Morfeusz 2\${APP_NAME}.lnk" "$INSTDIR\${MAIN_APP_EXE}"
CreateShortCut "$DESKTOP\${APP_NAME}.lnk" "$INSTDIR\${MAIN_APP_EXE}"
-CreateShortCut "$SMPROGRAMS\Morfeusz 2.0\Uninstall ${APP_NAME}.lnk" "$INSTDIR\uninstall.exe"
+CreateShortCut "$SMPROGRAMS\Morfeusz 2\Uninstall ${APP_NAME}.lnk" "$INSTDIR\uninstall.exe"
!ifdef WEB_SITE
WriteIniStr "$INSTDIR\${APP_NAME} website.url" "InternetShortcut" "URL" "${WEB_SITE}"
-CreateShortCut "$SMPROGRAMS\Morfeusz 2.0\${APP_NAME} Website.lnk" "$INSTDIR\${APP_NAME} website.url"
+CreateShortCut "$SMPROGRAMS\Morfeusz 2\${APP_NAME} Website.lnk" "$INSTDIR\${APP_NAME} website.url"
!endif
!endif
@@ -174,14 +175,14 @@ RmDir "$SMPROGRAMS\$SM_Folder"
!endif
!ifndef REG_START_MENU
-Delete "$SMPROGRAMS\Morfeusz 2.0\${APP_NAME}.lnk"
-Delete "$SMPROGRAMS\Morfeusz 2.0\Uninstall ${APP_NAME}.lnk"
+Delete "$SMPROGRAMS\Morfeusz 2\${APP_NAME}.lnk"
+Delete "$SMPROGRAMS\Morfeusz 2\Uninstall ${APP_NAME}.lnk"
!ifdef WEB_SITE
-Delete "$SMPROGRAMS\Morfeusz 2.0\${APP_NAME} Website.lnk"
+Delete "$SMPROGRAMS\Morfeusz 2\${APP_NAME} Website.lnk"
!endif
Delete "$DESKTOP\${APP_NAME}.lnk"
-RmDir "$SMPROGRAMS\Morfeusz 2.0"
+RmDir "$SMPROGRAMS\Morfeusz 2"
!endif
DeleteRegKey ${REG_ROOT} "${REG_APP_PATH}"
diff --git a/gui/morfeusz64.nsi b/gui/morfeusz64.nsi
deleted file mode 100644
index 3eec971..0000000
--- a/gui/morfeusz64.nsi
+++ /dev/null
@@ -1,197 +0,0 @@
-############################################################################################
-# NSIS Installation Script created by NSIS Quick Setup Script Generator v1.09.18
-# Entirely Edited with NullSoft Scriptable Installation System
-# by Vlasis K. Barkas aka Red Wine red_wine@freemail.gr Sep 2006
-############################################################################################
-
-!define APP_NAME "Morfeusz 2.0"
-!define COMP_NAME "Institute of Computer Science, Polish Academy of Sciences"
-!define WEB_SITE "sgjp.pl/morfeusz"
-!define VERSION "02.00.00.00"
-!define COPYRIGHT "Institute of Computer Science, Polish Academy of Sciences"
-!define DESCRIPTION "Morfological analyzer for Polish"
-!define INSTALLER_NAME "Morfeusz_Setup.exe"
-!define MAIN_APP_EXE "morfeusz64.exe"
-!define INSTALL_TYPE "SetShellVarContext all"
-!define REG_ROOT "HKLM"
-!define REG_APP_PATH "Software\Microsoft\Windows\CurrentVersion\App Paths\${MAIN_APP_EXE}"
-!define UNINSTALL_PATH "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}"
-
-!define REG_START_MENU "Start Menu Folder"
-
-var SM_Folder
-
-######################################################################
-
-VIProductVersion "${VERSION}"
-VIAddVersionKey "ProductName" "${APP_NAME}"
-VIAddVersionKey "CompanyName" "${COMP_NAME}"
-VIAddVersionKey "LegalCopyright" "${COPYRIGHT}"
-VIAddVersionKey "FileDescription" "${DESCRIPTION}"
-VIAddVersionKey "FileVersion" "${VERSION}"
-
-######################################################################
-
-SetCompressor ZLIB
-Name "${APP_NAME}"
-Caption "${APP_NAME}"
-OutFile "${INSTALLER_NAME}"
-BrandingText "${APP_NAME}"
-XPStyle on
-InstallDirRegKey "${REG_ROOT}" "${REG_APP_PATH}" ""
-InstallDir "$PROGRAMFILES\Morfeusz 2.0"
-
-######################################################################
-
-!include "MUI.nsh"
-
-!define MUI_ABORTWARNING
-!define MUI_UNABORTWARNING
-
-!define MUI_LANGDLL_REGISTRY_ROOT "${REG_ROOT}"
-!define MUI_LANGDLL_REGISTRY_KEY "${UNINSTALL_PATH}"
-!define MUI_LANGDLL_REGISTRY_VALUENAME "Installer Language"
-
-!insertmacro MUI_PAGE_WELCOME
-
-!ifdef LICENSE_TXT
-!insertmacro MUI_PAGE_LICENSE "${LICENSE_TXT}"
-!endif
-
-!insertmacro MUI_PAGE_DIRECTORY
-
-!ifdef REG_START_MENU
-!define MUI_STARTMENUPAGE_DEFAULTFOLDER "Morfeusz 2.0"
-!define MUI_STARTMENUPAGE_REGISTRY_ROOT "${REG_ROOT}"
-!define MUI_STARTMENUPAGE_REGISTRY_KEY "${UNINSTALL_PATH}"
-!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "${REG_START_MENU}"
-!insertmacro MUI_PAGE_STARTMENU Application $SM_Folder
-!endif
-
-!insertmacro MUI_PAGE_INSTFILES
-
-!define MUI_FINISHPAGE_RUN "$INSTDIR\${MAIN_APP_EXE}"
-!insertmacro MUI_PAGE_FINISH
-
-!insertmacro MUI_UNPAGE_CONFIRM
-
-!insertmacro MUI_UNPAGE_INSTFILES
-
-!insertmacro MUI_UNPAGE_FINISH
-
-!insertmacro MUI_LANGUAGE "English"
-!insertmacro MUI_LANGUAGE "Polish"
-
-!insertmacro MUI_RESERVEFILE_LANGDLL
-
-######################################################################
-
-Function .onInit
-!insertmacro MUI_LANGDLL_DISPLAY
-FunctionEnd
-
-######################################################################
-
-Section -MainProgram
-${INSTALL_TYPE}
-SetOverwrite ifnewer
-SetOutPath "$INSTDIR"
-File "morfeusz64.exe"
-File "jmorfeusz.dll"
-File "morfeusz2.dll"
-File "libwinpthread-1.dll"
-SectionEnd
-
-######################################################################
-
-Section -Icons_Reg
-SetOutPath "$INSTDIR"
-WriteUninstaller "$INSTDIR\uninstall.exe"
-
-!ifdef REG_START_MENU
-!insertmacro MUI_STARTMENU_WRITE_BEGIN Application
-CreateDirectory "$SMPROGRAMS\$SM_Folder"
-CreateShortCut "$SMPROGRAMS\$SM_Folder\${APP_NAME}.lnk" "$INSTDIR\${MAIN_APP_EXE}"
-CreateShortCut "$DESKTOP\${APP_NAME}.lnk" "$INSTDIR\${MAIN_APP_EXE}"
-CreateShortCut "$SMPROGRAMS\$SM_Folder\Uninstall ${APP_NAME}.lnk" "$INSTDIR\uninstall.exe"
-
-!ifdef WEB_SITE
-WriteIniStr "$INSTDIR\${APP_NAME} website.url" "InternetShortcut" "URL" "${WEB_SITE}"
-CreateShortCut "$SMPROGRAMS\$SM_Folder\${APP_NAME} Website.lnk" "$INSTDIR\${APP_NAME} website.url"
-!endif
-!insertmacro MUI_STARTMENU_WRITE_END
-!endif
-
-!ifndef REG_START_MENU
-CreateDirectory "$SMPROGRAMS\Morfeusz 2.0"
-CreateShortCut "$SMPROGRAMS\Morfeusz 2.0\${APP_NAME}.lnk" "$INSTDIR\${MAIN_APP_EXE}"
-CreateShortCut "$DESKTOP\${APP_NAME}.lnk" "$INSTDIR\${MAIN_APP_EXE}"
-CreateShortCut "$SMPROGRAMS\Morfeusz 2.0\Uninstall ${APP_NAME}.lnk" "$INSTDIR\uninstall.exe"
-
-!ifdef WEB_SITE
-WriteIniStr "$INSTDIR\${APP_NAME} website.url" "InternetShortcut" "URL" "${WEB_SITE}"
-CreateShortCut "$SMPROGRAMS\Morfeusz 2.0\${APP_NAME} Website.lnk" "$INSTDIR\${APP_NAME} website.url"
-!endif
-!endif
-
-WriteRegStr ${REG_ROOT} "${REG_APP_PATH}" "" "$INSTDIR\${MAIN_APP_EXE}"
-WriteRegStr ${REG_ROOT} "${UNINSTALL_PATH}" "DisplayName" "${APP_NAME}"
-WriteRegStr ${REG_ROOT} "${UNINSTALL_PATH}" "UninstallString" "$INSTDIR\uninstall.exe"
-WriteRegStr ${REG_ROOT} "${UNINSTALL_PATH}" "DisplayIcon" "$INSTDIR\${MAIN_APP_EXE}"
-WriteRegStr ${REG_ROOT} "${UNINSTALL_PATH}" "DisplayVersion" "${VERSION}"
-WriteRegStr ${REG_ROOT} "${UNINSTALL_PATH}" "Publisher" "${COMP_NAME}"
-
-!ifdef WEB_SITE
-WriteRegStr ${REG_ROOT} "${UNINSTALL_PATH}" "URLInfoAbout" "${WEB_SITE}"
-!endif
-SectionEnd
-
-######################################################################
-
-Section Uninstall
-${INSTALL_TYPE}
-Delete "$INSTDIR\${MAIN_APP_EXE}"
-Delete "$INSTDIR\jmorfeusz.dll"
-Delete "$INSTDIR\morfeusz2.dll"
-Delete "$INSTDIR\libwinpthread-1.dll"
-Delete "$INSTDIR\uninstall.exe"
-!ifdef WEB_SITE
-Delete "$INSTDIR\${APP_NAME} website.url"
-!endif
-
-RmDir "$INSTDIR"
-
-!ifdef REG_START_MENU
-!insertmacro MUI_STARTMENU_GETFOLDER "Application" $SM_Folder
-Delete "$SMPROGRAMS\$SM_Folder\${APP_NAME}.lnk"
-Delete "$SMPROGRAMS\$SM_Folder\Uninstall ${APP_NAME}.lnk"
-!ifdef WEB_SITE
-Delete "$SMPROGRAMS\$SM_Folder\${APP_NAME} Website.lnk"
-!endif
-Delete "$DESKTOP\${APP_NAME}.lnk"
-
-RmDir "$SMPROGRAMS\$SM_Folder"
-!endif
-
-!ifndef REG_START_MENU
-Delete "$SMPROGRAMS\Morfeusz 2.0\${APP_NAME}.lnk"
-Delete "$SMPROGRAMS\Morfeusz 2.0\Uninstall ${APP_NAME}.lnk"
-!ifdef WEB_SITE
-Delete "$SMPROGRAMS\Morfeusz 2.0\${APP_NAME} Website.lnk"
-!endif
-Delete "$DESKTOP\${APP_NAME}.lnk"
-
-RmDir "$SMPROGRAMS\Morfeusz 2.0"
-!endif
-
-DeleteRegKey ${REG_ROOT} "${REG_APP_PATH}"
-DeleteRegKey ${REG_ROOT} "${UNINSTALL_PATH}"
-SectionEnd
-
-######################################################################
-
-Function un.onInit
-!insertmacro MUI_UNGETLANGUAGE
-FunctionEnd
-
-######################################################################