diff options
Diffstat (limited to 'Installer')
-rw-r--r-- | Installer/Readme.txt | 16 | ||||
-rw-r--r-- | Installer/UltraStar Deluxe.nsi | 17 | ||||
-rw-r--r-- | Installer/icons/uninstall.ico | bin | 22486 -> 0 bytes | |||
-rw-r--r-- | Installer/icons/ustar.ico | bin | 22486 -> 0 bytes | |||
-rw-r--r-- | Installer/images/Thumbs.db | bin | 12800 -> 0 bytes | |||
-rw-r--r-- | Installer/images/header.bmp | bin | 25818 -> 0 bytes | |||
-rw-r--r-- | Installer/images/left.bmp | bin | 618006 -> 0 bytes | |||
-rw-r--r-- | Installer/images/mce.png | bin | 56081 -> 0 bytes | |||
-rw-r--r-- | Installer/images/modern.bmp | bin | 1652 -> 0 bytes | |||
-rw-r--r-- | Installer/plugins/Games.dll | bin | 61440 -> 0 bytes | |||
-rw-r--r-- | Installer/plugins/NSISdl.dll | bin | 14848 -> 0 bytes | |||
-rw-r--r-- | Installer/plugins/gdf.dll | bin | 159744 -> 0 bytes | |||
-rw-r--r-- | Installer/plugins/nsProcess.dll | bin | 4096 -> 0 bytes | |||
-rw-r--r-- | Installer/plugins/nsisunz.dll | bin | 40960 -> 0 bytes | |||
-rw-r--r-- | Installer/settings/files_in.nsh | 28 | ||||
-rw-r--r-- | Installer/settings/functions.nsh | 2 | ||||
-rw-r--r-- | Installer/settings/variables.nsh | 9 |
17 files changed, 43 insertions, 29 deletions
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 Binary files differdeleted file mode 100644 index 1c72432a..00000000 --- a/Installer/icons/uninstall.ico +++ /dev/null diff --git a/Installer/icons/ustar.ico b/Installer/icons/ustar.ico Binary files differdeleted file mode 100644 index f3214d1a..00000000 --- a/Installer/icons/ustar.ico +++ /dev/null diff --git a/Installer/images/Thumbs.db b/Installer/images/Thumbs.db Binary files differdeleted file mode 100644 index 7ac63d07..00000000 --- a/Installer/images/Thumbs.db +++ /dev/null diff --git a/Installer/images/header.bmp b/Installer/images/header.bmp Binary files differdeleted file mode 100644 index 5d1ecc72..00000000 --- a/Installer/images/header.bmp +++ /dev/null diff --git a/Installer/images/left.bmp b/Installer/images/left.bmp Binary files differdeleted file mode 100644 index 68370f63..00000000 --- a/Installer/images/left.bmp +++ /dev/null diff --git a/Installer/images/mce.png b/Installer/images/mce.png Binary files differdeleted file mode 100644 index 2759936d..00000000 --- a/Installer/images/mce.png +++ /dev/null diff --git a/Installer/images/modern.bmp b/Installer/images/modern.bmp Binary files differdeleted file mode 100644 index 62468ded..00000000 --- a/Installer/images/modern.bmp +++ /dev/null diff --git a/Installer/plugins/Games.dll b/Installer/plugins/Games.dll Binary files differdeleted file mode 100644 index bdb27ea1..00000000 --- a/Installer/plugins/Games.dll +++ /dev/null diff --git a/Installer/plugins/NSISdl.dll b/Installer/plugins/NSISdl.dll Binary files differdeleted file mode 100644 index a3675054..00000000 --- a/Installer/plugins/NSISdl.dll +++ /dev/null diff --git a/Installer/plugins/gdf.dll b/Installer/plugins/gdf.dll Binary files differdeleted file mode 100644 index fa887cbd..00000000 --- a/Installer/plugins/gdf.dll +++ /dev/null diff --git a/Installer/plugins/nsProcess.dll b/Installer/plugins/nsProcess.dll Binary files differdeleted file mode 100644 index 064097a3..00000000 --- a/Installer/plugins/nsProcess.dll +++ /dev/null diff --git a/Installer/plugins/nsisunz.dll b/Installer/plugins/nsisunz.dll Binary files differdeleted file mode 100644 index 5466f156..00000000 --- a/Installer/plugins/nsisunz.dll +++ /dev/null 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 |