From 3cb7a60cd225ff08cad59a9a722bcfa3f1f59572 Mon Sep 17 00:00:00 2001 From: rude Date: Fri, 14 Jan 2011 17:39:54 +0100 Subject: [PATCH] Updated love.nsi, and date in license.txt. --- extra/nsis/love.nsi | 159 ++++++++------------------------------------ license.txt | 2 +- 2 files changed, 28 insertions(+), 133 deletions(-) diff --git a/extra/nsis/love.nsi b/extra/nsis/love.nsi index bf3150609..c4bc04cdc 100644 --- a/extra/nsis/love.nsi +++ b/extra/nsis/love.nsi @@ -1,22 +1,27 @@ -!include "MUI.nsh" # Modern look, plxz +!include "MUI2.nsh" # Modern look, plxz Name "LOVE" -OutFile "love-0.5-0.exe" -Icon "love.ico" # this doesn't seem to work + +OutFile ${LOVEEXE} InstallDir $PROGRAMFILES\LOVE InstallDirRegKey HKCU "Software\LOVE" "" # Graphics +!define MUI_ICON "love\extra\nsis\love.ico" +!define MUI_UNICON "love\extra\nsis\love.ico" !define MUI_ABORTWARNING !define MUI_HEADERIMAGE -!define MUI_HEADERIMAGE_BITMAP "top.bmp" # optional -!define MUI_WELCOMEFINISHPAGE_BITMAP "left.bmp" -!define MUI_UNWELCOMEFINISHPAGE_BITMAP "left.bmp" +!define MUI_HEADERIMAGE_BITMAP "love\extra\nsis\top.bmp" # optional +!define MUI_WELCOMEFINISHPAGE_BITMAP "love\extra\nsis\left.bmp" +!define MUI_UNWELCOMEFINISHPAGE_BITMAP "love\extra\nsis\left.bmp" + +!define MUI_WELCOMEPAGE_TITLE "LÖVE Setup" +!define MUI_WELCOMEPAGE_TEXT "This will install LÖVE, the unquestionably awesome Lua game framework." # Pages !insertmacro MUI_PAGE_WELCOME -!insertmacro MUI_PAGE_LICENSE "..\..\license.txt" +!insertmacro MUI_PAGE_LICENSE "love\license.txt" !insertmacro MUI_PAGE_COMPONENTS !insertmacro MUI_PAGE_DIRECTORY !insertmacro MUI_PAGE_INSTFILES @@ -33,86 +38,21 @@ Section "LOVE" MainProg SectionIn RO SetOutPath $INSTDIR - - # Program - File ..\..\platform\msvc\Release\love.exe - - # Modules - #File ..\..\platform\msvc\Release\love_chipmunk.dll - #File ..\..\platform\msvc\Release\love_opengl.dll - #File ..\..\platform\msvc\Release\love_physfs.dll - #File ..\..\platform\msvc\Release\love_sdlkeyboard.dll - #File ..\..\platform\msvc\Release\love_sdlmixer.dll - #File ..\..\platform\msvc\Release\love_sdlmouse.dll - #File ..\..\platform\msvc\Release\love_sdltimer.dll - #File ..\..\platform\msvc\Release\love_system.dll - - # DLLs - File ..\..\platform\msvc\DevIL.dll - File ..\..\platform\msvc\ILU.dll - File ..\..\platform\msvc\SDL.dll - File ..\..\platform\msvc\SDL_mixer.dll - File ..\..\platform\msvc\Microsoft.VC80.CRT.manifest - File ..\..\platform\msvc\msvcp80.dll - File ..\..\platform\msvc\msvcr80.dll - - # Delete old DLLS (from 0.2.1 - 0.3.1) - Delete $INSTDIR\love_chipmunk.dll - Delete $INSTDIR\love_opengl.dll - Delete $INSTDIR\love_physfs.dll - Delete $INSTDIR\love_sdlkeyboard.dll - Delete $INSTDIR\love_sdlmixer.dll - Delete $INSTDIR\love_sdlmouse.dll - Delete $INSTDIR\love_sdltimer.dll - Delete $INSTDIR\love_system.dll - Delete $INSTDIR\freetype6.dll - Delete $INSTDIR\ILUT.dll - Delete $INSTDIR\libogg-0.dll - Delete $INSTDIR\libvorbis-0.dll - Delete $INSTDIR\libvorbisfile-3.dll - Delete $INSTDIR\lua5.1.dll - Delete $INSTDIR\physfs.dll - Delete $INSTDIR\smpeg.dll - Delete $INSTDIR\zlib1.dll - - # Delete old demos. - Delete $INSTDIR\demos\kkav.love - Delete $INSTDIR\demos\passingclouds.love - Delete $INSTDIR\demos\sinescroller.love - Delete $INSTDIR\demos\no.love - Delete $INSTDIR\demos\particles.love - - # Icons - File love.ico - File game.ico - # Text - File ..\..\changes.txt - File ..\..\license.txt - File ..\..\readme.txt + File "love\platform\msvc2010\Release\love.exe" + File "love\platform\msvc2010\DevIL.dll" + File "love\platform\msvc2010\SDL.dll" + File "love\platform\msvc2010\OpenAL32.dll" + File "love\extra\nsis\love.ico" + File "love\extra\nsis\game.ico" # Uninstaller WriteUninstaller $INSTDIR\Uninstall.exe - # Start Menu - # Remove old menu items (from 0.2.0) - Delete "$SMPROGRAMS\LOVE\Demos\Animation Demo.lnk" - Delete "$SMPROGRAMS\LOVE\Demos\Chinchilla.lnk" - Delete "$SMPROGRAMS\LOVE\Demos\Color Blend Demo.lnk" - Delete "$SMPROGRAMS\LOVE\Demos\Hello LOVE.lnk" - Delete "$SMPROGRAMS\LOVE\Demos\Mouse and Image Basics.lnk" - Delete "$SMPROGRAMS\LOVE\Demos\Movement.lnk" - Delete "$SMPROGRAMS\LOVE\Demos\Passing Clouds.lnk" - Delete "$SMPROGRAMS\LOVE\Demos\Sound.lnk" - Delete "$SMPROGRAMS\LOVE\Demos\Text Demo.lnk" - RMDir "$SMPROGRAMS\LOVE\Demos" - Delete "$SMPROGRAMS\LOVE\LOVE.lnk" - Delete "$SMPROGRAMS\LOVE\Uninstall.lnk" - Delete "$SMPROGRAMS\LOVE\Documentation.url" # Add new start menu items CreateDirectory "$SMPROGRAMS\LOVE" CreateShortCut "$SMPROGRAMS\LOVE\LOVE.lnk" "$INSTDIR\love.exe" CreateShortCut "$SMPROGRAMS\LOVE\Uninstall.lnk" "$INSTDIR\Uninstall.exe" - WriteINIStr "$SMPROGRAMS\LOVE\Documentation.url" "InternetShortcut" "URL" "http://love.sourceforge.net/docs/" + WriteINIStr "$SMPROGRAMS\LOVE\Documentation.url" "InternetShortcut" "URL" "http://love2d.org/wiki/" # Desktop CreateShortCut "$DESKTOP\LOVE.lnk" "$INSTDIR\love.exe" "" @@ -134,70 +74,25 @@ Section "LOVE" MainProg SectionEnd -# Demos -Section "Demos" Demos - - SetOutPath $INSTDIR\demos - - # Files - File ..\..\demos\lovalanche.love - File ..\..\demos\no.love - File ..\..\demos\particles.love - - # Start menu - CreateShortCut "$SMPROGRAMS\LOVE\Demos.lnk" "$INSTDIR\demos" - -SectionEnd - # Descriptions LangString DESC_MainProg ${LANG_ENGLISH} "Main program." -LangString DESC_Demos ${LANG_ENGLISH} "A series of demos to show what LOVE can do." # Assign language strings to sections !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN !insertmacro MUI_DESCRIPTION_TEXT ${MainProg} $(DESC_MainProg) - !insertmacro MUI_DESCRIPTION_TEXT ${Demos} $(DESC_Demos) !insertmacro MUI_FUNCTION_DESCRIPTION_END # Uninstall Section "Uninstall" - - # Delete Demos - Delete $INSTDIR\demos\lovalanche.love - Delete $INSTDIR\demos\no.love - Delete $INSTDIR\demos\particles.love - - RMDir $INSTDIR\demos - # Program - Delete $INSTDIR\love.exe - # Modules - # Delete $INSTDIR\love_chipmunk.dll - # Delete $INSTDIR\love_opengl.dll - # Delete $INSTDIR\love_physfs.dll - # Delete $INSTDIR\love_sdlkeyboard.dll - # Delete $INSTDIR\love_sdlmixer.dll - # Delete $INSTDIR\love_sdlmouse.dll - # Delete $INSTDIR\love_sdltimer.dll - # Delete $INSTDIR\love_system.dll - # DLLs - Delete $INSTDIR\DevIL.dll - Delete $INSTDIR\ILU.dll - Delete $INSTDIR\SDL.dll - Delete $INSTDIR\SDL_mixer.dll - Delete $INSTDIR\Microsoft.VC80.CRT.manifest - Delete $INSTDIR\msvcp80.dll - Delete $INSTDIR\msvcr80.dll - # Icons - Delete $INSTDIR\love.ico - Delete $INSTDIR\game.ico - # Text - Delete $INSTDIR\changes.txt - Delete $INSTDIR\license.txt - Delete $INSTDIR\readme.txt + Delete $INSTDIR\"DevIL.dll" + Delete $INSTDIR\"SDL.dll" + Delete $INSTDIR\"love.exe" + Delete $INSTDIR\"OpenAL32.dll" + Delete $INSTDIR\"game.ico" + Delete $INSTDIR\"love.ico" RMDir $INSTDIR - + # Start menu - Delete "$SMPROGRAMS\LOVE\Demos.lnk" Delete "$SMPROGRAMS\LOVE\LOVE.lnk" Delete "$SMPROGRAMS\LOVE\Uninstall.lnk" Delete "$SMPROGRAMS\LOVE\Documentation.url" @@ -216,4 +111,4 @@ Section "Uninstall" # Refresh shell icons System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)' -SectionEnd \ No newline at end of file +SectionEnd diff --git a/license.txt b/license.txt index 1f06aed4b..4d90789c9 100644 --- a/license.txt +++ b/license.txt @@ -1,4 +1,4 @@ -Copyright (c) 2006-2010 LOVE Development Team +Copyright (c) 2006-2011 LOVE Development Team This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages