From a62b466452023d1d82881a124c29797844f553a6 Mon Sep 17 00:00:00 2001 From: canni2007 Date: Fri, 23 Nov 2007 22:43:39 +0000 Subject: Updated installer source: There will be a lite and a full installer. Changed install method. git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/1.0.1@654 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Installer/UltraStarDeluxe.nsi | 146 +++++++++++++++++++++++------------------- 1 file changed, 79 insertions(+), 67 deletions(-) (limited to 'Installer/UltraStarDeluxe.nsi') diff --git a/Installer/UltraStarDeluxe.nsi b/Installer/UltraStarDeluxe.nsi index 31cd8de6..52091548 100644 --- a/Installer/UltraStarDeluxe.nsi +++ b/Installer/UltraStarDeluxe.nsi @@ -64,7 +64,7 @@ SetDatablockOptimize On Name "${p_name} V.${version}" Brandingtext "${p_name} Installation" -OutFile "Install ${p_name} V.${version}.exe" +OutFile "ultrastardx-${version}-installer-lite.exe" !define ins_name "Install ${p_name} V.${version}.exe" InstallDir "$PROGRAMFILES\${p_name}" @@ -255,7 +255,7 @@ Section $(sec1) Section1 CreateDirectory "${p_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_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" @@ -309,62 +309,62 @@ SectionEnd ; Section2: Example Song "Dead Smiling Pirates" ; --------------------------------------------------------- -LangString DESC_g2Section1 ${LANG_ENGLISH} "${eng_g2Section1_desc}" -LangString DESC_g2Section1 ${LANG_GERMAN} "${ger_g2Section1_desc}" +; LangString DESC_g2Section1 ${LANG_ENGLISH} "${eng_g2Section1_desc}" +; LangString DESC_g2Section1 ${LANG_GERMAN} "${ger_g2Section1_desc}" -LangString DESC_g2Section2 ${LANG_ENGLISH} "${eng_g2Section2_desc}" -LangString DESC_g2Section2 ${LANG_GERMAN} "${ger_g2Section2_desc}" +; LangString DESC_g2Section2 ${LANG_ENGLISH} "${eng_g2Section2_desc}" +; LangString DESC_g2Section2 ${LANG_GERMAN} "${ger_g2Section2_desc}" -LangString sec2 ${LANG_ENGLISH} "${eng_sec2}" -LangString sec2 ${LANG_GERMAN} "${ger_sec2}" +; LangString sec2 ${LANG_ENGLISH} "${eng_sec2}" +; LangString sec2 ${LANG_GERMAN} "${ger_sec2}" -SectionGroup $(sec2) Section2 +; SectionGroup $(sec2) Section2 -Section /o "Dead Smiling Pirates - I 18" g2Section1 - AddSize 2816 - SetOverwrite try - SetOutPath "$INSTDIR" - CreateDirectory "$INSTDIR\Songs\Dead Smiling Pirates - I 18 [DEMO]" - SetOutPath "$INSTDIR\Songs\Dead Smiling Pirates - I 18 [DEMO]\" +; Section /o "Dead Smiling Pirates - I 18" g2Section1 +; AddSize 2816 +; SetOverwrite try +; SetOutPath "$INSTDIR" +; CreateDirectory "$INSTDIR\Songs\Dead Smiling Pirates - I 18 [DEMO]" +; SetOutPath "$INSTDIR\Songs\Dead Smiling Pirates - I 18 [DEMO]\" ; Download song: -NSISdl::download /TIMEOUT=30000 ${demosong} $TEMP\Song-I-18.zip +; NSISdl::download /TIMEOUT=30000 ${demosong} $TEMP\Song-I-18.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: +; nsisunz::Unzip "$TEMP\Song-I-18.zip" "$INSTDIR\Songs\Dead Smiling Pirates - I 18 [DEMO]\" -Pop $R0 ;Get the return value - StrCmp $R0 "success" dlok - MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK -dlok: -nsisunz::Unzip "$TEMP\Song-I-18.zip" "$INSTDIR\Songs\Dead Smiling Pirates - I 18 [DEMO]\" +; Delete "$TEMP\Song-I-18.zip" -Delete "$TEMP\Song-I-18.zip" +; SetOutPath "$INSTDIR" - SetOutPath "$INSTDIR" - -SectionEnd +; SectionEnd -Section /o "Steven Dunston - Northern Star" g2Section2 - AddSize 3769 - SetOverwrite try - SetOutPath "$INSTDIR" - CreateDirectory "$INSTDIR\Songs\Steven Dunston - Northern Star [DEMO]" - SetOutPath "$INSTDIR\Songs\Steven Dunston - Northern Star [DEMO]\" +; Section /o "Steven Dunston - Northern Star" g2Section2 +; AddSize 3769 +; SetOverwrite try +; SetOutPath "$INSTDIR" +; CreateDirectory "$INSTDIR\Songs\Steven Dunston - Northern Star [DEMO]" +; SetOutPath "$INSTDIR\Songs\Steven Dunston - Northern Star [DEMO]\" ; Download song: -NSISdl::download /TIMEOUT=30000 ${demosong2} $TEMP\Song-Northern-Star.zip +; NSISdl::download /TIMEOUT=30000 ${demosong2} $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: -nsisunz::Unzip "$TEMP\Song-Northern-Star.zip" "$INSTDIR\Songs\Steven Dunston - Northern Star [DEMO]\" +; Pop $R0 ;Get the return value +; StrCmp $R0 "success" dlok +; MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK +; dlok: +; nsisunz::Unzip "$TEMP\Song-Northern-Star.zip" "$INSTDIR\Songs\Steven Dunston - Northern Star [DEMO]\" -Delete "$TEMP\Song-Northern-Star.zip" +; Delete "$TEMP\Song-Northern-Star.zip" - SetOutPath "$INSTDIR" +; SetOutPath "$INSTDIR" -SectionEnd +; SectionEnd -SectionGroupEnd +; SectionGroupEnd ; --------------------------------------------------------- ; Section3: Optional Themes @@ -387,55 +387,67 @@ LangString sec_group ${LANG_GERMAN} "${ger_sec3}" SectionGroup $(sec_group) Section3 - Section /o "Orange" g1Sec1 + Section "Orange" g1Sec1 ; Download theme orange: -NSISdl::download /TIMEOUT=30000 ${dl_orange} $TEMP\Theme-Orange.zip +; NSISdl::download /TIMEOUT=30000 ${dl_orange} $TEMP\Theme-Orange.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: -nsisunz::Unzip "$TEMP\Theme-Orange.zip" "$INSTDIR\" +; Pop $R0 ;Get the return value +; StrCmp $R0 "success" dlok +; MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK +; dlok: +; nsisunz::Unzip "$TEMP\Theme-Orange.zip" "$INSTDIR\" -Delete "$TEMP\Theme-Orange.zip" +; Delete "$TEMP\Theme-Orange.zip" + + SetOutPath "$INSTDIR" + +!include ".\settings\optional\in_orange.nsh" SetOutPath "$INSTDIR" SectionEnd - Section /o "Streetlight" g1Sec2 + Section "Streetlight" g1Sec2 ; Download theme Streetlight: -NSISdl::download /TIMEOUT=30000 ${dl_streetlight} $TEMP\Theme-Streetlight.zip +; NSISdl::download /TIMEOUT=30000 ${dl_streetlight} $TEMP\Theme-Streetlight.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: -nsisunz::Unzip "$TEMP\Theme-Streetlight.zip" "$INSTDIR\" +; Pop $R0 ;Get the return value +; StrCmp $R0 "success" dlok +; MessageBox MB_OK|MB_ICONEXCLAMATION "Download Error, click OK to Continue" /SD IDOK +; dlok: +; nsisunz::Unzip "$TEMP\Theme-Streetlight.zip" "$INSTDIR\" -Delete "$TEMP\Theme-Streetlight.zip" +; Delete "$TEMP\Theme-Streetlight.zip" + + SetOutPath "$INSTDIR" + +!include ".\settings\optional\in_streetlight.nsh" SetOutPath "$INSTDIR" SectionEnd - Section /o "Vistar" g1Sec3 + Section "Vistar" g1Sec3 ; Download theme Vistar: -NSISdl::download /TIMEOUT=30000 ${dl_vistar} $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: -nsisunz::Unzip "$TEMP\Theme-Vistar.zip" "$INSTDIR\" +; NSISdl::download /TIMEOUT=30000 ${dl_vistar} $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: +; nsisunz::Unzip "$TEMP\Theme-Vistar.zip" "$INSTDIR\" -Delete "$TEMP\Theme-Vistar.zip" +; Delete "$TEMP\Theme-Vistar.zip" SetOutPath "$INSTDIR" +!include ".\settings\optional\in_vistar.nsh" + + SetOutPath "$INSTDIR" SectionEnd @@ -474,8 +486,8 @@ SectionEnd !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) +; !insertmacro MUI_DESCRIPTION_TEXT ${g2Section1} $(DESC_g2Section1) +; !insertmacro MUI_DESCRIPTION_TEXT ${g2Section2} $(DESC_g2Section2) !insertmacro MUI_FUNCTION_DESCRIPTION_END -- cgit v1.2.3