From ba997be747666c74c46c734cb636a8de84c582b3 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 17 Dec 2011 16:42:27 +0300 Subject: Move target cursors to themes. Remove old unused target cursors. --- packaging/windows/setup.nsi | 2 -- 1 file changed, 2 deletions(-) (limited to 'packaging/windows') diff --git a/packaging/windows/setup.nsi b/packaging/windows/setup.nsi index ebb2002a1..9767cf685 100644 --- a/packaging/windows/setup.nsi +++ b/packaging/windows/setup.nsi @@ -268,8 +268,6 @@ Section "Core files (required)" SecCore File "${SRCDIR}\README.txt" SetOutPath "$INSTDIR\data\fonts" File "${SRCDIR}\data\fonts\*.ttf" - SetOutPath "$INSTDIR\data\graphics" - File "${SRCDIR}\data\graphics\*.png" SetOutPath "$INSTDIR\data\graphics\gui" File "${SRCDIR}\data\graphics\gui\*.png" File "${SRCDIR}\data\graphics\gui\*.xml" -- cgit v1.2.3-60-g2f50 From 22bf37caec833bf38387a3a9f2d42bf3ea9bb3f4 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 4 Jan 2012 21:37:48 +0300 Subject: Add shortcut to start client in testing mode. --- CMakeLists.txt | 1 + Makefile.am | 3 ++- manaplustest.desktop | 17 +++++++++++++++++ packaging/windows/setup.nsi | 5 +++++ 4 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 manaplustest.desktop (limited to 'packaging/windows') diff --git a/CMakeLists.txt b/CMakeLists.txt index 74bd0169b..3259f04d6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -55,6 +55,7 @@ ENDIF() If(UNIX) INSTALL(FILES manaplus.desktop DESTINATION share/applications) + INSTALL(FILES manaplustest.desktop DESTINATION share/applications) ENDIF() SET(CPACK_PACKAGE_NAME "manaplus") diff --git a/Makefile.am b/Makefile.am index 6ef412c71..917a92036 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,7 +3,8 @@ SUBDIRS = data docs po src desktopdir = $(datarootdir)/applications -desktop_DATA = manaplus.desktop +desktop_DATA = manaplus.desktop \ + manaplustest.desktop # Extra files to include EXTRA_DIST = $(desktop_DATA) \ diff --git a/manaplustest.desktop b/manaplustest.desktop new file mode 100644 index 000000000..d8cdc8e54 --- /dev/null +++ b/manaplustest.desktop @@ -0,0 +1,17 @@ + +[Desktop Entry] +Version=1.0 +Name=ManaPlus (Tests) +Comment=A 2D MMORPG client +Comment[fr]=Un jeu en ligne dans un univers fantastique +Comment[de]=ein Online Fantasy Spiel +Comment[it]=Un gioco fantasy online +Comment[nl]=Een online role playing game +Comment[sv]=Ett fantasyrollspel online +Comment[ru]=Клиент к 2D MMORPG игре +Exec=manaplus --tests +StartupNotify=false +Terminal=false +Type=Application +Icon=manaplus +Categories=Game;AdventureGame; diff --git a/packaging/windows/setup.nsi b/packaging/windows/setup.nsi index 9767cf685..c3b34bc4c 100644 --- a/packaging/windows/setup.nsi +++ b/packaging/windows/setup.nsi @@ -331,7 +331,9 @@ Section "Create Shortcuts" SecShortcuts CreateShortCut "$SMPROGRAMS\Mana\ManaPlus.lnk" "$INSTDIR\manaplus.exe" CreateShortCut "$SMPROGRAMS\Mana\ManaPlus (no opengl).lnk" "$INSTDIR\manaplus.exe" --no-opengl CreateShortCut "$SMPROGRAMS\Mana\ManaPlus (safemode).lnk" "$INSTDIR\manaplus.exe" --safemode + CreateShortCut "$SMPROGRAMS\Mana\ManaPlus (tests).lnk" "$INSTDIR\manaplus.exe" --tests CreateShortCut "$DESKTOP\ManaPlus.lnk" "$INSTDIR\manaplus.exe" + CreateShortCut "$DESKTOP\ManaPlus (tests).lnk" "$INSTDIR\manaplus.exe" --tests ${registerExtension} "$INSTDIR\manaplus.exe" ".manaplus" "ManaPlus brandings" SectionEnd @@ -398,8 +400,11 @@ Section Uninstall Delete "$SMPROGRAMS\Mana\Uninstall.lnk" Delete "$DESKTOP\ManaPlus.lnk" + Delete "$DESKTOP\ManaPlus (tests).lnk" Delete "$SMPROGRAMS\Mana\ManaPlus.lnk" Delete "$SMPROGRAMS\Mana\ManaPlus (no opengl).lnk" + Delete "$SMPROGRAMS\Mana\ManaPlus (safemode).lnk" + Delete "$SMPROGRAMS\Mana\ManaPlus (tests).lnk" Delete "$SMPROGRAMS\Mana\Website.lnk" Delete "$SMPROGRAMS\Mana\Readme.lnk" Delete "$SMPROGRAMS\Mana\FAQ.lnk" -- cgit v1.2.3-60-g2f50 From 328dc4d267d3dbf0bf6507f0c27d4db225c4be6a Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 7 Jan 2012 20:31:42 +0300 Subject: Fix music item name in windows installer. --- packaging/windows/setup.nsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packaging/windows') diff --git a/packaging/windows/setup.nsi b/packaging/windows/setup.nsi index c3b34bc4c..1a4beb87c 100644 --- a/packaging/windows/setup.nsi +++ b/packaging/windows/setup.nsi @@ -338,7 +338,7 @@ Section "Create Shortcuts" SecShortcuts ${registerExtension} "$INSTDIR\manaplus.exe" ".manaplus" "ManaPlus brandings" SectionEnd -Section /o "Music" SecMusic +Section /o "Music for tmw" SecMusic AddSize 17602 CreateDirectory "$INSTDIR\data\music" SetOutPath "$INSTDIR\data\music" -- cgit v1.2.3-60-g2f50 From b0e0666cc11fe62c6dc81a10cfb8f67cc4b8f8db Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 24 Jan 2012 14:29:16 +0300 Subject: Add evol branding to windows installer. --- packaging/windows/setup.nsi | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'packaging/windows') diff --git a/packaging/windows/setup.nsi b/packaging/windows/setup.nsi index 1a4beb87c..75aa86bc4 100644 --- a/packaging/windows/setup.nsi +++ b/packaging/windows/setup.nsi @@ -353,6 +353,20 @@ Section /o "Portable" SecPortable File "portable.xml" SectionEnd +Section "Evol shortcuts" SecEvol + SetOutPath "$INSTDIR" + CreateDirectory "$INSTDIR\data\evol" + CreateDirectory "$INSTDIR\data\evol\images" + + SetOutPath "$INSTDIR" + File "${SRCDIR}\data\evol\evol.manaplus" + SetOutPath "$INSTDIR\data\evol\images" + File "${SRCDIR}\data\evol\images\*.png" + + CreateShortCut "$SMPROGRAMS\Mana\EvolOnline.lnk" '"$INSTDIR\manaplus.exe"' '"$INSTDIR\evol.manaplus"' + CreateShortCut "$DESKTOP\EvolOnline.lnk" '"$INSTDIR\manaplus.exe"' '"$INSTDIR\evol.manaplus"' +SectionEnd + Section "Translations" SecTrans SetOutPath "$INSTDIR" File /nonfatal /r "${SRCDIR}\translations" @@ -364,6 +378,7 @@ SectionEnd !insertmacro MUI_DESCRIPTION_TEXT ${SecShortcuts} "Create game shortcuts and register extensions." !insertmacro MUI_DESCRIPTION_TEXT ${SecMusic} "Background tmw music. (If selected the tmw music will be downloaded from the internet.)" !insertmacro MUI_DESCRIPTION_TEXT ${SecPortable} "Portable client. (If selected client will work as portable client.)" + !insertmacro MUI_DESCRIPTION_TEXT ${SecEvol} "Create shortcuts for Evol Online." !insertmacro MUI_DESCRIPTION_TEXT ${SecTrans} "Translations for the user interface. Uncheck this component to leave it in English." !insertmacro MUI_FUNCTION_DESCRIPTION_END -- cgit v1.2.3-60-g2f50 From 29bbca36c2eb82797c9c19f9d6d1efcc382cf4e4 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 24 Jan 2012 15:51:16 +0300 Subject: Add option for download evol music in wndows installer. --- packaging/windows/setup.nsi | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'packaging/windows') diff --git a/packaging/windows/setup.nsi b/packaging/windows/setup.nsi index 75aa86bc4..fd9c0399e 100644 --- a/packaging/windows/setup.nsi +++ b/packaging/windows/setup.nsi @@ -338,8 +338,8 @@ Section "Create Shortcuts" SecShortcuts ${registerExtension} "$INSTDIR\manaplus.exe" ".manaplus" "ManaPlus brandings" SectionEnd -Section /o "Music for tmw" SecMusic - AddSize 17602 +Section /o "Tmw music" SecTmwMusic + AddSize 25200 CreateDirectory "$INSTDIR\data\music" SetOutPath "$INSTDIR\data\music" NSISdl::download "http://downloads.sourceforge.net/themanaworld/tmwmusic-0.3.tar.gz" "$TEMP\tmwmusic-0.3.tar.gz" @@ -353,7 +353,16 @@ Section /o "Portable" SecPortable File "portable.xml" SectionEnd -Section "Evol shortcuts" SecEvol +Section /o "Evol Online music" SecEvolMusic + AddSize 9787 + CreateDirectory "$INSTDIR\data\music" + SetOutPath "$INSTDIR\data\music" + NSISdl::download "http://downloads.sourceforge.net/project/evolonline/music/evolmusic-beta1-1.tar.gz" "$TEMP\evolmusic-beta1-1.tar.gz" + untgz::extract -j -d "$INSTDIR\data\music" "$TEMP\evolmusic-beta1-1.tar.gz" + Delete "$TEMP\evolmusic-beta1-1.tar.gz" +SectionEnd + +Section "Evol Online shortcuts" SecEvol SetOutPath "$INSTDIR" CreateDirectory "$INSTDIR\data\evol" CreateDirectory "$INSTDIR\data\evol\images" @@ -376,9 +385,10 @@ SectionEnd !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN !insertmacro MUI_DESCRIPTION_TEXT ${SecCore} "The core program files." !insertmacro MUI_DESCRIPTION_TEXT ${SecShortcuts} "Create game shortcuts and register extensions." - !insertmacro MUI_DESCRIPTION_TEXT ${SecMusic} "Background tmw music. (If selected the tmw music will be downloaded from the internet.)" + !insertmacro MUI_DESCRIPTION_TEXT ${SecTmwMusic} "Background tmw music. (If selected the tmw music will be downloaded from the internet.)" !insertmacro MUI_DESCRIPTION_TEXT ${SecPortable} "Portable client. (If selected client will work as portable client.)" !insertmacro MUI_DESCRIPTION_TEXT ${SecEvol} "Create shortcuts for Evol Online." + !insertmacro MUI_DESCRIPTION_TEXT ${SecEvolMusic} "Background evol music. (If selected the evol music will be downloaded from the internet.)" !insertmacro MUI_DESCRIPTION_TEXT ${SecTrans} "Translations for the user interface. Uncheck this component to leave it in English." !insertmacro MUI_FUNCTION_DESCRIPTION_END -- cgit v1.2.3-60-g2f50 From 80f61e80228aa0fa617961a4ec30d954fcb15eba Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 24 Jan 2012 16:28:32 +0300 Subject: Remove evol shortcuts while uninstalling on windows. --- packaging/windows/setup.nsi | 2 ++ 1 file changed, 2 insertions(+) (limited to 'packaging/windows') diff --git a/packaging/windows/setup.nsi b/packaging/windows/setup.nsi index fd9c0399e..92f653816 100644 --- a/packaging/windows/setup.nsi +++ b/packaging/windows/setup.nsi @@ -433,6 +433,8 @@ Section Uninstall Delete "$SMPROGRAMS\Mana\Website.lnk" Delete "$SMPROGRAMS\Mana\Readme.lnk" Delete "$SMPROGRAMS\Mana\FAQ.lnk" + Delete "$SMPROGRAMS\Mana\EvolOnline.lnk" + Delete "$DESKTOP\EvolOnline.lnk" RMDir "$SMPROGRAMS\Mana" -- cgit v1.2.3-60-g2f50