diff options
| author | canni0 <canni0@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2010-04-12 01:03:25 +0000 |
|---|---|---|
| committer | canni0 <canni0@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2010-04-12 01:03:25 +0000 |
| commit | edf4235745e5074a946f8552ec246b3b7c6f3bb6 (patch) | |
| tree | a9b1397c5df3586e0fc94a0cd02bedb100bd3aa7 /installer | |
| parent | 8f55d79635ea77d486affc7efc157917e2c04e49 (diff) | |
| download | usdx-edf4235745e5074a946f8552ec246b3b7c6f3bb6.tar.gz usdx-edf4235745e5074a946f8552ec246b3b7c6f3bb6.tar.xz usdx-edf4235745e5074a946f8552ec246b3b7c6f3bb6.zip | |
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
Diffstat (limited to 'installer')
21 files changed, 489 insertions, 685 deletions
diff --git a/installer/UltraStar Deluxe.nsi b/installer/UltraStar Deluxe.nsi index a6f37e2a..28d1400e 100644 --- a/installer/UltraStar Deluxe.nsi +++ b/installer/UltraStar Deluxe.nsi @@ -16,14 +16,13 @@ !define path_settings ".\settings"
!define path_languages ".\languages"
-!define path_images "..\installerdependencies\images"
-!define path_plugins "..\installerdependencies\plugins"
-!define path_gdf "$WINDIR\gdf.dll"
+!define path_dependencies ".\dependencies"
+!define path_images ".\dependencies\images"
+!define path_plugins ".\dependencies\plugins"
!addPluginDir "${path_plugins}\"
!include "${path_settings}\variables.nsh"
-!include "${path_settings}\GameExplorer.nsh"
!include "${path_settings}\functions.nsh"
; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~
@@ -31,10 +30,12 @@ ; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~
SetCompress Auto
-SetCompressor /SOLID lzma
+SetCompressor lzma
SetCompressorDictSize 32
SetDatablockOptimize On
+CRCCheck on
+
XPStyle on
Name "${name} v.${version}"
@@ -42,6 +43,7 @@ Brandingtext "${name} v.${version} Installation" OutFile "ultrastardx-${version}-installer-full.exe"
InstallDir "$PROGRAMFILES\${name}"
+InstallDirRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\UltraStar Deluxe" "InstallDir"
; Windows Vista / Windows 7:
@@ -53,8 +55,8 @@ RequestExecutionLevel admin ; Icons:
-!define MUI_ICON "${path_images}\${img_install}"
-!define MUI_UNICON "${path_images}\${img_uninstall}"
+!define MUI_ICON "${img_install}"
+!define MUI_UNICON "${img_uninstall}"
; Header and Side Images:
@@ -79,6 +81,8 @@ RequestExecutionLevel admin ; Pages Installation Routine Settings
; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~
+!define MUI_CUSTOMFUNCTION_GUIINIT bgmusic
+
; Welcome Page:
!define MUI_WELCOMEPAGE_TITLE_3LINES
@@ -133,7 +137,7 @@ var ICONS_GROUP !define MUI_STARTMENUPAGE_DEFAULTFOLDER "${name}"
!define MUI_STARTMENUPAGE_REGISTRY_ROOT "${PRODUCT_UNINST_ROOT_KEY}"
!define MUI_STARTMENUPAGE_REGISTRY_KEY "${PRODUCT_UNINST_KEY}"
-!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "${PRODUCT_STARTMENU_REGVAL}"
+!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "${name}"
!insertmacro MUI_PAGE_STARTMENU Application $ICONS_GROUP
!insertmacro MUI_PAGE_INSTFILES
@@ -167,71 +171,45 @@ var /GLOBAL animations ; Write all variables to config.ini
-FileOpen $0 '$INSTDIR\config.ini' w
-FileWrite $0 '[Game]$\r$\n'
-FileClose $0
-
-${If} $language2 != ""
-
-${WriteToConfig} "Language=$language2$\r$\n" "$INSTDIR\config.ini"
-
-${EndIf}
-
-${If} $tabs != ""
-
-${WriteToConfig} "Tabs=$tabs$\r$\n" "$INSTDIR\config.ini"
-
-${EndIf}
-
-${WriteToConfig} "[Graphics]$\r$\n" "$INSTDIR\config.ini"
-
-${If} $fullscreen != ""
-
-${WriteToConfig} "FullScreen=$fullscreen$\r$\n" "$INSTDIR\config.ini"
+var /GLOBAL path_config
+var /GLOBAL path_configini
+${If} ${AtLeastWinVista}
+ SetShellVarContext current
+ StrCpy $path_config "$APPDATA\ultrastardx"
+ SetShellVarContext all
+${Else}
+ StrCpy $path_config "$INSTDIR"
${EndIf}
-${If} $resolution != ""
+StrCpy $path_configini "$path_config\config.ini"
-${WriteToConfig} "Resolution=$resolution$\r$\n" "$INSTDIR\config.ini"
+${WriteToConfig} "[Game]$\r$\n" "$path_configini"
+${WriteToConfig} "Language=$language2$\r$\n" "$path_configini"
+${WriteToConfig} "Tabs=$tabs$\r$\n" "$path_configini"
-${EndIf}
+${WriteToConfig} "[Graphics]$\r$\n" "$path_configini"
+${WriteToConfig} "FullScreen=$fullscreen$\r$\n" "$path_configini"
+${WriteToConfig} "Resolution=$resolution$\r$\n" "$path_configini"
-${WriteToConfig} "[Sound]$\r$\n" "$INSTDIR\config.ini"
-${WriteToConfig} "PreviewFading=3 Secs$\r$\n" "$INSTDIR\config.ini"
+${WriteToConfig} "[Sound]$\r$\n" "$path_configini"
+${WriteToConfig} "PreviewFading=3 Secs$\r$\n" "$path_configini"
; Animations On / Off Tasks
${If} $animations == "Off"
-
-${WriteToConfig} "[Advanced]$\r$\n" "$INSTDIR\config.ini"
-
-${WriteToConfig} "LoadAnimation=Off$\r$\n" "$INSTDIR\config.ini"
-
-${WriteToConfig} "EffectSing=Off$\r$\n" "$INSTDIR\config.ini"
-
-${WriteToConfig} "ScreenFade=Off$\r$\n" "$INSTDIR\config.ini"
-
-${WriteToConfig} "LineBonus=At Notes$\r$\n" "$INSTDIR\config.ini"
-
-${EndIf}
-
-${WriteToConfig} "[Lyrics]$\r$\n" "$INSTDIR\config.ini"
-${WriteToConfig} "LyricsFont=Plain$\r$\n" "$INSTDIR\config.ini"
-${WriteToConfig} "LyricsEffect=Slide$\r$\n" "$INSTDIR\config.ini"
-
-${If} $animations != "Off"
-
-${WriteToConfig} "[Advanced]$\r$\n" "$INSTDIR\config.ini"
-
-${WriteToConfig} "LineBonus=At Notes$\r$\n" "$INSTDIR\config.ini"
-
+${WriteToConfig} "[Advanced]$\r$\n" "$path_configini"
+${WriteToConfig} "LoadAnimation=Off$\r$\n" "$path_configini"
+${WriteToConfig} "EffectSing=Off$\r$\n" "$path_configini"
+${WriteToConfig} "ScreenFade=Off$\r$\n" "$path_configini"
${EndIf}
+${WriteToConfig} "[Lyrics]$\r$\n" "$path_configini"
+${WriteToConfig} "LyricsFont=Plain$\r$\n" "$path_configini"
+${WriteToConfig} "LyricsEffect=Slide$\r$\n" "$path_configini"
FunctionEnd ; Settings page End
-
!insertmacro MUI_PAGE_FINISH
; ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~ ~+~
@@ -264,10 +242,20 @@ ${NSD_GetState} $CHECKBOX $checkbox_state ${If} $checkbox_state == "1"
- RMDir /r "$INSTDIR\Songs"
- RMDir /r "$INSTDIR\Covers"
+; Remove settings, songs, highscores, covers
+
+ RMDir /r "$INSTDIR\songs"
+ RMDir /r "$INSTDIR\covers"
+ Delete "$INSTDIR\config.ini"
Delete "$INSTDIR\Ultrastar.db"
+ SetShellVarContext current
+ RMDir /r "$APPDATA\ultrastardx\songs"
+ RMDir /r "$APPDATA\ultrastardx\covers"
+ Delete "$APPDATA\ultrastardx\config.ini"
+ Delete "$APPDATA\ultrastardx\Ultrastar.db"
+ SetShellVarContext all
+
${Else}
; If checkbox_state = 0
@@ -302,56 +290,27 @@ Section $(name_section1) Section1 SetOutPath "$INSTDIR"
!insertmacro MUI_STARTMENU_WRITE_BEGIN Application
-
SetShellVarContext all
SetOutPath "$INSTDIR"
CreateDirectory "${name}"
CreateDirectory "$SMPROGRAMS\$ICONS_GROUP"
CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\$(sm_shortcut).lnk" "$INSTDIR\${exe}.exe"
-; CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\$(sm_documentation).lnk" "$INSTDIR\documentation.pdf"
CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\$(sm_website).lnk" "http://www.ultrastardeluxe.org/"
- CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\$(sm_readme).lnk" "$INSTDIR\ReadMe.txt"
- CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\$(sm_license).lnk" "$INSTDIR\License.txt"
+ CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\$(sm_songs).lnk" "$INSTDIR\songs"
CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\$(sm_uninstall).lnk" "$INSTDIR\Uninstall.exe"
- !insertmacro MUI_STARTMENU_WRITE_END
+!insertmacro MUI_STARTMENU_WRITE_END
; Vista Game Explorer:
-
-${If} ${AtLeastWinVista}
-
-${GameExplorer_GenerateGUID}
-Pop $0
-
-${GameExplorer_AddGame} all "${path_gdf}" $WINDIR $INSTDIR\${exe}.exe $0
-
-CreateDirectory $APPDATA\Microsoft\Windows\GameExplorer\$0\PlayTasks\1
-CreateShortcut "$APPDATA\Microsoft\Windows\GameExplorer\$0\PlayTasks\1\Benchmark.lnk" \
- "$INSTDIR\${exe}.exe" "-Benchmark"
-
-CreateDirectory $APPDATA\Microsoft\Windows\GameExplorer\$0\PlayTasks\2
-CreateShortcut "$APPDATA\Microsoft\Windows\GameExplorer\$0\PlayTasks\2\Joypad.lnk" \
- "$INSTDIR\${exe}.exe" "-Joypad"
-
-CreateDirectory $APPDATA\Microsoft\Windows\GameExplorer\$0\PlayTasks\3
-CreateShortcut "$APPDATA\Microsoft\Windows\GameExplorer\$0\PlayTasks\3\Fullscreen.lnk" \
- "$INSTDIR\${exe}.exe" "-FullScreen"
-
-CreateDirectory $APPDATA\Microsoft\Windows\GameExplorer\$0\PlayTasks\3
-CreateShortcut "$APPDATA\Microsoft\Windows\GameExplorer\$0\PlayTasks\3\Dual Screen.lnk" \
- "$INSTDIR\${exe}.exe" "-Screens 2"
-
-CreateDirectory $APPDATA\Microsoft\Windows\GameExplorer\$0\SupportTasks\0
-CreateShortcut "$APPDATA\Microsoft\Windows\GameExplorer\$0\SupportTasks\0\Support Forum.lnk" \
- "http://forum.ultrastardeluxe.org"
-
-${EndIf}
+; (removed due to incompatibility with Windows 7, needs rewrite)
; Create Uninstaller:
WriteUninstaller "$INSTDIR\Uninstall.exe"
WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "${name}"
+ WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\ultrastardx.exe"
+ WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "InstallDir" "$INSTDIR"
WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\Uninstall.exe"
WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"
WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}"
@@ -371,18 +330,18 @@ Section /o "Bodo Wartke - Liebeslied (Love Song)" g2Section1 AddSize 10342
SetOverwrite try
- SetOutPath "$INSTDIR\Songs\"
+ SetOutPath "$INSTDIR\songs\"
; Download song:
- NSISdl::download /TIMEOUT=50000 ${download_song1} $TEMP\Song-BodoWartke-LoveSong.zip
+ NSISdl::download /TIMEOUT=50000 ${download_song1} $LOCALAPPDATA\Temp\Song-BodoWartke-LoveSong.zip
Pop $R0
StrCmp $R0 "success" dlok
MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
dlok:
- ZipDLL::extractall "$TEMP\Song-BodoWartke-LoveSong.zip" "$INSTDIR\Songs\"
+ ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-BodoWartke-LoveSong.zip" "$INSTDIR\songs\"
- Delete "$TEMP\Song-BodoWartke-LoveSong.zip"
+ Delete "$LOCALAPPDATA\Temp\Song-BodoWartke-LoveSong.zip"
SetOutPath "$INSTDIR"
@@ -397,19 +356,19 @@ Section /o "Dead Smiling Pirates - I 18" g2Section2 AddSize 2816
SetOverwrite try
SetOutPath "$INSTDIR"
- CreateDirectory "$INSTDIR\Songs\Dead Smiling Pirates - I 18"
- SetOutPath "$INSTDIR\Songs\Dead Smiling Pirates - I 18\"
+ CreateDirectory "$INSTDIR\songs\Dead Smiling Pirates - I 18"
+ SetOutPath "$INSTDIR\songs\Dead Smiling Pirates - I 18\"
; Download song:
- NSISdl::download /TIMEOUT=50000 ${download_song2} $TEMP\Song-I-18.zip
+ NSISdl::download /TIMEOUT=50000 ${download_song2} $LOCALAPPDATA\Temp\Song-I-18.zip
Pop $R0
StrCmp $R0 "success" dlok
MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
dlok:
- ZipDLL::extractall "$TEMP\Song-I-18.zip" "$INSTDIR\Songs\Dead Smiling Pirates - I 18\"
+ ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-I-18.zip" "$INSTDIR\songs\Dead Smiling Pirates - I 18\"
- Delete "$TEMP\Song-I-18.zip"
+ Delete "$LOCALAPPDATA\Temp\Song-I-18.zip"
SetOutPath "$INSTDIR"
@@ -425,18 +384,18 @@ Section /o "Monkey Shines" s2_sub1_Section1 AddSize 1455
SetOverwrite try
- SetOutPath "$INSTDIR\Songs\"
+ SetOutPath "$INSTDIR\songs\"
; Download song:
- NSISdl::download /TIMEOUT=50000 ${download_sub1_song1} $TEMP\Song-JC-MS.zip
+ NSISdl::download /TIMEOUT=50000 ${download_sub1_song1} $LOCALAPPDATA\Temp\Song-JC-MS.zip
Pop $R0
StrCmp $R0 "success" dlok
MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
dlok:
- ZipDLL::extractall "$TEMP\Song-JC-MS.zip" "$INSTDIR\Songs\"
+ ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-MS.zip" "$INSTDIR\songs\"
- Delete "$TEMP\Song-JC-MS.zip"
+ Delete "$LOCALAPPDATA\Temp\Song-JC-MS.zip"
SetOutPath "$INSTDIR"
@@ -446,18 +405,18 @@ Section /o "I Crush Everything" s2_sub1_Section2 AddSize 7127
SetOverwrite try
- SetOutPath "$INSTDIR\Songs\"
+ SetOutPath "$INSTDIR\songs\"
; Download song:
- NSISdl::download /TIMEOUT=50000 ${download_sub1_song2} $TEMP\Song-JC-ICE.zip
+ NSISdl::download /TIMEOUT=50000 ${download_sub1_song2} $LOCALAPPDATA\Temp\Song-JC-ICE.zip
Pop $R0
StrCmp $R0 "success" dlok
MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
dlok:
- ZipDLL::extractall "$TEMP\Song-JC-ICE.zip" "$INSTDIR\Songs\"
+ ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-ICE.zip" "$INSTDIR\songs\"
- Delete "$TEMP\Song-JC-ICE.zip"
+ Delete "$LOCALAPPDATA\Temp\Song-JC-ICE.zip"
SetOutPath "$INSTDIR"
@@ -467,18 +426,18 @@ Section /o "Not About You" s2_sub1_Section3 AddSize 3492
SetOverwrite try
- SetOutPath "$INSTDIR\Songs\"
+ SetOutPath "$INSTDIR\songs\"
; Download song:
- NSISdl::download /TIMEOUT=50000 ${download_sub1_song3} $TEMP\Song-JC-NAY.zip
+ NSISdl::download /TIMEOUT=50000 ${download_sub1_song3} $LOCALAPPDATA\Temp\Song-JC-NAY.zip
Pop $R0
StrCmp $R0 "success" dlok
MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
dlok:
- ZipDLL::extractall "$TEMP\Song-JC-NAY.zip" "$INSTDIR\Songs\"
+ ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-NAY.zip" "$INSTDIR\songs\"
- Delete "$TEMP\Song-JC-NAY.zip"
+ Delete "$LOCALAPPDATA\Temp\Song-JC-NAY.zip"
SetOutPath "$INSTDIR"
@@ -489,18 +448,18 @@ Section /o "Mr. Fancy Pants" s2_sub1_Section4 AddSize 2427
SetOverwrite try
- SetOutPath "$INSTDIR\Songs\"
+ SetOutPath "$INSTDIR\songs\"
; Download song:
- NSISdl::download /TIMEOUT=50000 ${download_sub1_song4} $TEMP\Song-JC-MFP.zip
+ NSISdl::download /TIMEOUT=50000 ${download_sub1_song4} $LOCALAPPDATA\Temp\Song-JC-MFP.zip
Pop $R0
StrCmp $R0 "success" dlok
MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
dlok:
- ZipDLL::extractall "$TEMP\Song-JC-MFP.zip" "$INSTDIR\Songs\"
+ ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-MFP.zip" "$INSTDIR\songs\"
- Delete "$TEMP\Song-JC-MFP.zip"
+ Delete "$LOCALAPPDATA\Temp\Song-JC-MFP.zip"
SetOutPath "$INSTDIR"
@@ -510,18 +469,18 @@ Section /o "Big Bad World One" s2_sub1_Section5 AddSize 4424
SetOverwrite try
- SetOutPath "$INSTDIR\Songs\"
+ SetOutPath "$INSTDIR\songs\"
; Download song:
- NSISdl::download /TIMEOUT=50000 ${download_sub1_song5} $TEMP\Song-JC-BBWO.zip
+ NSISdl::download /TIMEOUT=50000 ${download_sub1_song5} $LOCALAPPDATA\Temp\Song-JC-BBWO.zip
Pop $R0
StrCmp $R0 "success" dlok
MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
dlok:
- ZipDLL::extractall "$TEMP\Song-JC-BBWO.zip" "$INSTDIR\Songs\"
+ ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-BBWO.zip" "$INSTDIR\songs\"
- Delete "$TEMP\Song-JC-BBWO.zip"
+ Delete "$LOCALAPPDATA\Temp\Song-JC-BBWO.zip"
SetOutPath "$INSTDIR"
@@ -531,18 +490,18 @@ Section /o "Flickr" s2_sub1_Section6 AddSize 21607
SetOverwrite try
- SetOutPath "$INSTDIR\Songs\"
+ SetOutPath "$INSTDIR\songs\"
; Download song:
- NSISdl::download /TIMEOUT=50000 ${download_sub1_song6} $TEMP\Song-JC-Flickr.zip
+ NSISdl::download /TIMEOUT=50000 ${download_sub1_song6} $LOCALAPPDATA\Temp\Song-JC-Flickr.zip
Pop $R0
StrCmp $R0 "success" dlok
MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
dlok:
- ZipDLL::extractall "$TEMP\Song-JC-Flickr.zip" "$INSTDIR\Songs\"
+ ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-Flickr.zip" "$INSTDIR\songs\"
- Delete "$TEMP\Song-JC-Flickr.zip"
+ Delete "$LOCALAPPDATA\Temp\Song-JC-Flickr.zip"
SetOutPath "$INSTDIR"
@@ -552,18 +511,18 @@ Section /o "My Beige Bear" s2_sub1_Section7 AddSize 4926
SetOverwrite try
- SetOutPath "$INSTDIR\Songs\"
+ SetOutPath "$INSTDIR\songs\"
; Download song:
- NSISdl::download /TIMEOUT=50000 ${download_sub1_song7} $TEMP\Song-JC-MBB.zip
+ NSISdl::download /TIMEOUT=50000 ${download_sub1_song7} $LOCALAPPDATA\Temp\Song-JC-MBB.zip
Pop $R0
StrCmp $R0 "success" dlok
MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
dlok:
- ZipDLL::extractall "$TEMP\Song-JC-MBB.zip" "$INSTDIR\Songs\"
+ ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-MBB.zip" "$INSTDIR\songs\"
- Delete "$TEMP\Song-JC-MBB.zip"
+ Delete "$LOCALAPPDATA\Temp\Song-JC-MBB.zip"
SetOutPath "$INSTDIR"
@@ -573,18 +532,18 @@ Section /o "The Future Soon" s2_sub1_Section8 AddSize 5612
SetOverwrite try
- SetOutPath "$INSTDIR\Songs\"
+ SetOutPath "$INSTDIR\songs\"
; Download song:
- NSISdl::download /TIMEOUT=50000 ${download_sub1_song8} $TEMP\Song-JC-TFS.zip
+ NSISdl::download /TIMEOUT=50000 ${download_sub1_song8} $LOCALAPPDATA\Temp\Song-JC-TFS.zip
Pop $R0
StrCmp $R0 "success" dlok
MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
dlok:
- ZipDLL::extractall "$TEMP\Song-JC-TFS.zip" "$INSTDIR\Songs\"
+ ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-TFS.zip" "$INSTDIR\songs\"
- Delete "$TEMP\Song-JC-TFS.zip"
+ Delete "$LOCALAPPDATA\Temp\Song-JC-TFS.zip"
SetOutPath "$INSTDIR"
@@ -594,18 +553,18 @@ Section /o "Ikea" s2_sub1_Section9 AddSize 4608
SetOverwrite try
- SetOutPath "$INSTDIR\Songs\"
+ SetOutPath "$INSTDIR\songs\"
; Download song:
- NSISdl::download /TIMEOUT=50000 ${download_sub1_song9} $TEMP\Song-JC-Ikea.zip
+ NSISdl::download /TIMEOUT=50000 ${download_sub1_song9} $LOCALAPPDATA\Temp\Song-JC-Ikea.zip
Pop $R0
StrCmp $R0 "success" dlok
MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
dlok:
- ZipDLL::extractall "$TEMP\Song-JC-Ikea.zip" "$INSTDIR\Songs\"
+ ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-Ikea.zip" "$INSTDIR\songs\"
- Delete "$TEMP\Song-JC-Ikea.zip"
+ Delete "$LOCALAPPDATA\Temp\Song-JC-Ikea.zip"
SetOutPath "$INSTDIR"
@@ -615,18 +574,18 @@ Section /o "Furry Old Lobster" s2_sub1_Section10 AddSize 3288
SetOverwrite try
- SetOutPath "$INSTDIR\Songs\"
+ SetOutPath "$INSTDIR\songs\"
; Download song:
- NSISdl::download /TIMEOUT=50000 ${download_sub1_song10} $TEMP\Song-JC-FOL.zip
+ NSISdl::download /TIMEOUT=50000 ${download_sub1_song10} $LOCALAPPDATA\Temp\Song-JC-FOL.zip
Pop $R0
StrCmp $R0 "success" dlok
MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
dlok:
- ZipDLL::extractall "$TEMP\Song-JC-FOL.zip" "$INSTDIR\Songs\"
+ ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-FOL.zip" "$INSTDIR\songs\"
- Delete "$TEMP\Song-JC-FOL.zip"
+ Delete "$LOCALAPPDATA\Temp\Song-JC-FOL.zip"
SetOutPath "$INSTDIR"
@@ -636,18 +595,18 @@ Section /o "Code Monkey" s2_sub1_Section11 AddSize 21402
SetOverwrite try
- SetOutPath "$INSTDIR\Songs\"
+ SetOutPath "$INSTDIR\songs\"
; Download song:
- NSISdl::download /TIMEOUT=50000 ${download_sub1_song11} $TEMP\Song-JC-CM.zip
+ NSISdl::download /TIMEOUT=50000 ${download_sub1_song11} $LOCALAPPDATA\Temp\Song-JC-CM.zip
Pop $R0
StrCmp $R0 "success" dlok
MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
dlok:
- ZipDLL::extractall "$TEMP\Song-JC-CM.zip" "$INSTDIR\Songs\"
+ ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-CM.zip" "$INSTDIR\songs\"
- Delete "$TEMP\Song-JC-CM.zip"
+ Delete "$LOCALAPPDATA\Temp\Song-JC-CM.zip"
SetOutPath "$INSTDIR"
@@ -657,18 +616,18 @@ Section /o "I´m Your Moon" s2_sub1_Section12 AddSize 4916
SetOverwrite try
- SetOutPath "$INSTDIR\Songs\"
+ SetOutPath "$INSTDIR\songs\"
; Download song:
- NSISdl::download /TIMEOUT=50000 ${download_sub1_song12} $TEMP\Song-JC-IYM.zip
+ NSISdl::download /TIMEOUT=50000 ${download_sub1_song12} $LOCALAPPDATA\Temp\Song-JC-IYM.zip
Pop $R0
StrCmp $R0 "success" dlok
MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
dlok:
- ZipDLL::extractall "$TEMP\Song-JC-IYM.zip" "$INSTDIR\Songs\"
+ ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-IYM.zip" "$INSTDIR\songs\"
- Delete "$TEMP\Song-JC-IYM.zip"
+ Delete "$LOCALAPPDATA\Temp\Song-JC-IYM.zip"
SetOutPath "$INSTDIR"
@@ -678,18 +637,18 @@ Section /o "First Of May" s2_sub1_Section13 AddSize 6257
SetOverwrite try
- SetOutPath "$INSTDIR\Songs\"
+ SetOutPath "$INSTDIR\songs\"
; Download song:
- NSISdl::download /TIMEOUT=50000 ${download_sub1_song13} $TEMP\Song-JC-FOM.zip
+ NSISdl::download /TIMEOUT=50000 ${download_sub1_song13} $LOCALAPPDATA\Temp\Song-JC-FOM.zip
Pop $R0
StrCmp $R0 "success" dlok
MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
dlok:
- ZipDLL::extractall "$TEMP\Song-JC-FOM.zip" "$INSTDIR\Songs\"
+ ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-FOM.zip" "$INSTDIR\songs\"
- Delete "$TEMP\Song-JC-FOM.zip"
+ Delete "$LOCALAPPDATA\Temp\Song-JC-FOM.zip"
SetOutPath "$INSTDIR"
@@ -699,18 +658,18 @@ Section /o "Dance, Soterious Johnson, Dance" s2_sub1_Section14 AddSize 5929
SetOverwrite try
- SetOutPath "$INSTDIR\Songs\"
+ SetOutPath "$INSTDIR\songs\"
; Download song:
- NSISdl::download /TIMEOUT=50000 ${download_sub1_song14} $TEMP\Song-JC-DSJD.zip
+ NSISdl::download /TIMEOUT=50000 ${download_sub1_song14} $LOCALAPPDATA\Temp\Song-JC-DSJD.zip
Pop $R0
StrCmp $R0 "success" dlok
MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
dlok:
- ZipDLL::extractall "$TEMP\Song-JC-DSJD.zip" "$INSTDIR\Songs\"
+ ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-DSJD.zip" "$INSTDIR\songs\"
- Delete "$TEMP\Song-JC-DSJD.zip"
+ Delete "$LOCALAPPDATA\Temp\Song-JC-DSJD.zip"
SetOutPath "$INSTDIR"
@@ -720,18 +679,18 @@ Section /o "A Talk With George" s2_sub1_Section15 AddSize 4076
SetOverwrite try
- SetOutPath "$INSTDIR\Songs\"
+ SetOutPath "$INSTDIR\songs\"
; Download song:
- NSISdl::download /TIMEOUT=50000 ${download_sub1_song15} $TEMP\Song-JC-ATWG.zip
+ NSISdl::download /TIMEOUT=50000 ${download_sub1_song15} $LOCALAPPDATA\Temp\Song-JC-ATWG.zip
Pop $R0
StrCmp $R0 "success" dlok
MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
dlok:
- ZipDLL::extractall "$TEMP\Song-JC-ATWG.zip" "$INSTDIR\Songs\"
+ ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-ATWG.zip" "$INSTDIR\songs\"
- Delete "$TEMP\Song-JC-ATWG.zip"
+ Delete "$LOCALAPPDATA\Temp\Song-JC-ATWG.zip"
SetOutPath "$INSTDIR"
@@ -741,18 +700,18 @@ Section /o "Creepy Doll" s2_sub1_Section16 AddSize 66560
SetOverwrite try
- SetOutPath "$INSTDIR\Songs\"
+ SetOutPath "$INSTDIR\songs\"
; Download song:
- NSISdl::download /TIMEOUT=50000 ${download_sub1_song16} $TEMP\Song-JC-CD.zip
+ NSISdl::download /TIMEOUT=50000 ${download_sub1_song16} $LOCALAPPDATA\Temp\Song-JC-CD.zip
Pop $R0
StrCmp $R0 "success" dlok
MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
dlok:
- ZipDLL::extractall "$TEMP\Song-JC-CD.zip" "$INSTDIR\Songs\"
+ ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-CD.zip" "$INSTDIR\songs\"
- Delete "$TEMP\Song-JC-CD.zip"
+ Delete "$LOCALAPPDATA\Temp\Song-JC-CD.zip"
SetOutPath "$INSTDIR"
@@ -762,18 +721,18 @@ Section /o "That Spells DNA" s2_sub1_Section17 AddSize 4158
SetOverwrite try
- SetOutPath "$INSTDIR\Songs\"
+ SetOutPath "$INSTDIR\songs\"
; Download song:
- NSISdl::download /TIMEOUT=50000 ${download_sub1_song17} $TEMP\Song-JC-TSDNA.zip
+ NSISdl::download /TIMEOUT=50000 ${download_sub1_song17} $LOCALAPPDATA\Temp\Song-JC-TSDNA.zip
Pop $R0
StrCmp $R0 "success" dlok
MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
dlok:
- ZipDLL::extractall "$TEMP\Song-JC-TSDNA.zip" "$INSTDIR\Songs\"
+ ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-TSDNA.zip" "$INSTDIR\songs\"
- Delete "$TEMP\Song-JC-TSDNA.zip"
+ Delete "$LOCALAPPDATA\Temp\Song-JC-TSDNA.zip"
SetOutPath "$INSTDIR"
@@ -783,18 +742,18 @@ Section /o "When You Go" s2_sub1_Section18 AddSize 5755
SetOverwrite try
- SetOutPath "$INSTDIR\Songs\"
+ SetOutPath "$INSTDIR\songs\"
; Download song:
- NSISdl::download /TIMEOUT=50000 ${download_sub1_song18} $TEMP\Song-JC-WYG.zip
+ NSISdl::download /TIMEOUT=50000 ${download_sub1_song18} $LOCALAPPDATA\Temp\Song-JC-WYG.zip
Pop $R0
StrCmp $R0 "success" dlok
MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
dlok:
- ZipDLL::extractall "$TEMP\Song-JC-WYG.zip" "$INSTDIR\Songs\"
+ ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-WYG.zip" "$INSTDIR\songs\"
- Delete "$TEMP\Song-JC-WYG.zip"
+ Delete "$LOCALAPPDATA\Temp\Song-JC-WYG.zip"
SetOutPath "$INSTDIR"
@@ -804,18 +763,18 @@ Section /o "Better" s2_sub1_Section19 AddSize 4199
SetOverwrite try
- SetOutPath "$INSTDIR\Songs\"
+ SetOutPath "$INSTDIR\songs\"
; Download song:
- NSISdl::download /TIMEOUT=50000 ${download_sub1_song19} $TEMP\Song-JC-Better.zip
+ NSISdl::download /TIMEOUT=50000 ${download_sub1_song19} $LOCALAPPDATA\Temp\Song-JC-Better.zip
Pop $R0
StrCmp $R0 "success" dlok
MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
dlok:
- ZipDLL::extractall "$TEMP\Song-JC-Better.zip" "$INSTDIR\Songs\"
+ ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-Better.zip" "$INSTDIR\songs\"
- Delete "$TEMP\Song-JC-Better.zip"
+ Delete "$LOCALAPPDATA\Temp\Song-JC-Better.zip"
SetOutPath "$INSTDIR"
@@ -825,18 +784,18 @@ Section /o "Shop Vac" s2_sub1_Section20 AddSize 5448
SetOverwrite try
- SetOutPath "$INSTDIR\Songs\"
+ SetOutPath "$INSTDIR\songs\"
; Download song:
- NSISdl::download /TIMEOUT=50000 ${download_sub1_song20} $TEMP\Song-JC-SV.zip
+ NSISdl::download /TIMEOUT=50000 ${download_sub1_song20} $LOCALAPPDATA\Temp\Song-JC-SV.zip
Pop $R0
StrCmp $R0 "success" dlok
MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
dlok:
- ZipDLL::extractall "$TEMP\Song-JC-SV.zip" "$INSTDIR\Songs\"
+ ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-SV.zip" "$INSTDIR\songs\"
- Delete "$TEMP\Song-JC-SV.zip"
+ Delete "$LOCALAPPDATA\Temp\Song-JC-SV.zip"
SetOutPath "$INSTDIR"
@@ -846,18 +805,18 @@ Section /o "I Feel Fantastic" s2_sub1_Section21 AddSize 3851
SetOverwrite try
- SetOutPath "$INSTDIR\Songs\"
+ SetOutPath "$INSTDIR\songs\"
; Download song:
- NSISdl::download /TIMEOUT=50000 ${download_sub1_song21} $TEMP\Song-JC-IFF.zip
+ NSISdl::download /TIMEOUT=50000 ${download_sub1_song21} $LOCALAPPDATA\Temp\Song-JC-IFF.zip
Pop $R0
StrCmp $R0 "success" dlok
MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
dlok:
- ZipDLL::extractall "$TEMP\Song-JC-IFF.zip" "$INSTDIR\Songs\"
+ ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-IFF.zip" "$INSTDIR\songs\"
- Delete "$TEMP\Song-JC-IFF.zip"
+ Delete "$LOCALAPPDATA\Temp\Song-JC-IFF.zip"
SetOutPath "$INSTDIR"
@@ -867,18 +826,18 @@ Section /o "Re: Your Brains" s2_sub1_Section22 AddSize 7087
SetOverwrite try
- SetOutPath "$INSTDIR\Songs\"
+ SetOutPath "$INSTDIR\songs\"
; Download song:
- NSISdl::download /TIMEOUT=50000 ${download_sub1_song22} $TEMP\Song-JC-ReYB.zip
+ NSISdl::download /TIMEOUT=50000 ${download_sub1_song22} $LOCALAPPDATA\Temp\Song-JC-ReYB.zip
Pop $R0
StrCmp $R0 "success" dlok
MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
dlok:
- ZipDLL::extractall "$TEMP\Song-JC-ReYB.zip" "$INSTDIR\Songs\"
+ ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-ReYB.zip" "$INSTDIR\songs\"
- Delete "$TEMP\Song-JC-ReYB.zip"
+ Delete "$LOCALAPPDATA\Temp\Song-JC-ReYB.zip"
SetOutPath "$INSTDIR"
@@ -888,18 +847,18 @@ Section /o "Skullcrusher Mountain" s2_sub1_Section23 AddSize 6298
SetOverwrite try
- SetOutPath "$INSTDIR\Songs\"
+ SetOutPath "$INSTDIR\songs\"
; Download song:
- NSISdl::download /TIMEOUT=50000 ${download_sub1_song23} $TEMP\Song-JC-SCM.zip
+ NSISdl::download /TIMEOUT=50000 ${download_sub1_song23} $LOCALAPPDATA\Temp\Song-JC-SCM.zip
Pop $R0
StrCmp $R0 "success" dlok
MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
dlok:
- ZipDLL::extractall "$TEMP\Song-JC-SCM.zip" "$INSTDIR\Songs\"
+ ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-SCM.zip" "$INSTDIR\songs\"
- Delete "$TEMP\Song-JC-SCM.zip"
+ Delete "$LOCALAPPDATA\Temp\Song-JC-SCM.zip"
SetOutPath "$INSTDIR"
@@ -909,18 +868,18 @@ Section /o "Chiron Beta Prime" s2_sub1_Section24 AddSize 38298
SetOverwrite try
- SetOutPath "$INSTDIR\Songs\"
+ SetOutPath "$INSTDIR\songs\"
; Download song:
- NSISdl::download /TIMEOUT=50000 ${download_sub1_song24} $TEMP\Song-JC-CBP.zip
+ NSISdl::download /TIMEOUT=50000 ${download_sub1_song24} $LOCALAPPDATA\Temp\Song-JC-CBP.zip
Pop $R0
StrCmp $R0 "success" dlok
MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
dlok:
- ZipDLL::extractall "$TEMP\Song-JC-CBP.zip" "$INSTDIR\Songs\"
+ ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-JC-CBP.zip" "$INSTDIR\songs\"
- Delete "$TEMP\Song-JC-CBP.zip"
+ Delete "$LOCALAPPDATA\Temp\Song-JC-CBP.zip"
SetOutPath "$INSTDIR"
@@ -937,19 +896,19 @@ Section /o "Joshua Morin - On The Run" g2Section3 AddSize 3881
SetOverwrite try
SetOutPath "$INSTDIR"
- CreateDirectory "$INSTDIR\Songs\Joshua Morin - On The Run"
- SetOutPath "$INSTDIR\Songs\Joshua Morin - On The Run\"
+ CreateDirectory "$INSTDIR\songs\Joshua Morin - On The Run"
+ SetOutPath "$INSTDIR\songs\Joshua Morin - On The Run\"
; Download song:
- NSISdl::download /TIMEOUT=50000 ${download_song3} $TEMP\Song-On-the-run.zip
+ NSISdl::download /TIMEOUT=50000 ${download_song3} $LOCALAPPDATA\Temp\Song-On-the-run.zip
Pop $R0 ;Get the return value
StrCmp $R0 "success" dlok
MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
dlok:
- ZipDLL::extractall "$TEMP\Song-On-the-run.zip" "$INSTDIR\Songs\Joshua Morin - On The Run\"
+ ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-On-the-run.zip" "$INSTDIR\songs\Joshua Morin - On The Run\"
- Delete "$TEMP\Song-On-the-run.zip"
+ Delete "$LOCALAPPDATA\Temp\Song-On-the-run.zip"
SetOutPath "$INSTDIR"
@@ -959,19 +918,19 @@ Section /o "Pornophonique - Space Invaders" g2Section4 AddSize 3646
SetOverwrite try
SetOutPath "$INSTDIR"
- CreateDirectory "$INSTDIR\Songs\Pornophonique - Space Invaders"
- SetOutPath "$INSTDIR\Songs\Pornophonique - Space Invaders\"
+ CreateDirectory "$INSTDIR\songs\Pornophonique - Space Invaders"
+ SetOutPath "$INSTDIR\songs\Pornophonique - Space Invaders\"
; Download song:
- NSISdl::download /TIMEOUT=50000 ${download_song4} $TEMP\Song-Space-Invaders.zip
+ NSISdl::download /TIMEOUT=50000 ${download_song4} $LOCALAPPDATA\Temp\Song-Space-Invaders.zip
Pop $R0 ;Get the return value
StrCmp $R0 "success" dlok
MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
dlok:
- ZipDLL::extractall "$TEMP\Song-Space-Invaders.zip" "$INSTDIR\Songs\Pornophonique - Space Invaders\"
+ ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-Space-Invaders.zip" "$INSTDIR\songs\Pornophonique - Space Invaders\"
- Delete "$TEMP\Song-Space-Invaders.zip"
+ Delete "$LOCALAPPDATA\Temp\Song-Space-Invaders.zip"
SetOutPath "$INSTDIR"
@@ -983,18 +942,18 @@ Section /o "Shearer - 69" s2_sub2_Section1 AddSize 4557
SetOverwrite try
- SetOutPath "$INSTDIR\Songs\"
+ SetOutPath "$INSTDIR\songs\"
; Download song:
- NSISdl::download /TIMEOUT=50000 ${download_sub2_song1} $TEMP\Song-Shearer-69.zip
+ NSISdl::download /TIMEOUT=50000 ${download_sub2_song1} $LOCALAPPDATA\Temp\Song-Shearer-69.zip
Pop $R0
StrCmp $R0 "success" dlok
MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
dlok:
- ZipDLL::extractall "$TEMP\Song-Shearer-69.zip" "$INSTDIR\Songs\"
+ ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-Shearer-69.zip" "$INSTDIR\songs\"
- Delete "$TEMP\Song-Shearer-69.zip"
+ Delete "$LOCALAPPDATA\Temp\Song-Shearer-69.zip"
SetOutPath "$INSTDIR"
@@ -1004,18 +963,18 @@ Section /o "Shearer - 69 (Karaoke)" s2_sub2_Section2 AddSize 4772
SetOverwrite try
- SetOutPath "$INSTDIR\Songs\"
+ SetOutPath "$INSTDIR\songs\"
; Download song:
- NSISdl::download /TIMEOUT=50000 ${download_sub2_song2} $TEMP\Song-Shearer-69-Kar.zip
+ NSISdl::download /TIMEOUT=50000 ${download_sub2_song2} $LOCALAPPDATA\Temp\Song-Shearer-69-Kar.zip
Pop $R0
StrCmp $R0 "success" dlok
MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
dlok:
- ZipDLL::extractall "$TEMP\Song-Shearer-69-Kar.zip" "$INSTDIR\Songs\"
+ ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-Shearer-69-Kar.zip" "$INSTDIR\songs\"
- Delete "$TEMP\Song-Shearer-69-Kar.zip"
+ Delete "$LOCALAPPDATA\Temp\Song-Shearer-69-Kar.zip"
SetOutPath "$INSTDIR"
@@ -1025,18 +984,18 @@ Section /o "Shearer - Can't stop it" s2_sub2_Section3 AddSize 5510
SetOverwrite try
- SetOutPath "$INSTDIR\Songs\"
+ SetOutPath "$INSTDIR\songs\"
; Download song:
- NSISdl::download /TIMEOUT=50000 ${download_sub2_song3} $TEMP\Song-Shearer-CSI.zip
+ NSISdl::download /TIMEOUT=50000 ${download_sub2_song3} $LOCALAPPDATA\Temp\Song-Shearer-CSI.zip
Pop $R0
StrCmp $R0 "success" dlok
MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
dlok:
- ZipDLL::extractall "$TEMP\Song-Shearer-CSI.zip" "$INSTDIR\Songs\"
+ ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-Shearer-CSI.zip" "$INSTDIR\songs\"
- Delete "$TEMP\Song-Shearer-CSI.zip"
+ Delete "$LOCALAPPDATA\Temp\Song-Shearer-CSI.zip"
SetOutPath "$INSTDIR"
@@ -1046,18 +1005,18 @@ Section /o "Shearer - Can't stop it (Karaoke)" s2_sub2_Section4 AddSize 4178
SetOverwrite try
- SetOutPath "$INSTDIR\Songs\"
+ SetOutPath "$INSTDIR\songs\"
; Download song:
- NSISdl::download /TIMEOUT=50000 ${download_sub2_song4} $TEMP\Song-Shearer-CSI-Kar.zip
+ NSISdl::download /TIMEOUT=50000 ${download_sub2_song4} $LOCALAPPDATA\Temp\Song-Shearer-CSI-Kar.zip
Pop $R0
StrCmp $R0 "success" dlok
MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
dlok:
- ZipDLL::extractall "$TEMP\Song-Shearer-CSI-Kar.zip" "$INSTDIR\Songs\"
+ ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-Shearer-CSI-Kar.zip" "$INSTDIR\songs\"
- Delete "$TEMP\Song-Shearer-CSI-Kar.zip"
+ Delete "$LOCALAPPDATA\Temp\Song-Shearer-CSI-Kar.zip"
SetOutPath "$INSTDIR"
@@ -1067,18 +1026,18 @@ Section /o "Shearer - In My Hand" s2_sub2_Section5 AddSize 5960
SetOverwrite try
- SetOutPath "$INSTDIR\Songs\"
+ SetOutPath "$INSTDIR\songs\"
; Download song:
- NSISdl::download /TIMEOUT=50000 ${download_sub2_song5} $TEMP\Song-Shearer-IMH.zip
+ NSISdl::download /TIMEOUT=50000 ${download_sub2_song5} $LOCALAPPDATA\Temp\Song-Shearer-IMH.zip
Pop $R0
StrCmp $R0 "success" dlok
MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
dlok:
- ZipDLL::extractall "$TEMP\Song-Shearer-IMH.zip" "$INSTDIR\Songs\"
+ ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-Shearer-IMH.zip" "$INSTDIR\songs\"
- Delete "$TEMP\Song-Shearer-IMH.zip"
+ Delete "$LOCALAPPDATA\Temp\Song-Shearer-IMH.zip"
SetOutPath "$INSTDIR"
@@ -1088,18 +1047,18 @@ Section /o "Shearer - Man Song" s2_sub2_Section6 AddSize 7270
SetOverwrite try
- SetOutPath "$INSTDIR\Songs\"
+ SetOutPath "$INSTDIR\songs\"
; Download song:
- NSISdl::download /TIMEOUT=50000 ${download_sub2_song6} $TEMP\Song-Shearer-MS.zip
+ NSISdl::download /TIMEOUT=50000 ${download_sub2_song6} $LOCALAPPDATA\Temp\Song-Shearer-MS.zip
Pop $R0
StrCmp $R0 "success" dlok
MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
dlok:
- ZipDLL::extractall "$TEMP\Song-Shearer-MS.zip" "$INSTDIR\Songs\"
+ ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-Shearer-MS.zip" "$INSTDIR\songs\"
- Delete "$TEMP\Song-Shearer-MS.zip"
+ Delete "$LOCALAPPDATA\Temp\Song-Shearer-MS.zip"
SetOutPath "$INSTDIR"
@@ -1109,18 +1068,18 @@ Section /o "Shearer - Man Song (Karaoke)" s2_sub2_Section7 AddSize 5807
SetOverwrite try
- SetOutPath "$INSTDIR\Songs\"
+ SetOutPath "$INSTDIR\songs\"
; Download song:
- NSISdl::download /TIMEOUT=50000 ${download_sub2_song7} $TEMP\Song-Shearer-MS-Kar.zip
+ NSISdl::download /TIMEOUT=50000 ${download_sub2_song7} $LOCALAPPDATA\Temp\Song-Shearer-MS-Kar.zip
Pop $R0
StrCmp $R0 "success" dlok
MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
dlok:
- ZipDLL::extractall "$TEMP\Song-Shearer-MS-Kar.zip" "$INSTDIR\Songs\"
+ ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-Shearer-MS-Kar.zip" "$INSTDIR\songs\"
- Delete "$TEMP\Song-Shearer-MS-Kar.zip"
+ Delete "$LOCALAPPDATA\Temp\Song-Shearer-MS-Kar.zip"
SetOutPath "$INSTDIR"
@@ -1130,18 +1089,18 @@ Section /o "Shearer - Stay With Me" s2_sub2_Section8 AddSize 6400
SetOverwrite try
- SetOutPath "$INSTDIR\Songs\"
+ SetOutPath "$INSTDIR\songs\"
; Download song:
- NSISdl::download /TIMEOUT=50000 ${download_sub2_song8} $TEMP\Song-Shearer-SWM.zip
+ NSISdl::download /TIMEOUT=50000 ${download_sub2_song8} $LOCALAPPDATA\Temp\Song-Shearer-SWM.zip
Pop $R0
StrCmp $R0 "success" dlok
MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
dlok:
- ZipDLL::extractall "$TEMP\Song-Shearer-SWM.zip" "$INSTDIR\Songs\"
+ ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-Shearer-SWM.zip" "$INSTDIR\songs\"
- Delete "$TEMP\Song-Shearer-SWM.zip"
+ Delete "$LOCALAPPDATA\Temp\Song-Shearer-SWM.zip"
SetOutPath "$INSTDIR"
@@ -1151,19 +1110,19 @@ Section /o "Shearer - Stay With Me (Karaoke)" s2_sub2_Section9 AddSize 5417
SetOverwrite try
- SetOutPath "$INSTDIR\Songs\"
+ SetOutPath "$INSTDIR\songs\"
; Download song:
- NSISdl::download /TIMEOUT=50000 ${download_sub2_song9} $TEMP\Song-Shearer-SWM-Kar.zip
+ NSISdl::download /TIMEOUT=50000 ${download_sub2_song9} $LOCALAPPDATA\Temp\Song-Shearer-SWM-Kar.zip
Pop $R0
StrCmp $R0 "success" dlok
MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
dlok:
- ZipDLL::extractall "$TEMP\Song-Shearer-SWM-Kar.zip" "$INSTDIR\Songs\"
+ ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-Shearer-SWM-Kar.zip" "$INSTDIR\songs\"
- Delete "$TEMP\Song-Shearer-SWM-Kar.zip"
+ Delete "$LOCALAPPDATA\Temp\Song-Shearer-SWM-Kar.zip"
SetOutPath "$INSTDIR"
@@ -1175,20 +1134,20 @@ Section /o "Steven Dunston - Northern Star" g2Section5 AddSize 2427
SetOverwrite try
SetOutPath "$INSTDIR"
- CreateDirectory "$INSTDIR\Songs\Steven Dunston - Northern Star"
- SetOutPath "$INSTDIR\Songs\Steven Dunston - Northern Star\"
+ CreateDirectory "$INSTDIR\songs\Steven Dunston - Northern Star"
+ SetOutPath "$INSTDIR\songs\Steven Dunston - Northern Star\"
; Download song:
- NSISdl::download /TIMEOUT=50000 ${download_song5} $TEMP\Song-Northern-Star.zip
+ NSISdl::download /TIMEOUT=50000 ${download_song5} $LOCALAPPDATA\Temp\Song-Northern-Star.zip
Pop $R0 ;Get the return value
StrCmp $R0 "success" dlok
MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
dlok:
- ZipDLL::extractall "$TEMP\Song-Northern-Star.zip" "$INSTDIR\Songs\Steven Dunston - Northern Star\"
+ ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-Northern-Star.zip" "$INSTDIR\songs\Steven Dunston - Northern Star\"
- Delete "$TEMP\Song-Northern-Star.zip"
+ Delete "$LOCALAPPDATA\Temp\Song-Northern-Star.zip"
SetOutPath "$INSTDIR"
@@ -1200,19 +1159,19 @@ Section /o "Wise Guys - Lebendig und kräftig und schärfer" s2_sub3_Section1 AddSize 4015
SetOverwrite try
- SetOutPath "$INSTDIR\Songs\"
+ SetOutPath "$INSTDIR\songs\"
; Download song:
- NSISdl::download /TIMEOUT=50000 ${download_sub3_song1} $TEMP\Song-WiseGuys-LUKUS.zip
+ NSISdl::download /TIMEOUT=50000 ${download_sub3_song1} $LOCALAPPDATA\Temp\Song-WiseGuys-LUKUS.zip
Pop $R0
StrCmp $R0 "success" dlok
MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
dlok:
- ZipDLL::extractall "$TEMP\Song-WiseGuys-LUKUS.zip" "$INSTDIR\Songs\"
+ ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-WiseGuys-LUKUS.zip" "$INSTDIR\songs\"
- Delete "$TEMP\Song-WiseGuys-LUKUS.zip"
+ Delete "$LOCALAPPDATA\Temp\Song-WiseGuys-LUKUS.zip"
SetOutPath "$INSTDIR"
@@ -1222,167 +1181,56 @@ Section /o "Wise Guys - Mensch, wo bist du?" s2_sub3_Section2 AddSize 5335
SetOverwrite try
- SetOutPath "$INSTDIR\Songs\"
+ SetOutPath "$INSTDIR\songs\"
; Download song:
- NSISdl::download /TIMEOUT=50000 ${download_sub3_song2} $TEMP\Song-WiseGuys-MWBD.zip
+ NSISdl::download /TIMEOUT=50000 ${download_sub3_song2} $LOCALAPPDATA\Temp\Song-WiseGuys-MWBD.zip
Pop $R0
StrCmp $R0 "success" dlok
MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
dlok:
- ZipDLL::extractall "$TEMP\Song-WiseGuys-MWBD.zip" "$INSTDIR\Songs\"
+ ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-WiseGuys-MWBD.zip" "$INSTDIR\songs\"
- Delete "$TEMP\Song-WiseGuys-MWBD.zip"
+ Delete "$LOCALAPPDATA\Temp\Song-WiseGuys-MWBD.zip"
SetOutPath "$INSTDIR"
SectionEnd
-SectionGroupEnd
-
-SectionGroupEnd
-
-;------------------------------------
-; OPTIONAL THEMES (Section 3)
-;------------------------------------
-
-SectionGroup $(name_section3) Section3
+Section /o "Wise Guys - Mensch, wo bist du? (Karaoke)" s2_sub3_Section3
- Section /o "Orange" g3Section1
- AddSize 1291
-
-; Download theme orange:
- NSISdl::download /TIMEOUT=50000 ${download_theme1} $TEMP\Theme-Orange.zip
+ AddSize 5335
+ SetOverwrite try
+ SetOutPath "$INSTDIR\songs\"
- Pop $R0 ;Get the return value
+; Download song:
+ NSISdl::download /TIMEOUT=50000 ${download_sub3_song3} $LOCALAPPDATA\Temp\Song-WiseGuys-MWBDKar.zip
+
+ Pop $R0
StrCmp $R0 "success" dlok
MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
dlok:
- ZipDLL::extractall "$TEMP\Theme-Orange.zip" "$INSTDIR\"
-
- Delete "$TEMP\Theme-Orange.zip"
-
- SetOutPath "$INSTDIR"
-
-SectionEnd
-
- Section /o "Streetlight" g3Section2
- AddSize 1905
-; Download theme Streetlight:
- NSISdl::download /TIMEOUT=50000 ${download_theme2} $TEMP\Theme-Streetlight.zip
+ ZipDLL::extractall "$LOCALAPPDATA\Temp\Song-WiseGuys-MWBDKar.zip" "$INSTDIR\songs\"
- Pop $R0 ;Get the return value
- StrCmp $R0 "success" dlok
- MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
- dlok:
- ZipDLL::extractall "$TEMP\Theme-Streetlight.zip" "$INSTDIR\"
-
- Delete "$TEMP\Theme-Streetlight.zip"
+ Delete "$LOCALAPPDATA\Temp\Song-WiseGuys-MWBDKar.zip"
SetOutPath "$INSTDIR"
SectionEnd
- Section /o "Vistar" g3Section3
- AddSize 1936
-
-; Download theme Vistar:
-
- NSISdl::download /TIMEOUT=50000 ${download_theme3} $TEMP\Theme-Vistar.zip
-
- Pop $R0 ;Get the return value
- StrCmp $R0 "success" dlok
- MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
- dlok:
- ZipDLL::extractall "$TEMP\Theme-Vistar.zip" "$INSTDIR\"
-
- Delete "$TEMP\Theme-Vistar.zip"
-
- SetOutPath "$INSTDIR"
-
-SectionEnd
-
- Section /o "BlueSensation" g3Section4
- AddSize 2109
-
-; Download theme BlueSensation:
-
- NSISdl::download /TIMEOUT=50000 ${download_theme4} $TEMP\Theme-BlueSensation.zip
-
- Pop $R0 ;Get the return value
- StrCmp $R0 "success" dlok
- MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
- dlok:
- ZipDLL::extractall "$TEMP\Theme-BlueSensation.zip" "$INSTDIR\"
-
- Delete "$TEMP\Theme-BlueSensation.zip"
-
- SetOutPath "$INSTDIR"
-
-SectionEnd
-
-
- Section /o "WhiteSensation" g3Section5
- AddSize 1168
-
-; Download theme WhiteSensation:
-
- NSISdl::download /TIMEOUT=50000 ${download_theme7} $TEMP\Theme-WhiteSensation.zip
-
- Pop $R0 ;Get the return value
- StrCmp $R0 "success" dlok
- MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
- dlok:
- ZipDLL::extractall "$TEMP\Theme-WhiteSensation.zip" "$INSTDIR\"
-
- Delete "$TEMP\Theme-WhiteSensation.zip"
-
- SetOutPath "$INSTDIR"
-
-SectionEnd
-
- Section /o "WiiStar" g3Section6
- AddSize 850
-
-; Download theme WiiStar:
-
- NSISdl::download /TIMEOUT=50000 ${download_theme5} $TEMP\Theme-WiiStar.zip
-
- Pop $R0 ;Get the return value
- StrCmp $R0 "success" dlok
- MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
- dlok:
- ZipDLL::extractall "$TEMP\Theme-WiiStar.zip" "$INSTDIR\"
-
- Delete "$TEMP\Theme-WiiStar.zip"
-
- SetOutPath "$INSTDIR"
-
-SectionEnd
-
- Section /o "iStar" g3Section7
- AddSize 1588
-
-; Download theme iStar:
-
- NSISdl::download /TIMEOUT=50000 ${download_theme6} $TEMP\Theme-iStar.zip
-
- Pop $R0 ;Get the return value
- StrCmp $R0 "success" dlok
- MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK
- dlok:
- ZipDLL::extractall "$TEMP\Theme-iStar.zip" "$INSTDIR\"
+SectionGroupEnd
- Delete "$TEMP\Theme-iStar.zip"
+SectionGroupEnd
- SetOutPath "$INSTDIR"
+;------------------------------------
+; OPTIONAL THEMES (Section 3)
+;------------------------------------
-SectionEnd
-
-SectionGroupEnd
+; No additional themes available
+; for current version of ultrastardx
;------------------------------------
; UNINSTALL (Section 4)
@@ -1397,14 +1245,7 @@ Section Uninstall DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
; Unregister from Windows Vista Game Explorer
-
-${If} ${AtLeastWinVista}
-
-${GameExplorer_RemoveGame} $0
-
-${EndIf}
-
-
+; (removed due to incompatibility with Windows 7)
SectionEnd
@@ -1420,7 +1261,7 @@ SectionEnd !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub1} $(DESC_Section2_sub1)
!insertmacro MUI_DESCRIPTION_TEXT ${s2_sub2} $(DESC_Section2_sub2)
!insertmacro MUI_DESCRIPTION_TEXT ${s2_sub3} $(DESC_Section2_sub3)
- !insertmacro MUI_DESCRIPTION_TEXT ${Section3} $(DESC_Section3)
+; !insertmacro MUI_DESCRIPTION_TEXT ${Section3} $(DESC_Section3)
!insertmacro MUI_DESCRIPTION_TEXT ${g2Section1} $(DESC_g2Section1)
!insertmacro MUI_DESCRIPTION_TEXT ${g2Section2} $(DESC_g2Section2)
@@ -1465,14 +1306,7 @@ SectionEnd !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub3_Section1} $(DESC_s2_sub3_Section1)
!insertmacro MUI_DESCRIPTION_TEXT ${s2_sub3_Section2} $(DESC_s2_sub3_Section2)
-
- !insertmacro MUI_DESCRIPTION_TEXT ${g3Section1} $(DESC_g3Section1)
- !insertmacro MUI_DESCRIPTION_TEXT ${g3Section2} $(DESC_g3Section2)
- !insertmacro MUI_DESCRIPTION_TEXT ${g3Section3} $(DESC_g3Section3)
- !insertmacro MUI_DESCRIPTION_TEXT ${g3Section4} $(DESC_g3Section4)
- !insertmacro MUI_DESCRIPTION_TEXT ${g3Section5} $(DESC_g3Section5)
- !insertmacro MUI_DESCRIPTION_TEXT ${g3Section6} $(DESC_g3Section6)
- !insertmacro MUI_DESCRIPTION_TEXT ${g3Section7} $(DESC_g3Section7)
+ !insertmacro MUI_DESCRIPTION_TEXT ${s2_sub3_Section3} $(DESC_s2_sub3_Section3)
!insertmacro MUI_FUNCTION_DESCRIPTION_END
@@ -1487,10 +1321,21 @@ SectionEnd !include "${path_languages}\*.nsh"
+;!addPluginDir "${path_plugins}\"
+
+Function bgmusic
+ File /oname=$PLUGINSDIR\loop.wav .\dependencies\loop.wav
+ BGImage::Sound /NOUNLOAD /LOOP $PLUGINSDIR\loop.wav
+FunctionEnd
+
+Function .onGUIEnd
+ BGImage::Sound /STOP
+FunctionEnd
+
Function .onInit
var /GLOBAL version
-StrCpy $version "1.1a"
+StrCpy $version "1.1beta"
System::Call 'kernel32::CreateMutexA(i 0, i 0, t "USdx Installer.exe") ?e'
@@ -1537,10 +1382,18 @@ Function un.onInit StrCmp $R0 0 0 +2
MessageBox MB_YESNO|MB_ICONEXCLAMATION '$(oninit_closeusdx)' IDYES closeit IDNO end
- closeit:
+ closeit:
${nsProcess::KillProcess} "USdx.exe" $R0
goto continue
+ ${nsProcess::FindProcess} "ultrastardx.exe" $R0
+ StrCmp $R0 0 0 +2
+ MessageBox MB_YESNO|MB_ICONEXCLAMATION '$(oninit_closeusdx)' IDYES closeusdx IDNO end
+
+ closeusdx:
+ ${nsProcess::KillProcess} "ultrastardx.exe" $R0
+ goto continue
+
end:
${nsProcess::Unload}
Abort
diff --git a/installer/dependencies/dll/put game dlls here b/installer/dependencies/dll/put game dlls here new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/installer/dependencies/dll/put game dlls here diff --git a/installer/dependencies/documents/documentation.pdf b/installer/dependencies/documents/documentation.pdf Binary files differnew file mode 100644 index 00000000..16267bb9 --- /dev/null +++ b/installer/dependencies/documents/documentation.pdf diff --git a/installer/dependencies/documents/license.txt b/installer/dependencies/documents/license.txt new file mode 100644 index 00000000..66f35b98 --- /dev/null +++ b/installer/dependencies/documents/license.txt @@ -0,0 +1,125 @@ +The GNU General Public License (GPL) +Version 2, June 1991 +Copyright (C) 1989, 1991 Free Software Foundation, Inc. +59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +Everyone is permitted to copy and distribute verbatim copies +of this license document, but changing it is not allowed. + +Preamble + +The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Library General Public License instead.) You can apply it to your programs, too. + +When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things. + +To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it. + +For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. + +We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software. + +Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations. + +Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all. + +The precise terms and conditions for copying, distribution and modification follow. + +TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + +0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. + +1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program. + +You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. + +2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: + +a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change. + +b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. + +c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. + +3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following: + +a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, + +b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, + +c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. + +If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. + +4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. + +5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it. + +6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License. + +7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. + +This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. + +8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. + +9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation. + +10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. + +NO WARRANTY + +11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + +12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +END OF TERMS AND CONDITIONS + +How to Apply These Terms to Your New Programs + +If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. + +To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. + +one line to give the program's name and a brief idea of what it does. +Copyright (C) + +This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this when it starts in an interactive mode: + +Gnomovision version 69, Copyright (C) year name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than `show w' and `show c'; they could even be mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names: + +Yoyodyne, Inc., hereby disclaims all copyright interest +in the program `Gnomovision' (which makes passes at compilers) +written by James Hacker. + +signature of Ty Coon, 1 April 1989 +Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Library General Public License instead of this License. diff --git a/installer/dependencies/images/header.bmp b/installer/dependencies/images/header.bmp Binary files differnew file mode 100644 index 00000000..058eafd3 --- /dev/null +++ b/installer/dependencies/images/header.bmp diff --git a/installer/dependencies/images/side.bmp b/installer/dependencies/images/side.bmp Binary files differnew file mode 100644 index 00000000..3883fa09 --- /dev/null +++ b/installer/dependencies/images/side.bmp diff --git a/installer/dependencies/loop.wav b/installer/dependencies/loop.wav Binary files differnew file mode 100644 index 00000000..8a252921 --- /dev/null +++ b/installer/dependencies/loop.wav diff --git a/installer/dependencies/plugins/NSISdl.dll b/installer/dependencies/plugins/NSISdl.dll Binary files differnew file mode 100644 index 00000000..a3675054 --- /dev/null +++ b/installer/dependencies/plugins/NSISdl.dll diff --git a/installer/dependencies/plugins/ZipDLL.dll b/installer/dependencies/plugins/ZipDLL.dll Binary files differnew file mode 100644 index 00000000..5925d591 --- /dev/null +++ b/installer/dependencies/plugins/ZipDLL.dll diff --git a/installer/dependencies/plugins/nsProcess.dll b/installer/dependencies/plugins/nsProcess.dll Binary files differnew file mode 100644 index 00000000..064097a3 --- /dev/null +++ b/installer/dependencies/plugins/nsProcess.dll diff --git a/installer/install.ico b/installer/install.ico Binary files differnew file mode 100644 index 00000000..fc1d0797 --- /dev/null +++ b/installer/install.ico diff --git a/installer/languages/English.nsh b/installer/languages/English.nsh index 63901b87..5d57a420 100644 --- a/installer/languages/English.nsh +++ b/installer/languages/English.nsh @@ -15,7 +15,7 @@ LangString button_next ${LANG_ENGLISH} "Next >" LangString button_close ${LANG_ENGLISH} "Close"
LangString update_information ${LANG_ENGLISH} "You can check if a new version of 'UltraStar Deluxe' is available. Thereto an internet connection will be established. If a new version is found, it can be installed afterwards."
-LangString delete_all ${LANG_ENGLISH} "Also delete Songs, Highscores and Covers ?"
+LangString delete_all ${LANG_ENGLISH} "Also delete Songs, Settings, Highscores and Covers ?"
LangString update_check_older ${LANG_ENGLISH} "Your version $R0 is outdated. The new version $1 of UltraStar Deluxe is available. Do you want to update?"
LangString update_check_equal ${LANG_ENGLISH} "Your currently installed version $R0 is up-to-date. No update needed."
@@ -54,6 +54,7 @@ LangString sm_uninstall ${LANG_ENGLISH} "Uninstall" LangString sm_website ${LANG_ENGLISH} "Website"
LangString sm_license ${LANG_ENGLISH} "License"
LangString sm_readme ${LANG_ENGLISH} "Readme"
+LangString sm_songs ${LANG_ENGLISH} "Songs"
LangString sm_documentation ${LANG_ENGLISH} "Documentation"
LangString sc_play ${LANG_ENGLISH} "Play"
@@ -66,14 +67,12 @@ LangString name_section2 ${LANG_ENGLISH} "Songs" LangString name_s2_sub1 ${LANG_ENGLISH} "Jonathan Coulton"
LangString name_s2_sub2 ${LANG_ENGLISH} "Shearer"
LangString name_s2_sub3 ${LANG_ENGLISH} "Wise Guys"
-LangString name_section3 ${LANG_ENGLISH} "Themes"
LangString DESC_Section1 ${LANG_ENGLISH} "These are the basic files needed by UltraStar Deluxe"
LangString DESC_Section2 ${LANG_ENGLISH} "You can choose which songs should be installed."
LangString DESC_Section2_sub1 ${LANG_ENGLISH} "You can choose which Jonathan Coulton songs (CC by-nc 3.0) should be installed."
LangString DESC_Section2_sub2 ${LANG_ENGLISH} "You can choose which Shearer songs (CC by-nc-sa 2.0 / 3.0) should be installed."
LangString DESC_Section2_sub3 ${LANG_ENGLISH} "You can choose which Wise Guys songs should be installed."
-LangString DESC_Section3 ${LANG_ENGLISH} "You can choose which optional themes should be installed."
LangString DESC_g2Section2 ${LANG_ENGLISH} "This will install the song 'Dead Smiling Pirates - I 18' (CC by-nc-nd 2.5)."
LangString DESC_g2Section3 ${LANG_ENGLISH} "This will install the song 'Joshua Morin - On The Run' (CC by-sa 2.5)."
@@ -118,11 +117,7 @@ LangString DESC_s2_sub2_Section9 ${LANG_ENGLISH} "This will install the song 'St LangString DESC_s2_sub3_Section1 ${LANG_ENGLISH} "This will install the song 'Lebendig und kräftig und schärfer'."
LangString DESC_s2_sub3_Section2 ${LANG_ENGLISH} "This will install the song 'Mensch, wo bist du?'."
+LangString DESC_s2_sub3_Section3 ${LANG_ENGLISH} "This will install the song 'Mensch, wo bist du? (Karaoke)'."
-LangString DESC_g3Section1 ${LANG_ENGLISH} "This will install the optional theme 'Orange' by Skar"
-LangString DESC_g3Section2 ${LANG_ENGLISH} "This will install the optional theme 'Streetlight' by Skar"
-LangString DESC_g3Section3 ${LANG_ENGLISH} "This will install the optional theme 'Vistar' by Skar"
-LangString DESC_g3Section4 ${LANG_ENGLISH} "This will install the optional theme 'BlueSensation v5.1' by Charis"
-LangString DESC_g3Section6 ${LANG_ENGLISH} "This will install the optional theme 'WiiStar' by MasterPhW"
-LangString DESC_g3Section7 ${LANG_ENGLISH} "This will install the optional theme 'iStar' by MezzoX"
-LangString DESC_g3Section5 ${LANG_ENGLISH} "This will install the optional theme 'WhiteSensation' by Charis"
\ No newline at end of file +; Optional Themes
+; (not available)
\ No newline at end of file diff --git a/installer/languages/German.nsh b/installer/languages/German.nsh index 7f438e9d..d6a72a9a 100644 --- a/installer/languages/German.nsh +++ b/installer/languages/German.nsh @@ -15,7 +15,7 @@ LangString button_next ${LANG_GERMAN} "Weiter >" LangString button_close ${LANG_GERMAN} "Beenden"
LangString update_information ${LANG_GERMAN} "Du kannst nach einer aktuelleren Version von 'UltraStar Deluxe' suchen. Dazu wird eine Verbindung mit dem Internet hergestellt. Wurde eine aktuellere Version gefunden, kann diese anschließend installiert werden."
-LangString delete_all ${LANG_GERMAN} "Lieder, Highscores und Cover auch löschen?"
+LangString delete_all ${LANG_GERMAN} "Lieder, Einstellungen, Highscores und Cover auch löschen?"
LangString update_check_older ${LANG_GERMAN} "Deine aktuelle Version $R0 ist veraltet. Die neue Version $1 von UltraStar Deluxe ist verfügbar. Möchtest du sie runterladen?"
LangString update_check_equal ${LANG_GERMAN} "Deine aktuelle Version $R0 ist auf dem neusten Stand.$\n$\rKein Update benötigt."
@@ -49,11 +49,12 @@ LangString page_finish_desktop ${LANG_GERMAN} "Verknüpfung auf dem Desktop erste ; Start Menu and Shortcuts
-LangString sm_website ${LANG_GERMAN} "Internetseite"
+LangString sm_website ${LANG_GERMAN} "Webseite"
LangString sm_uninstall ${LANG_GERMAN} "Deinstallieren"
LangString sm_shortcut ${LANG_GERMAN} "UltraStar Deluxe spielen"
LangString sm_license ${LANG_GERMAN} "Lizenz"
LangString sm_readme ${LANG_GERMAN} "Lies mich"
+LangString sm_songs ${LANG_GERMAN} "Songs"
LangString sm_documentation ${LANG_GERMAN} "Dokumentation"
LangString sc_play ${LANG_GERMAN} "Spielen"
@@ -66,14 +67,12 @@ LangString name_section2 ${LANG_GERMAN} "Songs" LangString name_s2_sub1 ${LANG_GERMAN} "Jonathan Coulton"
LangString name_s2_sub2 ${LANG_GERMAN} "Shearer"
LangString name_s2_sub3 ${LANG_GERMAN} "Wise Guys"
-LangString name_section3 ${LANG_GERMAN} "Designs"
LangString DESC_Section1 ${LANG_GERMAN} "Dies sind die von UltraStar Deluxe benötigten Grunddateien"
LangString DESC_Section2 ${LANG_GERMAN} "Hier können Songs zum Installieren gewählt werden."
LangString DESC_Section2_sub1 ${LANG_GERMAN} "Hier können Jonathan Coulton Songs (CC by-nc 3.0) zum Installieren gewählt werden."
LangString DESC_Section2_sub2 ${LANG_GERMAN} "Hier können Shearer Songs (CC by-nc-sa 2.0 / 3.0) zum Installieren gewählt werden."
LangString DESC_Section2_sub3 ${LANG_GERMAN} "Hier können Wise Guys Songs zum Installieren gewählt werden."
-LangString DESC_Section3 ${LANG_GERMAN} "Hier können alternative Motive zum Installieren gewählt werden."
LangString DESC_g2Section2 ${LANG_GERMAN} "Installiert das Lied 'Dead Smiling Pirates - I 18' (CC by-nc-nd 2.5)."
LangString DESC_g2Section3 ${LANG_GERMAN} "Installiert das Lied 'Joshua Morin - On The Run' (CC by-sa 2.5)."
@@ -118,11 +117,4 @@ LangString DESC_s2_sub2_Section9 ${LANG_GERMAN} "Installiert das Lied 'Stay with LangString DESC_s2_sub3_Section1 ${LANG_GERMAN} "Installiert das Lied 'Lebendig und kräftig und schärfer'."
LangString DESC_s2_sub3_Section2 ${LANG_GERMAN} "Installiert das Lied 'Mensch, wo bist du?'."
-
-LangString DESC_g3Section1 ${LANG_GERMAN} "Installiert das Motiv 'Orange' von Skar"
-LangString DESC_g3Section2 ${LANG_GERMAN} "Installiert das Motiv 'Streetlight' von Skar"
-LangString DESC_g3Section3 ${LANG_GERMAN} "Installiert das Motiv 'Vistar' von Skar"
-LangString DESC_g3Section4 ${LANG_GERMAN} "Installiert das Motiv 'BlueSensation v5.1' von Charis"
-LangString DESC_g3Section6 ${LANG_GERMAN} "Installiert das Motiv 'WiiStar' von MasterPhW"
-LangString DESC_g3Section7 ${LANG_GERMAN} "Installiert das Motiv 'iStar' von MezzoX"
-LangString DESC_g3Section5 ${LANG_GERMAN} "Installiert das Motiv 'WhiteSensation' von Charis"
\ No newline at end of file +LangString DESC_s2_sub3_Section3 ${LANG_GERMAN} "Installiert das Lied 'Mensch, wo bist du? (Karaoke)'."
\ No newline at end of file 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 diff --git a/installer/uninstall.ico b/installer/uninstall.ico Binary files differnew file mode 100644 index 00000000..1c72432a --- /dev/null +++ b/installer/uninstall.ico |
