From 12ede9479907c63826fc3b1a2a008be6ca801425 Mon Sep 17 00:00:00 2001 From: whiteshark0 Date: Fri, 23 Nov 2007 20:06:55 +0000 Subject: Edited Installer Changed SMpeg with FFMpeg Libs Added Documentation Shortcut git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/1.0.1@645 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Installer/UltraStarDeluxe.nsi | 95 +++++++++++++++--------------- Installer/settings/files_in.nsh | 9 ++- Installer/settings/langstrings.nsh | 21 ++++--- InstallerDependencies/dll/avcodec-51.dll | Bin 0 -> 3345408 bytes InstallerDependencies/dll/avformat-50.dll | Bin 0 -> 448512 bytes InstallerDependencies/dll/avutil-49.dll | Bin 0 -> 19968 bytes InstallerDependencies/dll/smpeg.dll | Bin 209920 -> 0 bytes 7 files changed, 66 insertions(+), 59 deletions(-) create mode 100644 InstallerDependencies/dll/avcodec-51.dll create mode 100644 InstallerDependencies/dll/avformat-50.dll create mode 100644 InstallerDependencies/dll/avutil-49.dll delete mode 100644 InstallerDependencies/dll/smpeg.dll diff --git a/Installer/UltraStarDeluxe.nsi b/Installer/UltraStarDeluxe.nsi index 296977f4..31cd8de6 100644 --- a/Installer/UltraStarDeluxe.nsi +++ b/Installer/UltraStarDeluxe.nsi @@ -1,15 +1,15 @@ ; -------------------------------------------------------------- -; UltraStar Deluxe - Installation Wizard with NSIS (USDXIWWNSIS) +; UltraStar Deluxe - Installation Wizard with NSIS (USDXIWWNSIS) ; -------------------------------------------------------------- -!include "MUI.nsh" ; Include the macros for the Modern User Interface +!include "MUI.nsh" ; Include the macros for the Modern User Interface !include "LogicLib.nsh" !include ".\settings\GameExplorer.nsh" !include ".\settings\functions.nsh" !include "WinVer.nsh" -!define icon_inst ".\icons\ustar.ico" ; Icon for Installation -!define icon_uninst ".\icons\uninstall.ico" ; Icon for Uninstallation +!define icon_inst ".\icons\ustar.ico" ; Icon for Installation +!define icon_uninst ".\icons\uninstall.ico" ; Icon for Uninstallation SetCompress Auto SetCompressor /SOLID lzma @@ -32,7 +32,7 @@ SetDatablockOptimize On !define MUI_WELCOMEPAGE_TITLE "$(wp_title)" -!define MUI_WELCOMEPAGE_TEXT "$(wp_text)" +!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)" @@ -43,8 +43,8 @@ SetDatablockOptimize On !define MUI_FINISHPAGE_TITLE_3LINES !define MUI_FINISHPAGE_RUN "$INSTDIR\${exe}.exe" -!define MUI_FINISHPAGE_RUN_NOTCHECKED - +!define MUI_FINISHPAGE_RUN_NOTCHECKED + ;!define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\ReadMe.txt" !define MUI_FINISHPAGE_LINK_LOCATION "${homepage}" @@ -82,33 +82,33 @@ ShowUnInstDetails show ; Modern User Interface (MUI) Stuff -!define MUI_ICON "${icon_inst}" ; Icon for Installation -!define MUI_UNICON "${icon_uninst}" ; Icon for Uninstallation +!define MUI_ICON "${icon_inst}" ; Icon for Installation +!define MUI_UNICON "${icon_uninst}" ; Icon for Uninstallation !define MUI_HEADERIMAGE -!define MUI_HEADERIMAGE_BITMAP "${bmp_header}" ; Header Bitmap of the installation (Size: 150x57 px) -!define MUI_HEADERIMAGE_UNBITMAP "${bmp_header}" ; Header Bitmap of the uninstallation (Size: 150x57 px) -!define MUI_WELCOMEFINISHPAGE_BITMAP "${bmp_side}" ; Left Side Bitmap of Welcome & Finish Page while Installation (Size: 164x314 px) -!define MUI_UNWELCOMEFINISHPAGE_BITMAP "${bmp_side}" ; Left Side Bitmap of Welcome & Finish Page while Uninstallation (Size: 164x314 px) -!define MUI_BGCOLOR "FFFFFF" ; RGB Background color (for header, welcome & finish page) -!define MUI_WELCOMEFINISHPAGE_INI "${mui_ini}" ; Installation Options for Welcome & Finish Page (Installation) -!define MUI_UNWELCOMEFINISHPAGE_INI "${mui_ini}" ; Installation Options for Welcome & Finish Page (Uninstallation) -!define MUI_LICENSEPAGE_BGCOLOR "${license_bgcolor}" ; Background Color of Licence agreement -!define MUI_COMPONENTSPAGE_CHECKBITMAP "${bmp_check}" ; Bitmap of Checks at Components Selection Page +!define MUI_HEADERIMAGE_BITMAP "${bmp_header}" ; Header Bitmap of the installation (Size: 150x57 px) +!define MUI_HEADERIMAGE_UNBITMAP "${bmp_header}" ; Header Bitmap of the uninstallation (Size: 150x57 px) +!define MUI_WELCOMEFINISHPAGE_BITMAP "${bmp_side}" ; Left Side Bitmap of Welcome & Finish Page while Installation (Size: 164x314 px) +!define MUI_UNWELCOMEFINISHPAGE_BITMAP "${bmp_side}" ; Left Side Bitmap of Welcome & Finish Page while Uninstallation (Size: 164x314 px) +!define MUI_BGCOLOR "FFFFFF" ; RGB Background color (for header, welcome & finish page) +!define MUI_WELCOMEFINISHPAGE_INI "${mui_ini}" ; Installation Options for Welcome & Finish Page (Installation) +!define MUI_UNWELCOMEFINISHPAGE_INI "${mui_ini}" ; Installation Options for Welcome & Finish Page (Uninstallation) +!define MUI_LICENSEPAGE_BGCOLOR "${license_bgcolor}" ; Background Color of Licence agreement +!define MUI_COMPONENTSPAGE_CHECKBITMAP "${bmp_check}" ; Bitmap of Checks at Components Selection Page !define MUI_DIRECTORYPAGE_BGCOLOR "${directory_bgcolor}" ; RGB Background Color for Directory textbox -!define MUI_STARTMENUPAGE_BGCOLOR "${smp_bgcolor}" ; RGB Background of Startmenu List and Textbox -;!define MUI_INSTFILESPAGE_COLORS "${dets_bgcolor}" ; Background Color of Details Screen while files are being extracted +!define MUI_STARTMENUPAGE_BGCOLOR "${smp_bgcolor}" ; RGB Background of Startmenu List and Textbox +;!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_ALWAYSSHOW -!define MUI_FINISHPAGE_NOAUTOCLOSE ; Allows user to check the log file of installation (Comment out if unwanted) -!define MUI_UNFINISHPAGE_NOAUTOCLOSE ; Allows user to check the log file of uninstallation (Comment out if unwanted) +!define MUI_FINISHPAGE_NOAUTOCLOSE ; Allows user to check the log file of installation (Comment out if unwanted) +!define MUI_UNFINISHPAGE_NOAUTOCLOSE ; Allows user to check the log file of uninstallation (Comment out if unwanted) !define MUI_ABORTWARNING -!define MUI_ABORTWARNING_TEXT $(str_abort) ; Abort Warning message -!define MUI_ABORTWARNING_CANCEL_DEFAULT ; Default: Cancel abort (Comment out if unwanted) +!define MUI_ABORTWARNING_TEXT $(str_abort) ; Abort Warning message +!define MUI_ABORTWARNING_CANCEL_DEFAULT ; Default: Cancel abort (Comment out if unwanted) !define MUI_FINISHPAGE_SHOWREADME !define MUI_FINISHPAGE_SHOWREADME_TEXT $(sc_desktop) @@ -144,7 +144,7 @@ Page custom Settings Function Settings !insertmacro MUI_HEADER_TEXT "$(Settings_TITLE)" "$(Settings_SUBTITLE)" - + !insertmacro MUI_INSTALLOPTIONS_DISPLAY "Settings-$LANGUAGE" ; Get all the variables: @@ -230,14 +230,14 @@ FunctionEnd ;Custom page end ; Section1: Main components of UltraStar Deluxe ; --------------------------------------------------------- -LangString DESC_Section1 ${LANG_ENGLISH} "${eng_sec1_desc}" ; Adds the description to section1 +LangString DESC_Section1 ${LANG_ENGLISH} "${eng_sec1_desc}" ; Adds the description to section1 LangString DESC_Section1 ${LANG_GERMAN} "${ger_sec1_desc}" -LangString sec1 ${LANG_ENGLISH} "${eng_sec1}" ; Name of section1 +LangString sec1 ${LANG_ENGLISH} "${eng_sec1}" ; Name of section1 LangString sec1 ${LANG_GERMAN} "${ger_sec1}" Section $(sec1) Section1 - SectionIn RO ; readonly + SectionIn RO ; readonly SetOutPath $INSTDIR SetOverwrite try @@ -254,14 +254,15 @@ Section $(sec1) Section1 CreateDirectory "${p_name}" CreateDirectory "$SMPROGRAMS\$ICONS_GROUP" - CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\$(sm_website).lnk" "http://www.ultrastardeluxe.org/" - CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\$(sm_uninstall).lnk" "$INSTDIR\Uninstall.exe" 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_uninstall).lnk" "$INSTDIR\Uninstall.exe" !insertmacro MUI_STARTMENU_WRITE_END -; WINDOWS VISTA GAME EXPLORER +; WINDOWS VISTA GAME EXPLORER ${If} ${AtLeastWinVista} @@ -494,27 +495,27 @@ SectionEnd Function .onInit System::Call 'kernel32::CreateMutexA(i 0, i 0, t "USdx Installer.exe") ?e' - + Pop $R0 - + StrCmp $R0 0 +3 MessageBox MB_OK "The installer is already running." Abort - + !insertmacro MUI_LANGDLL_DISPLAY ReadRegStr $R0 HKLM \ "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" \ "UninstallString" StrCmp $R0 "" done - + MessageBox MB_YESNO|MB_ICONEXCLAMATION \ "${PRODUCT_NAME} is already installed. $\n$\nAre you sure you want to \ install it again?" \ IDYES done Abort - + done: !insertmacro MUI_INSTALLOPTIONS_EXTRACT_AS ".\settings\settings-1031.ini" "Settings-1031" @@ -526,19 +527,19 @@ FunctionEnd Function un.onInit - ${nsProcess::FindProcess} "USdx.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 + ${nsProcess::FindProcess} "USdx.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 - goto continue + closeit: + ${nsProcess::KillProcess} "USdx.exe" $R0 + goto continue - end: - ${nsProcess::Unload} - Abort + end: + ${nsProcess::Unload} + Abort - continue: - !insertmacro MUI_LANGDLL_DISPLAY + continue: + !insertmacro MUI_LANGDLL_DISPLAY FunctionEnd \ No newline at end of file diff --git a/Installer/settings/files_in.nsh b/Installer/settings/files_in.nsh index de9acb75..e391d240 100644 --- a/Installer/settings/files_in.nsh +++ b/Installer/settings/files_in.nsh @@ -1,7 +1,7 @@ ; This list contains the files that will be installed ; Create required directories: - + CreateDirectory "$INSTDIR\Covers" CreateDirectory "$INSTDIR\Languages" CreateDirectory "$INSTDIR\Plugins" @@ -17,7 +17,9 @@ SetOutPath "$INSTDIR" File "..\InstallerDependencies\dll\bass.dll" File "..\InstallerDependencies\dll\SDL.dll" - File "..\InstallerDependencies\dll\smpeg.dll" + File "..\InstallerDependencies\dll\avutil-49.dll" + File "..\InstallerDependencies\dll\avcodec-51.dll" + File "..\InstallerDependencies\dll\avformat-50.dll" File "..\InstallerDependencies\dll\sqlite3.dll" File "..\InstallerDependencies\documents\Changelog.german.txt" @@ -61,6 +63,7 @@ ${EndIf} File "..\Plugins\Duell.dll" File "..\Plugins\Hold_The_Line.dll" File "..\Plugins\Until5000.dll" + File "..\Plugins\TeamDuell.dll" SetOutPath "$INSTDIR\Skins\Classic\" File "..\Skins\Classic\[button]13.jpg" @@ -255,7 +258,7 @@ ${EndIf} File "..\Sounds\select music change music 50.mp3" File "..\Sounds\select music change music.mp3" File "..\Sounds\wome-credits-tune.mp3" - + SetOutPath "$INSTDIR\Themes\" File "..\Themes\Classic.ini" File "..\Themes\Deluxe.ini" diff --git a/Installer/settings/langstrings.nsh b/Installer/settings/langstrings.nsh index b44ee7c5..dec444d8 100644 --- a/Installer/settings/langstrings.nsh +++ b/Installer/settings/langstrings.nsh @@ -30,19 +30,22 @@ LangString sm_shortcut ${LANG_ENGLISH} "Play UltraStar Deluxe" LangString sc_desktop ${LANG_GERMAN} "Verknüpfung auf dem Desktop erstellen?" ; Finish Page: Readme = Create Desktop Shortcut LangString sc_desktop ${LANG_ENGLISH} "Create Desktop Shortcut?" -LangString sc_play ${LANG_GERMAN} "Spielen" ; Shortcut name play or spielen (used for MCE) +LangString sc_play ${LANG_GERMAN} "Spielen" ; Shortcut name play or spielen (used for MCE) LangString sc_play ${LANG_ENGLISH} "Play" -LangString sm_uninstall ${LANG_GERMAN} "Deinstallieren" ; Name for uninstall icon in startmenu +LangString sm_uninstall ${LANG_GERMAN} "Deinstallieren" ; Name for uninstall icon in startmenu LangString sm_uninstall ${LANG_ENGLISH} "Uninstall" -LangString sm_website ${LANG_GERMAN} "Internetseite" ; Name for website icon in startmenu +LangString sm_website ${LANG_GERMAN} "Webseite" ; Name for website icon in startmenu LangString sm_website ${LANG_ENGLISH} "Website" -LangString sm_license ${LANG_GERMAN} "Lizenz" ; Name for license.txt icon in startmenu +LangString sm_documentation ${LANG_GERMAN} "Dokumentation" ; Name for documentation icon in startmenu +LangString sm_documentation ${LANG_ENGLISH} "Documentation" + +LangString sm_license ${LANG_GERMAN} "Lizenz" ; Name for license.txt icon in startmenu LangString sm_license ${LANG_ENGLISH} "License" -LangString sm_readme ${LANG_GERMAN} "Lies mich" ; Name for readme.txt icon in startmenu +LangString sm_readme ${LANG_GERMAN} "Lies mich" ; Name for readme.txt icon in startmenu LangString sm_readme ${LANG_ENGLISH} "Readme" LangString Settings_TITLE ${LANG_ENGLISH} " " @@ -50,20 +53,20 @@ LangString Settings_TITLE ${LANG_GERMAN} " " LangString Settings_SUBTITLE ${LANG_ENGLISH} "Specify your favorite settings for UltraStar Deluxe" LangString Settings_SUBTITLE ${LANG_GERMAN} "Lege deine favorisierten Einstellungen für UltraStar Deluxe fest." -LangString wp_title ${LANG_GERMAN} "Willkommen zur Installationsroutine von UltraStar Deluxe" ; Title String in Welcome Page +LangString wp_title ${LANG_GERMAN} "Willkommen zur Installationsroutine von UltraStar Deluxe" ; Title String in Welcome Page LangString wp_title ${LANG_ENGLISH} "Welcome to the UltraStar Deluxe Setup Wizard" LangString wp_text ${LANG_GERMAN} "Dieser Assistent wird Sie durch die Installation von UltraStar Deluxe begleiten. UltraStar Deluxe ist ein kostenloses quelloffenes Karaokespiel, welches Singstar ähnelt. Diese Installationsroutine enthält den Bonus Song 'Dead Smiling Pirates - I 18' aus der CreativeCommons Datenbank, der optional heruntergeladen werden kann (benötigt aktive Internetverbindung).\n\r\n\rDas UltraStar Deluxe Team wünscht viel Spaß.\n\rProjekthomepage: http://www.ultrastardeluxe.org\n\rSupport Forum: http://forum.ultrastardeluxe.org" LangString wp_text ${LANG_ENGLISH} "This wizard will guide you through the Installation of UltraStar Deluxe. UltraStar Deluxe is a free open source Karaoke game, which can be compared with Singstar. These Installation Wizard includes the bonus track 'Dead Smiling Pirates - I 18' from the CreativeCommons database and which can be downloaded seperatly (requires active internet connection).\n\r\n\rThe UltraStar Deluxe Team wishes you fun.\n\rProject website: http://www.ultrastardeluxe.org\n\rSupport Forum: http://forum.ultrastardeluxe.org" -LangString fp_showreadme ${LANG_GERMAN} "Dokumentation ansehen (PDF)" ; "Show Readme" String in Finish Page +LangString fp_showreadme ${LANG_GERMAN} "Dokumentation ansehen (PDF)" ; "Show Readme" String in Finish Page LangString fp_showreadme ${LANG_ENGLISH} "See documentation (PDF)" LangString fp_text ${LANG_GERMAN} "UltraStar wurde erfolgreich auf Ihrem System installiert.\n\rBesuchen Sie unsere Projektwebseite um die neusten Updates und News zu erhalten." LangString fp_text ${LANG_ENGLISH} "UltraStar was installed successfully on you system.\n\rVisit out project website to get latest news and updates." -LangString fp_link ${LANG_GERMAN} "Projektwebseite" ; Link to developers website - String in Finish Page +LangString fp_link ${LANG_GERMAN} "Projektwebseite" ; Link to developers website - String in Finish Page LangString fp_link ${LANG_ENGLISH} "Project website" -LangString uncp_text ${LANG_GERMAN} "Willkommen beim Deinstallations-Assistent für UltraStar Deluxe" +LangString uncp_text ${LANG_GERMAN} "Willkommen beim Deinstallations-Assistent für UltraStar Deluxe" LangString uncp_text ${LANG_ENGLISH} "Welcome to the UltraStar Deluxe Uninstall Wizard" \ No newline at end of file diff --git a/InstallerDependencies/dll/avcodec-51.dll b/InstallerDependencies/dll/avcodec-51.dll new file mode 100644 index 00000000..c55ed9ec Binary files /dev/null and b/InstallerDependencies/dll/avcodec-51.dll differ diff --git a/InstallerDependencies/dll/avformat-50.dll b/InstallerDependencies/dll/avformat-50.dll new file mode 100644 index 00000000..e35173dd Binary files /dev/null and b/InstallerDependencies/dll/avformat-50.dll differ diff --git a/InstallerDependencies/dll/avutil-49.dll b/InstallerDependencies/dll/avutil-49.dll new file mode 100644 index 00000000..ff07b136 Binary files /dev/null and b/InstallerDependencies/dll/avutil-49.dll differ diff --git a/InstallerDependencies/dll/smpeg.dll b/InstallerDependencies/dll/smpeg.dll deleted file mode 100644 index 439cd897..00000000 Binary files a/InstallerDependencies/dll/smpeg.dll and /dev/null differ -- cgit v1.2.3