From edf4235745e5074a946f8552ec246b3b7c6f3bb6 Mon Sep 17 00:00:00 2001 From: canni0 Date: Mon, 12 Apr 2010 01:03:25 +0000 Subject: updated installer source: - adjusted folders to fit with changes from 1.1 alpha - removed incompatible themes - removed vista game exoplorer features due to incompatibility with windows 7 - added background music derivated from bebeto - added another song - fixed small icons bug - merged dependencies folder into installer git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2227 b956fd51-792f-4845-bead-9b4dfca2ff2c --- installer/settings/GameExplorer.nsh | 198 ---------------------------- installer/settings/files_main_install.nsh | 57 ++++---- installer/settings/files_main_uninstall.nsh | 75 +++++++---- installer/settings/functions.nsh | 2 +- installer/settings/settings-1031.ini | 2 +- installer/settings/settings-1033.ini | 2 +- installer/settings/variables.nsh | 19 ++- 7 files changed, 97 insertions(+), 258 deletions(-) delete mode 100644 installer/settings/GameExplorer.nsh (limited to 'installer/settings') diff --git a/installer/settings/GameExplorer.nsh b/installer/settings/GameExplorer.nsh deleted file mode 100644 index d5056661..00000000 --- a/installer/settings/GameExplorer.nsh +++ /dev/null @@ -1,198 +0,0 @@ -# user interface - -!define GameExplorer_GenerateGUID '!insertmacro GameExplorer_GenerateGUID' -!define GameExplorer_AddGame '!insertmacro GameExplorer_AddGame' -!define GameExplorer_UpdateGame '!insertmacro GameExplorer_UpdateGame' -!define GameExplorer_RemoveGame '!insertmacro GameExplorer_RemoveGame' - -# internal stuff - -!define CLSCTX_INPROC_SERVER 1 -!define IID_IGameExplorer {E7B2FB72-D728-49B3-A5F2-18EBF5F1349E} -!define CLSID_GameExplorer {9A5EA990-3034-4D6F-9128-01F3C61022BC} - -!define GIS_CURRENT_USER 2 -!define GIS_ALL_USERS 3 - -!define IGameExplorer_QueryInterface 0 -!define IGameExplorer_AddRef 1 -!define IGameExplorer_Release 2 -!define IGameExplorer_AddGame 3 -!define IGameExplorer_RemoveGame 4 -!define IGameExplorer_UpdateGame 5 -!define IGameExplorer_VerifyAccess 6 - -# includes - -!include LogicLib.nsh - -# the actual code - -!macro GameExplorer_GenerateGUID - - System::Call 'ole32::CoCreateGuid(g .s)' - -!macroend - -!macro GameExplorer_AddGame CONTEXT GDF INSTDIR EXE GUID - - !define __GAME_EXPLORER_UNIQUE "${__LINE__}${__FILE__}" - - Push $0 - Push $1 - - Push $R0 - Push $R1 - Push $R2 - Push $R3 - - Push "${EXE}" - Push "${GUID}" - Push "${INSTDIR}" - Push "${GDF}" - - Pop $R0 # == ${GDF} - Pop $R1 # == ${INSTDIR} - Pop $R2 # == ${GUID} - Pop $R3 # == ${EXE} - - ClearErrors - - System::Call "ole32::CoCreateInstance( \ - g '${CLSID_GameExplorer}', i 0, \ - i ${CLSCTX_INPROC_SERVER}, \ - g '${IID_IGameExplorer}', *i .r1) i .r0" - - ${If} $0 != 0 # S_OK - - SetErrors - Goto "done_${__GAME_EXPLORER_UNIQUE}" - - ${EndIf} - - !if ${CONTEXT} == all - - System::Call "$1->${IGameExplorer_AddGame}(w R0, w R1, i ${GIS_ALL_USERS}, g R2) i .r0" - - !else if ${CONTEXT} == user - - System::Call "$1->${IGameExplorer_AddGame}(w R1, w R0, i ${GIS_CURRENT_USER}, g R2) i .r0" - - !else - - !error "Invalid CONTEXT passed to GameExplorer_AddGame! Must be `user` or `all`." - - !endif - - ${If} $0 != 0 # S_OK - - SetErrors - - ${Else} - - # Create play task - - !if ${CONTEXT} == all - - SetShellVarContext all - - !else if if ${CONTEXT} == user - - SetShellVarContext user - - !endif - - CreateDirectory $APPDATA\Microsoft\Windows\GameExplorer\$R2\PlayTasks\0 - CreateShortcut $APPDATA\Microsoft\Windows\GameExplorer\$R2\PlayTasks\0\Play.lnk $R3 - - ${EndIf} - - System::Call "$1->${IGameExplorer_Release}()" - - "done_${__GAME_EXPLORER_UNIQUE}:" - - Pop $R3 - Pop $R2 - Pop $R1 - Pop $R0 - - Pop $1 - Pop $0 - - !undef __GAME_EXPLORER_UNIQUE - -!macroend - -!macro _GameExplorer_GUID_Function Function GUID - - !define __GAME_EXPLORER_UNIQUE "${__LINE__}${__FILE__}" - - Push $0 - Push $1 - Push $2 - Push $3 - Push $4 - Push $5 - - Push $R0 - - Push "${GUID}" - - Pop $R0 # == ${GUID} - - System::Alloc 16 - Exch $R0 - System::Call "ole32::CLSIDFromString(w s, i R0)" - System::Call "*$R0(i .r2, i .r3, i .r4, i .r5)" - System::Free $R0 - - ClearErrors - - System::Call "ole32::CoCreateInstance( \ - g '${CLSID_GameExplorer}', i 0, \ - i ${CLSCTX_INPROC_SERVER}, \ - g '${IID_IGameExplorer}', *i .r1) i .r0" - - ${If} $0 != 0 # S_OK - - SetErrors - Goto "done_${__GAME_EXPLORER_UNIQUE}" - - ${EndIf} - - System::Call "$1->${Function}(i r2, i r3, i r4, i r5) i .r0" - - ${If} $0 != 0 # S_OK - - SetErrors - - ${EndIf} - - System::Call "$1->${IGameExplorer_Release}()" - - "done_${__GAME_EXPLORER_UNIQUE}:" - - Pop $R0 - - Pop $5 - Pop $4 - Pop $3 - Pop $2 - Pop $1 - Pop $0 - - !undef __GAME_EXPLORER_UNIQUE - -!macroend - -!macro GameExplorer_UpdateGame GUID - - !insertmacro _GameExplorer_GUID_Function ${IGameExplorer_UpdateGame} "${GUID}" - -!macroend - -!macro GameExplorer_RemoveGame GUID - - !insertmacro _GameExplorer_GUID_Function ${IGameExplorer_RemoveGame} "${GUID}" - -!macroend \ No newline at end of file diff --git a/installer/settings/files_main_install.nsh b/installer/settings/files_main_install.nsh index c2cdf727..693e0413 100644 --- a/installer/settings/files_main_install.nsh +++ b/installer/settings/files_main_install.nsh @@ -4,53 +4,64 @@ ; Create Directories: -CreateDirectory $INSTDIR\Plugins -CreateDirectory $INSTDIR\Songs -CreateDirectory $INSTDIR\Screenshots -CreateDirectory $INSTDIR\Playlists -CreateDirectory $INSTDIR\Covers +CreateDirectory $INSTDIR\plugins +CreateDirectory $INSTDIR\covers +CreateDirectory $INSTDIR\songs -SetOutPath "$INSTDIR" +${If} ${AtLeastWinVista} + + ; Create folders in appdata for current user + SetShellVarContext current + CreateDirectory $APPDATA\ultrastardx + CreateDirectory $APPDATA\ultrastardx\screenshots + CreateDirectory $APPDATA\ultrastardx\playlists + + SetOutPath "$APPDATA\ultrastardx" + File ..\game\config.ini + + SetOutPath "$INSTDIR" + + CreateShortCut "screenshots.lnk" "$APPDATA\ultrastardx\screenshots" + CreateShortCut "playlists.lnk" "$APPDATA\ultrastardx\playlists" + CreateShortCut "config.ini.lnk" "$APPDATA\ultrastardx\config.ini" + + SetShellVarContext all +${EndIf} ; themes, languages, sounds, fonts, visuals dir +SetOutPath "$INSTDIR" + File /r ..\game\themes File /r ..\game\languages File /r ..\game\sounds File /r ..\game\fonts -File /r ..\installerdependencies\visuals +File /r ..\game\visuals ; Root dir: -File ..\installerdependencies\dll\*.dll +File .\dependencies\dll\*.dll File ..\ChangeLog.txt -File ..\ChangeLog.german.txt +File ..\ChangeLog.GERMAN.txt +File ..\game\LuaCommands.odt File ..\README.txt -File ..\installerdependencies\documents\documentation.pdf -File ..\installerdependencies\documents\license.txt +File .\dependencies\documents\license.txt +File .\dependencies\documents\documentation.pdf -File "..\ScoreConverter.exe" File "..\${exe}.exe" ; Covers dir: -SetOutPath "$INSTDIR\Covers" +SetOutPath "$INSTDIR\covers" IfFileExists $INSTDIR\covers\covers.ini +2 0 -File ..\game\covers\Covers.ini +File ..\game\covers\covers.ini File ..\game\covers\NoCover.jpg ; Plugins dir: -SetOutPath "$INSTDIR\Plugins\" - File "..\Plugins\*.dll" - -${If} ${AtLeastWinVista} - - SetOutPath "$WINDIR" - File "..\installerdependencies\plugins\gdf.dll" - -${EndIf} +SetOutPath "$INSTDIR\plugins\" +File "..\game\plugins\*.*" SetOutPath "$INSTDIR" diff --git a/installer/settings/files_main_uninstall.nsh b/installer/settings/files_main_uninstall.nsh index af61cb0b..e76a3609 100644 --- a/installer/settings/files_main_uninstall.nsh +++ b/installer/settings/files_main_uninstall.nsh @@ -2,11 +2,9 @@ ; UltraStar Deluxe Uninstaller: Main components ; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ - ; Delete created Icons in startmenu SetShellVarContext all - RMDir /r "$SMPROGRAMS\$ICONS_GROUP\" ; Delete created Icon on Desktop @@ -21,32 +19,47 @@ RMDir /r "$INSTDIR\fonts" RMDir /r "$INSTDIR\languages" RMDir /r "$INSTDIR\visuals" + RMDir /r "$INSTDIR\resources" RMDir /r "$INSTDIR\sounds" -; Delete remaining files +; Remove old files from previous versions + IfFileExists $INSTDIR\ScoreConverter.exe 0 +2 + Delete "$INSTDIR\ScoreConverter.exe" + IfFileExists $INSTDIR\USdx.exe 0 +2 + Delete "$INSTDIR\USdx.exe" + IfFileExists $INSTDIR\covers.cache 0 +2 + Delete "$INSTDIR\covers.cache" +; Delete remaining files Delete "$INSTDIR\ScoreConverter.exe" Delete "$INSTDIR\${exe}.exe" - Delete "$INSTDIR\Changelog.german.txt" - Delete "$INSTDIR\Changelog.txt" + Delete "$INSTDIR\ChangeLog.GERMAN.txt" + Delete "$INSTDIR\ChangeLog.txt" + Delete "$INSTDIR\LuaCommands.odt" Delete "$INSTDIR\documentation.pdf" - Delete "$INSTDIR\License.txt" - Delete "$INSTDIR\config.ini" + Delete "$INSTDIR\license.txt" Delete "$INSTDIR\README.txt" + Delete "$INSTDIR\screenshots.lnk" + Delete "$INSTDIR\playlists.lnk" + Delete "$INSTDIR\config.ini.lnk" + Delete "$INSTDIR\Error.log" - Delete "$INSTDIR\covers.cache" Delete "$INSTDIR\cover.db" - Delete "$INSTDIR\avcodec-51.dll" - Delete "$INSTDIR\avformat-50.dll" - Delete "$INSTDIR\avutil-49.dll" + Delete "$INSTDIR\avcodec-52.dll" + Delete "$INSTDIR\avformat-52.dll" + Delete "$INSTDIR\avdevice-52.dll" + Delete "$INSTDIR\avutil-50.dll" Delete "$INSTDIR\bass.dll" + Delete "$INSTDIR\freetype6.dll" Delete "$INSTDIR\glew32.dll" Delete "$INSTDIR\jpeg.dll" - Delete "$INSTDIR\libfreetype-6.dll" Delete "$INSTDIR\libpng12-0.dll" Delete "$INSTDIR\libprojectM.dll" Delete "$INSTDIR\libtiff-3.dll" + Delete "$INSTDIR\lua5.1.dll" + Delete "$INSTDIR\lua51.dll" + Delete "$INSTDIR\pcre3.dll" Delete "$INSTDIR\portaudio_x86.dll" Delete "$INSTDIR\portmixer.dll" Delete "$INSTDIR\projectM-cwrapper.dll" @@ -54,29 +67,45 @@ Delete "$INSTDIR\SDL_image.dll" Delete "$INSTDIR\SDL_ttf.dll" Delete "$INSTDIR\sqlite3.dll" + Delete "$INSTDIR\swscale-0.dll" Delete "$INSTDIR\zlib1.dll" -${If} ${AtLeastWinVista} - Delete "$WINDIR\gdf.dll" -${EndIf} + StrCpy $0 "$INSTDIR\songs" + Call un.DeleteIfEmpty + StrCpy $0 "$INSTDIR\covers" + Call un.DeleteIfEmpty - RMDir "$INSTDIR\songs\Dead Smiling Pirates - I 18" - RMDir "$INSTDIR\songs\Joshua Morin - On The Run" - RMDir "$INSTDIR\songs\Pornophonique - Space Invaders" - RMDir "$INSTDIR\songs\Steven Dunston - Northern Star" + StrCpy $0 "$INSTDIR\screenshots" + Call un.DeleteIfEmpty - StrCpy $0 "$INSTDIR\songs" + StrCpy $0 "$INSTDIR\playlists" Call un.DeleteIfEmpty - Delete "$INSTDIR\covers\NoCover.jpg" + ; Clean up AppData - StrCpy $0 "$INSTDIR\screenshots" + SetShellVarContext current + + Delete "$APPDATA\ultrastardx\Error.log" + Delete "$APPDATA\ultrastardx\cover.db" + + StrCpy $0 "$APPDATA\ultrastardx\covers" Call un.DeleteIfEmpty - StrCpy $0 "$INSTDIR\playlists" + StrCpy $0 "$APPDATA\ultrastardx\songs" + Call un.DeleteIfEmpty + + StrCpy $0 "$APPDATA\ultrastardx\screenshots" Call un.DeleteIfEmpty + StrCpy $0 "$APPDATA\ultrastardx\playlists" + Call un.DeleteIfEmpty + + StrCpy $0 "$APPDATA\ultrastardx" + Call un.DeleteIfEmpty + + SetShellVarContext all + ; Self delete: Delete "$INSTDIR\Uninstall.exe" diff --git a/installer/settings/functions.nsh b/installer/settings/functions.nsh index bbd4fea2..0b5874c5 100644 --- a/installer/settings/functions.nsh +++ b/installer/settings/functions.nsh @@ -5,7 +5,7 @@ Function CreateDesktopShortCuts SetOutPath "$INSTDIR" -CreateShortcut "$Desktop\$(sm_shortcut).lnk" "$INSTDIR\USdx.exe" +CreateShortcut "$Desktop\$(sm_shortcut).lnk" "$INSTDIR\ultrastardx.exe" FunctionEnd diff --git a/installer/settings/settings-1031.ini b/installer/settings/settings-1031.ini index 9e588fcb..bc5a425d 100644 --- a/installer/settings/settings-1031.ini +++ b/installer/settings/settings-1031.ini @@ -52,7 +52,7 @@ Bottom=38 [Field 7] Type=Droplist -ListItems=Catalan|Croatian|Danish|Dutch|English|Euskara|French|German|Italian|Norwegian|Polish|Portuguese|Serbian|Slovak|Spanish|Swedish +ListItems=Catalan|Croatian|Dutch|English|Euskara|Finnish|French|German|Greek|Italian|Japanese|Luxembourgish|Portuguese|Spanish|Swedish State=German Left=71 Right=161 diff --git a/installer/settings/settings-1033.ini b/installer/settings/settings-1033.ini index 17a08a8c..304eb672 100644 --- a/installer/settings/settings-1033.ini +++ b/installer/settings/settings-1033.ini @@ -52,7 +52,7 @@ Bottom=36 [Field 7] Type=Droplist -ListItems=Catalan|Croatian|Danish|Dutch|English|Euskara|French|German|Italian|Norwegian|Polish|Portuguese|Serbian|Slovak|Spanish|Swedish +ListItems=Catalan|Croatian|Dutch|English|Euskara|Finnish|French|German|Greek|Italian|Japanese|Luxembourgish|Portuguese|Spanish|Swedish State=English Left=70 Right=160 diff --git a/installer/settings/variables.nsh b/installer/settings/variables.nsh index db98d89f..cd69b1ea 100644 --- a/installer/settings/variables.nsh +++ b/installer/settings/variables.nsh @@ -4,17 +4,18 @@ ; Product Information: -!define version "1.1a" ; Make sure version is also set in onInit +!define version "1.1beta" ; Make sure version is also set in onInit !define name "UltraStar Deluxe" !define publisher "USDX Team" !define homepage "http://www.ultrastardeluxe.org" !define forum "http://forum.ultrastardeluxe.org" +!define wiki "http://wiki.ultrastardeluxe.org" -!define exe "USdx" +!define exe "ultrastardx" -!define license "..\installerdependencies\documents\license.txt" +!define license ".\dependencies\documents\license.txt" ; Icons @@ -34,10 +35,10 @@ !define PRODUCT_WEB_SITE "${homepage}" !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${name}" !define PRODUCT_UNINST_ROOT_KEY "HKLM" -!define PRODUCT_STARTMENU_REGVAL "NSIS:StartMenuDir" ; Download URLs for Songs and Themes: +; SONGS !define download_song2 "http://downloads.sourceforge.net/ultrastardx/usdx_song-dead_smiling_pirates_-_i_18.zip" !define download_song3 "http://downloads.sourceforge.net/ultrastardx/usdx_song-joshua_morin_-_on_the_run.zip" !define download_song4 "http://downloads.sourceforge.net/ultrastardx/usdx_song-pornophonique_-_space_-_invaders.zip" @@ -81,11 +82,7 @@ !define download_sub3_song1 "http://downloads.sourceforge.net/ultrastardx/usdx_song-wise_guys_-_lebendig_und_kraeftig_und_schaerfer.zip" !define download_sub3_song2 "http://downloads.sourceforge.net/ultrastardx/usdx_song-wise_guys_-_mensch_wo_bist_du.zip" +!define download_sub3_song3 "http://downloads.sourceforge.net/ultrastardx/usdx_song-wise_guys_-_mensch_wo_bist_du_kar.zip" -!define download_theme1 "http://downloads.sourceforge.net/ultrastardx/usdx_skin-orange_by_Skar.zip" -!define download_theme2 "http://downloads.sourceforge.net/ultrastardx/usdx_skin-Streetlight_by_Skar.zip" -!define download_theme3 "http://downloads.sourceforge.net/ultrastardx/usdx_skin-Vistar_by_Skar.zip" -!define download_theme4 "http://downloads.sourceforge.net/ultrastardx/usdx_skin-bluesensationV5.1_by_Charis.zip" -!define download_theme6 "http://downloads.sourceforge.net/ultrastardx/usdx_skin-WiiStar_by_MasterPhW.zip" -!define download_theme7 "http://downloads.sourceforge.net/ultrastardx/usdx_skin-istar_by_MezzoX.zip" -!define download_theme5 "http://downloads.sourceforge.net/ultrastardx/usdx_skin-whitesensationV101_by_Charis.zip" \ No newline at end of file +; THEMES +; (removed theme section - currently no additional skins available for this usdx version) \ No newline at end of file -- cgit v1.2.3