adjusted installer files (just playing around :>)

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/1.0.1 Challenge MOD@2682 b956fd51-792f-4845-bead-9b4dfca2ff2c

1 files changed, 43 insertions, 47 deletions

diff --git a/Installer/UltraStarDeluxe.nsi b/Installer/UltraStar Deluxe CMD Edition.nsi
index cb1b7745..c1151ad3 100644
--- a/Installer/UltraStarDeluxe.nsi
+++ b/Installer/UltraStar Deluxe CMD Edition.nsi
@@ -1,5 +1,5 @@
 ; --------------------------------------------------------------

-; UltraStar Deluxe - Installation Wizard with NSIS (USDXIWWNSIS)

+; UltraStar Deluxe Challege, Medley & Duet Edition - Installation Wizard with NSIS

 ; --------------------------------------------------------------

 

 !include "MUI.nsh"        ; Include the macros for the Modern User Interface

@@ -35,7 +35,7 @@ SetDatablockOptimize On
 !define MUI_WELCOMEPAGE_TEXT "$(wp_text)"

 ;!define MUI_FINISHPAGE_SHOWREADME_TEXT "$(fp_showreadme)"

 !define MUI_FINISHPAGE_LINK "$(fp_link)"

-!define MUI_UNCONFIRMPAGE_TEXT_TOP "UltraStar Deluxe - $(sm_uninstall)"

+!define MUI_UNCONFIRMPAGE_TEXT_TOP "UltraStar Deluxe CMD Edition - $(sm_uninstall)"

 

 !define MUI_LICENSEPAGE_RADIOBUTTONS

 !define MUI_WELCOMEPAGE_TITLE_3LINES

@@ -62,10 +62,10 @@ SetDatablockOptimize On
 ; Begin of the installation wizard

 ; --------------------------------------------------

 

-Name "${p_name} V.${version}"

+Name "${p_name} ${version}"

 Brandingtext "${p_name} Installation"

-OutFile "ultrastardx-${version}-installer-lite.exe"

-!define ins_name "Install ${p_name} V.${version}.exe"

+OutFile "USdx CMD Edition-${version}-Installer.exe"

+!define ins_name "Install ${p_name} ${version}.exe"

 

 InstallDir "$PROGRAMFILES\${p_name}"

 

@@ -100,7 +100,7 @@ ShowUnInstDetails show
 ;!define MUI_INSTFILESPAGE_COLORS "${dets_bgcolor}"         ; Background Color of Details Screen while files are being extracted

 

 

-!define MUI_LANGDLL_WINDOWTITLE "USdx In-/Uninstaller: Choose language"

+!define MUI_LANGDLL_WINDOWTITLE "USdx CMD Edition In-/Uninstaller: Choose language"

 !define MUI_LANGDLL_ALWAYSSHOW

 

 !define MUI_FINISHPAGE_NOAUTOCLOSE                         ; Allows user to check the log file of installation (Comment out if unwanted)

@@ -122,7 +122,7 @@ ShowUnInstDetails show
 

 !insertmacro MUI_PAGE_WELCOME

 !insertmacro MUI_PAGE_LICENSE "${file_license}"

-!insertmacro MUI_PAGE_COMPONENTS

+;!insertmacro MUI_PAGE_COMPONENTS

 !insertmacro MUI_PAGE_DIRECTORY

 

 

@@ -130,7 +130,7 @@ ShowUnInstDetails show
 

 var ICONS_GROUP

 !define MUI_STARTMENUPAGE_NODISABLE

-!define MUI_STARTMENUPAGE_DEFAULTFOLDER "UltraStar Deluxe"

+!define MUI_STARTMENUPAGE_DEFAULTFOLDER "UltraStar Deluxe CMD Edition"

 !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}"

@@ -269,18 +269,14 @@ ${If} ${AtLeastWinVista}
 ${GameExplorer_GenerateGUID}

 Pop $0

 

-${GameExplorer_AddGame} all "${gdf_path}" $WINDIR $INSTDIR\${exe}.exe $0

+${GameExplorer_AddGame} all "${gdf_path}" $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" \

+CreateShortcut "$APPDATA\Microsoft\Windows\GameExplorer\$0\PlayTasks\2\Fullscreen.lnk" \

   "$INSTDIR\${exe}.exe" "-FullScreen"

 

 CreateDirectory $APPDATA\Microsoft\Windows\GameExplorer\$0\PlayTasks\3

@@ -370,24 +366,24 @@ SectionEnd
 ; Section3: Optional Themes

 ; ---------------------------------------------------------

 

-LangString DESC_Section3 ${LANG_ENGLISH} "${eng_sec3_desc}"

-LangString DESC_Section3 ${LANG_GERMAN} "${ger_sec3_desc}"

+;LangString DESC_Section3 ${LANG_ENGLISH} "${eng_sec3_desc}"

+;LangString DESC_Section3 ${LANG_GERMAN} "${ger_sec3_desc}"

 

-LangString DESC_g1Sec1 ${LANG_ENGLISH} "${eng_g1Sec1_desc}"

-LangString DESC_g1Sec1 ${LANG_GERMAN} "${ger_g1Sec1_desc}"

+;LangString DESC_g1Sec1 ${LANG_ENGLISH} "${eng_g1Sec1_desc}"

+;LangString DESC_g1Sec1 ${LANG_GERMAN} "${ger_g1Sec1_desc}"

 

-LangString DESC_g1Sec2 ${LANG_ENGLISH} "${eng_g1Sec2_desc}"

-LangString DESC_g1Sec2 ${LANG_GERMAN} "${ger_g1Sec2_desc}"

+;LangString DESC_g1Sec2 ${LANG_ENGLISH} "${eng_g1Sec2_desc}"

+;LangString DESC_g1Sec2 ${LANG_GERMAN} "${ger_g1Sec2_desc}"

 

-LangString DESC_g1Sec3 ${LANG_ENGLISH} "${eng_g1Sec3_desc}"

-LangString DESC_g1Sec3 ${LANG_GERMAN} "${ger_g1Sec3_desc}"

+;LangString DESC_g1Sec3 ${LANG_ENGLISH} "${eng_g1Sec3_desc}"

+;LangString DESC_g1Sec3 ${LANG_GERMAN} "${ger_g1Sec3_desc}"

 

-LangString sec_group ${LANG_ENGLISH} "${eng_sec3}"

-LangString sec_group ${LANG_GERMAN} "${ger_sec3}"

+;LangString sec_group ${LANG_ENGLISH} "${eng_sec3}"

+;LangString sec_group ${LANG_GERMAN} "${ger_sec3}"

 

-SectionGroup $(sec_group) Section3

+;SectionGroup $(sec_group) Section3

 

- Section "Orange" g1Sec1

+; Section "Orange" g1Sec1

 

 ; Download theme orange:

 ; NSISdl::download /TIMEOUT=30000 ${dl_orange} $TEMP\Theme-Orange.zip

@@ -400,15 +396,15 @@ SectionGroup $(sec_group) Section3
 

 ; Delete "$TEMP\Theme-Orange.zip"

 

-  SetOutPath "$INSTDIR"

+;  SetOutPath "$INSTDIR"

 

-!include ".\settings\optional\in_orange.nsh"

+;!include ".\settings\optional\in_orange.nsh"

 

-  SetOutPath "$INSTDIR"

+;  SetOutPath "$INSTDIR"

 

-SectionEnd

+;SectionEnd

 

- Section "Streetlight" g1Sec2

+; Section "Streetlight" g1Sec2

 

 ; Download theme Streetlight:

 ; NSISdl::download /TIMEOUT=30000 ${dl_streetlight} $TEMP\Theme-Streetlight.zip

@@ -421,15 +417,15 @@ SectionEnd
 

 ; Delete "$TEMP\Theme-Streetlight.zip"

 

-  SetOutPath "$INSTDIR"

+;  SetOutPath "$INSTDIR"

 

-!include ".\settings\optional\in_streetlight.nsh"

+;!include ".\settings\optional\in_streetlight.nsh"

 

-  SetOutPath "$INSTDIR"

+;  SetOutPath "$INSTDIR"

 

-SectionEnd

+;SectionEnd

 

- Section "Vistar" g1Sec3

+; Section "Vistar" g1Sec3

 

 ; Download theme Vistar:

 

@@ -443,16 +439,16 @@ SectionEnd
 

 ; Delete "$TEMP\Theme-Vistar.zip"

 

-  SetOutPath "$INSTDIR"

+;  SetOutPath "$INSTDIR"

 

-!include ".\settings\optional\in_vistar.nsh"

+;!include ".\settings\optional\in_vistar.nsh"

 

-  SetOutPath "$INSTDIR"

+;  SetOutPath "$INSTDIR"

 

-SectionEnd

+;SectionEnd

 

 

-SectionGroupEnd

+;SectionGroupEnd

 

 ; ---------------------------------------------------------

 ; Section4: Uninstallation Wizard

@@ -461,7 +457,7 @@ SectionGroupEnd
 Section Uninstall

  !insertmacro MUI_STARTMENU_GETFOLDER "Application" $ICONS_GROUP

 

- !include ".\settings\optional\opt_uninstall.nsh"

+; !include ".\settings\optional\opt_uninstall.nsh"

  !include ".\settings\files_un.nsh"

 

  DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"

@@ -482,9 +478,9 @@ SectionEnd
 ;  !insertmacro MUI_DESCRIPTION_TEXT ${Section2} $(DESC_Section2)

 ;  !insertmacro MUI_DESCRIPTION_TEXT ${Section3} $(DESC_Section3)

 

-  !insertmacro MUI_DESCRIPTION_TEXT ${g1Sec1} $(DESC_g1Sec1)

-  !insertmacro MUI_DESCRIPTION_TEXT ${g1Sec2} $(DESC_g1Sec2)

-  !insertmacro MUI_DESCRIPTION_TEXT ${g1Sec3} $(DESC_g1Sec3)

+;  !insertmacro MUI_DESCRIPTION_TEXT ${g1Sec1} $(DESC_g1Sec1)

+;  !insertmacro MUI_DESCRIPTION_TEXT ${g1Sec2} $(DESC_g1Sec2)

+;  !insertmacro MUI_DESCRIPTION_TEXT ${g1Sec3} $(DESC_g1Sec3)

 

 ;  !insertmacro MUI_DESCRIPTION_TEXT ${g2Section1} $(DESC_g2Section1)

 ;  !insertmacro MUI_DESCRIPTION_TEXT ${g2Section2} $(DESC_g2Section2)

@@ -539,12 +535,12 @@ FunctionEnd
 

 Function un.onInit

 

-        ${nsProcess::FindProcess} "USdx.exe" $R0

+        ${nsProcess::FindProcess} "UltraStar CMDe.exe" $R0

         StrCmp $R0 0 0 +2

         MessageBox MB_YESNO|MB_ICONEXCLAMATION 'UltraStar Deluxe cannot be uninstalled while its running! Do you want to close it?' IDYES closeit IDNO end

 

         closeit:

-        ${nsProcess::KillProcess} "USdx.exe" $R0

+        ${nsProcess::KillProcess} "UltraStar CMDe.exe" $R0

         goto continue

 

         end: