From 7343c4553a32fe4df56b6fcf254f46c53b15b915 Mon Sep 17 00:00:00 2001 From: canni2007 Date: Sat, 3 Nov 2007 13:14:46 +0000 Subject: See: jira:USDX-162 git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/1.01@566 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Installer/Readme.txt | 16 ++++++++-------- Installer/UltraStar Deluxe.nsi | 17 +++++++++++++---- Installer/icons/uninstall.ico | Bin 22486 -> 0 bytes Installer/icons/ustar.ico | Bin 22486 -> 0 bytes Installer/images/Thumbs.db | Bin 12800 -> 0 bytes Installer/images/header.bmp | Bin 25818 -> 0 bytes Installer/images/left.bmp | Bin 618006 -> 0 bytes Installer/images/mce.png | Bin 56081 -> 0 bytes Installer/images/modern.bmp | Bin 1652 -> 0 bytes Installer/plugins/Games.dll | Bin 61440 -> 0 bytes Installer/plugins/NSISdl.dll | Bin 14848 -> 0 bytes Installer/plugins/gdf.dll | Bin 159744 -> 0 bytes Installer/plugins/nsProcess.dll | Bin 4096 -> 0 bytes Installer/plugins/nsisunz.dll | Bin 40960 -> 0 bytes Installer/settings/files_in.nsh | 28 ++++++++++++++++------------ Installer/settings/functions.nsh | 2 ++ Installer/settings/variables.nsh | 9 ++++----- 17 files changed, 43 insertions(+), 29 deletions(-) delete mode 100644 Installer/icons/uninstall.ico delete mode 100644 Installer/icons/ustar.ico delete mode 100644 Installer/images/Thumbs.db delete mode 100644 Installer/images/header.bmp delete mode 100644 Installer/images/left.bmp delete mode 100644 Installer/images/mce.png delete mode 100644 Installer/images/modern.bmp delete mode 100644 Installer/plugins/Games.dll delete mode 100644 Installer/plugins/NSISdl.dll delete mode 100644 Installer/plugins/gdf.dll delete mode 100644 Installer/plugins/nsProcess.dll delete mode 100644 Installer/plugins/nsisunz.dll (limited to 'Installer') diff --git a/Installer/Readme.txt b/Installer/Readme.txt index 7cfbd4de..f3e72b98 100644 --- a/Installer/Readme.txt +++ b/Installer/Readme.txt @@ -1,18 +1,18 @@ -SOURCE (2th of November 2007, 23:35 UTC+1 MESZ) +SOURCE (3th of November 2007, 14:00 UTC+1 MESZ) Build using Nullsoft Install System -(http://nsis.sourceforge.net/Download) +(http://nsis.sourceforge.net/) ---------------------------------------- -Plugins ---------------------------------------- +----------------------------------------------- +Dependencies +----------------------------------------------- The installer needs the plugins -within the plugins dir. +within the ..\InstallerDependencies\plugins dir. -------------------------------------------- +----------------------------------------------- Custom language files (Dir: clanguage): -------------------------------------------- +----------------------------------------------- Place the edited custom languages files in: diff --git a/Installer/UltraStar Deluxe.nsi b/Installer/UltraStar Deluxe.nsi index 59b33eda..b38f7ca3 100644 --- a/Installer/UltraStar Deluxe.nsi +++ b/Installer/UltraStar Deluxe.nsi @@ -8,8 +8,8 @@ !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 "..\InstallerDependencies\icons\ustar.ico" ; Icon for Installation +!define icon_uninst "..\InstallerDependencies\icons\uninstall.ico" ; Icon for Uninstallation SetCompress Auto SetCompressor /SOLID lzma @@ -24,7 +24,7 @@ SetDatablockOptimize On !include ".\settings\variables.nsh" -!addPluginDir ".\plugins\" +!addPluginDir "..\InstallerDependencies\plugins\" ; ------------------------------- ; Strings for Installation Wizard @@ -247,11 +247,12 @@ Section $(sec1) Section1 ; Create shortcuts - SetOutPath $INSTDIR\ + SetOutPath "$INSTDIR" !insertmacro MUI_STARTMENU_WRITE_BEGIN Application SetShellVarContext all + SetOutPath "$INSTDIR" CreateDirectory "${p_name}" CreateDirectory "$SMPROGRAMS\$ICONS_GROUP" @@ -338,6 +339,8 @@ nsisunz::Unzip "$TEMP\Song-I-18.zip" "$INSTDIR\Songs\Dead Smiling Pirates - I 18 Delete "$TEMP\Song-I-18.zip" + SetOutPath "$INSTDIR" + SectionEnd Section /o "Steven Dunston - Northern Star" g2Section2 @@ -358,6 +361,8 @@ nsisunz::Unzip "$TEMP\Song-Northern-Star.zip" "$INSTDIR\Songs\Steven Dunston - N Delete "$TEMP\Song-Northern-Star.zip" + SetOutPath "$INSTDIR" + SectionEnd SectionGroupEnd @@ -396,6 +401,7 @@ nsisunz::Unzip "$TEMP\Theme-Orange.zip" "$INSTDIR\" Delete "$TEMP\Theme-Orange.zip" + SetOutPath "$INSTDIR" SectionEnd @@ -412,6 +418,7 @@ nsisunz::Unzip "$TEMP\Theme-Streetlight.zip" "$INSTDIR\" Delete "$TEMP\Theme-Streetlight.zip" + SetOutPath "$INSTDIR" SectionEnd @@ -428,6 +435,8 @@ nsisunz::Unzip "$TEMP\Theme-Vistar.zip" "$INSTDIR\" Delete "$TEMP\Theme-Vistar.zip" + SetOutPath "$INSTDIR" + SectionEnd diff --git a/Installer/icons/uninstall.ico b/Installer/icons/uninstall.ico deleted file mode 100644 index 1c72432a..00000000 Binary files a/Installer/icons/uninstall.ico and /dev/null differ diff --git a/Installer/icons/ustar.ico b/Installer/icons/ustar.ico deleted file mode 100644 index f3214d1a..00000000 Binary files a/Installer/icons/ustar.ico and /dev/null differ diff --git a/Installer/images/Thumbs.db b/Installer/images/Thumbs.db deleted file mode 100644 index 7ac63d07..00000000 Binary files a/Installer/images/Thumbs.db and /dev/null differ diff --git a/Installer/images/header.bmp b/Installer/images/header.bmp deleted file mode 100644 index 5d1ecc72..00000000 Binary files a/Installer/images/header.bmp and /dev/null differ diff --git a/Installer/images/left.bmp b/Installer/images/left.bmp deleted file mode 100644 index 68370f63..00000000 Binary files a/Installer/images/left.bmp and /dev/null differ diff --git a/Installer/images/mce.png b/Installer/images/mce.png deleted file mode 100644 index 2759936d..00000000 Binary files a/Installer/images/mce.png and /dev/null differ diff --git a/Installer/images/modern.bmp b/Installer/images/modern.bmp deleted file mode 100644 index 62468ded..00000000 Binary files a/Installer/images/modern.bmp and /dev/null differ diff --git a/Installer/plugins/Games.dll b/Installer/plugins/Games.dll deleted file mode 100644 index bdb27ea1..00000000 Binary files a/Installer/plugins/Games.dll and /dev/null differ diff --git a/Installer/plugins/NSISdl.dll b/Installer/plugins/NSISdl.dll deleted file mode 100644 index a3675054..00000000 Binary files a/Installer/plugins/NSISdl.dll and /dev/null differ diff --git a/Installer/plugins/gdf.dll b/Installer/plugins/gdf.dll deleted file mode 100644 index fa887cbd..00000000 Binary files a/Installer/plugins/gdf.dll and /dev/null differ diff --git a/Installer/plugins/nsProcess.dll b/Installer/plugins/nsProcess.dll deleted file mode 100644 index 064097a3..00000000 Binary files a/Installer/plugins/nsProcess.dll and /dev/null differ diff --git a/Installer/plugins/nsisunz.dll b/Installer/plugins/nsisunz.dll deleted file mode 100644 index 5466f156..00000000 Binary files a/Installer/plugins/nsisunz.dll and /dev/null differ diff --git a/Installer/settings/files_in.nsh b/Installer/settings/files_in.nsh index 2e8dab91..de9acb75 100644 --- a/Installer/settings/files_in.nsh +++ b/Installer/settings/files_in.nsh @@ -15,22 +15,24 @@ ; Extract files to the directories: SetOutPath "$INSTDIR" - File "..\bass.dll" - File "..\Changelog.german.txt" - File "..\Changelog.txt" - File "..\documentation.pdf" - File "..\License.txt" - File "..\ReadMe.txt" + File "..\InstallerDependencies\dll\bass.dll" + File "..\InstallerDependencies\dll\SDL.dll" + File "..\InstallerDependencies\dll\smpeg.dll" + File "..\InstallerDependencies\dll\sqlite3.dll" + + File "..\InstallerDependencies\documents\Changelog.german.txt" + File "..\InstallerDependencies\documents\Changelog.txt" + File "..\InstallerDependencies\documents\documentation.pdf" + File "..\InstallerDependencies\documents\License.txt" + File "..\InstallerDependencies\documents\ReadMe.txt" + File "..\ScoreConverter.exe" - File "..\SDL.dll" - File "..\smpeg.dll" - File "..\sqlite3.dll" File "..\${exe}.exe" ${If} ${AtLeastWinVista} SetOutPath "$WINDIR" - File ".\plugins\gdf.dll" + File "..\InstallerDependencies\plugins\gdf.dll" ${EndIf} @@ -39,6 +41,9 @@ ${EndIf} File "..\Covers\NoCover.jpg" SetOutPath "$INSTDIR\Languages\" + + File "..\Languages\readme.txt" + File "..\Languages\Catalan.ini" File "..\Languages\Dutch.ini" File "..\Languages\English.ini" @@ -46,11 +51,10 @@ ${EndIf} File "..\Languages\German.ini" File "..\Languages\Italian.ini" File "..\Languages\Norwegian.ini" - File "..\Languages\readme.txt" + File "..\Languages\Portuguese.ini" File "..\Languages\Serbian.ini" File "..\Languages\Spanish.ini" File "..\Languages\Swedish.ini" - File "..\Languages\Portuguese.ini" SetOutPath "$INSTDIR\Plugins\" File "..\Plugins\Blind.dll" diff --git a/Installer/settings/functions.nsh b/Installer/settings/functions.nsh index 03dcf7f4..a62b9137 100644 --- a/Installer/settings/functions.nsh +++ b/Installer/settings/functions.nsh @@ -4,6 +4,8 @@ Function CreateDesktopShortCuts +SetOutPath "$INSTDIR" + CreateShortcut "$Desktop\$(sm_shortcut).lnk" "$INSTDIR\${exe2}.exe" FunctionEnd diff --git a/Installer/settings/variables.nsh b/Installer/settings/variables.nsh index e4d03924..1bb3a7b6 100644 --- a/Installer/settings/variables.nsh +++ b/Installer/settings/variables.nsh @@ -56,13 +56,12 @@ ; Skin: !define gdf_path "$WINDIR\gdf.dll" ; Path to gdf.dll for Vista Game Explorer -!define bmp_header ".\images\header.bmp" ; Bitmap of the Installation Header (Size: 150x57 px) -!define bmp_side ".\images\left.bmp" ; Bitmap on the left side of Welcome & Finish Page (Size: 164x314 px) +!define bmp_header "..\InstallerDependencies\images\header.bmp" ; Bitmap of the Installation Header (Size: 150x57 px) +!define bmp_side "..\InstallerDependencies\images\left.bmp" ; Bitmap on the left side of Welcome & Finish Page (Size: 164x314 px) !define mui_ini ".\settings\io.ini" ; Installation Options for Welcome & Finish Page !define license_bgcolor "FFFFFF" ; RGB Background Color for Licence agreement -!define bmp_check ".\images\modern.bmp" ; Bitmap of Checks at Components Selection Page +!define bmp_check "..\InstallerDependencies\images\modern.bmp" ; Bitmap of Checks at Components Selection Page !define directory_bgcolor "FFFFFF" ; RGB Background Color for Directory textbox !define smp_bgcolor "FFFFFF" ; RGB Background of Startmenu List and Textbox ;!define dets_bgcolor "FFFFFF" ; Background Color of Details Screen while files are being extracted -!define file_license "..\License.txt" ; Choose the file with the license agreement -!define gameicon ".\images\mce.png" ; Name of the png file which will be displayed in MCE (Size: 170x170) \ No newline at end of file +!define file_license "..\InstallerDependencies\documents\License.txt" ; Choose the file with the license agreement \ No newline at end of file -- cgit v1.2.3