From 94cefdb78044e0f9996e3032de34b690de98b708 Mon Sep 17 00:00:00 2001 From: tobigun Date: Thu, 23 Jul 2009 12:34:07 +0000 Subject: - revert to 1777 - Ocean.ini and SVN properties are not reverted git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@1854 b956fd51-792f-4845-bead-9b4dfca2ff2c --- unicode/installer/settings/files_main_install.nsh | 15 +++++------ .../installer/settings/files_main_uninstall.nsh | 2 -- unicode/installer/settings/settings-1031.ini | 5 ---- unicode/installer/settings/settings-1033.ini | 5 ---- unicode/installer/settings/variables.nsh | 31 ++++++---------------- 5 files changed, 15 insertions(+), 43 deletions(-) (limited to 'unicode/installer/settings') diff --git a/unicode/installer/settings/files_main_install.nsh b/unicode/installer/settings/files_main_install.nsh index c2cdf727..605725aa 100644 --- a/unicode/installer/settings/files_main_install.nsh +++ b/unicode/installer/settings/files_main_install.nsh @@ -4,26 +4,25 @@ ; Create Directories: -CreateDirectory $INSTDIR\Plugins -CreateDirectory $INSTDIR\Songs -CreateDirectory $INSTDIR\Screenshots -CreateDirectory $INSTDIR\Playlists -CreateDirectory $INSTDIR\Covers +CreateDirectory $INSTDIR\plugins +CreateDirectory $INSTDIR\songs +CreateDirectory $INSTDIR\screenshots +CreateDirectory $INSTDIR\playlists SetOutPath "$INSTDIR" -; themes, languages, sounds, fonts, visuals dir +; themes, languages, sounds, visuals dir File /r ..\game\themes File /r ..\game\languages File /r ..\game\sounds -File /r ..\game\fonts File /r ..\installerdependencies\visuals ; Root dir: File ..\installerdependencies\dll\*.dll + File ..\ChangeLog.txt File ..\ChangeLog.german.txt File ..\README.txt @@ -35,7 +34,7 @@ File "..\${exe}.exe" ; Covers dir: -SetOutPath "$INSTDIR\Covers" +SetOutPath "$INSTDIR\covers" IfFileExists $INSTDIR\covers\covers.ini +2 0 File ..\game\covers\Covers.ini diff --git a/unicode/installer/settings/files_main_uninstall.nsh b/unicode/installer/settings/files_main_uninstall.nsh index af61cb0b..b3d69da2 100644 --- a/unicode/installer/settings/files_main_uninstall.nsh +++ b/unicode/installer/settings/files_main_uninstall.nsh @@ -18,7 +18,6 @@ RMDir /r "$INSTDIR\plugins" RMDir /r "$INSTDIR\themes" - RMDir /r "$INSTDIR\fonts" RMDir /r "$INSTDIR\languages" RMDir /r "$INSTDIR\visuals" RMDir /r "$INSTDIR\sounds" @@ -35,7 +34,6 @@ Delete "$INSTDIR\README.txt" Delete "$INSTDIR\Error.log" Delete "$INSTDIR\covers.cache" - Delete "$INSTDIR\cover.db" Delete "$INSTDIR\avcodec-51.dll" Delete "$INSTDIR\avformat-50.dll" diff --git a/unicode/installer/settings/settings-1031.ini b/unicode/installer/settings/settings-1031.ini index 9e588fcb..642f577e 100644 --- a/unicode/installer/settings/settings-1031.ini +++ b/unicode/installer/settings/settings-1031.ini @@ -44,7 +44,6 @@ Bottom=132 [Field 6] Type=Droplist ListItems=On|Off -State=On Left=71 Right=161 Top=25 @@ -53,7 +52,6 @@ Bottom=38 [Field 7] Type=Droplist ListItems=Catalan|Croatian|Danish|Dutch|English|Euskara|French|German|Italian|Norwegian|Polish|Portuguese|Serbian|Slovak|Spanish|Swedish -State=German Left=71 Right=161 Top=48 @@ -62,7 +60,6 @@ Bottom=62 [Field 8] Type=Droplist ListItems=320x200|640x480|800x600|1024x768|1280x1024|1440x900|1680x1050|1920x1200 -State=800x600 Left=71 Right=161 Top=72 @@ -71,7 +68,6 @@ Bottom=86 [Field 9] Type=Droplist ListItems=On|Off -State=Off Left=71 Right=161 Top=96 @@ -80,7 +76,6 @@ Bottom=110 [Field 10] Type=Droplist ListItems=On|Off -State=On Left=71 Right=161 Top=121 diff --git a/unicode/installer/settings/settings-1033.ini b/unicode/installer/settings/settings-1033.ini index 17a08a8c..2a3dfdba 100644 --- a/unicode/installer/settings/settings-1033.ini +++ b/unicode/installer/settings/settings-1033.ini @@ -44,7 +44,6 @@ Bottom=132 [Field 6] Type=Droplist ListItems=On|Off -State=On Left=70 Right=160 Top=24 @@ -53,7 +52,6 @@ Bottom=36 [Field 7] Type=Droplist ListItems=Catalan|Croatian|Danish|Dutch|English|Euskara|French|German|Italian|Norwegian|Polish|Portuguese|Serbian|Slovak|Spanish|Swedish -State=English Left=70 Right=160 Top=48 @@ -62,7 +60,6 @@ Bottom=60 [Field 8] Type=Droplist ListItems=320x200|640x480|800x600|1024x768|1280x1024|1440x900|1680x1050|1920x1200 -State=800x600 Left=70 Right=160 Top=72 @@ -71,7 +68,6 @@ Bottom=86 [Field 9] Type=Droplist ListItems=On|Off -State=Off Left=70 Right=160 Top=99 @@ -80,7 +76,6 @@ Bottom=113 [Field 10] Type=Droplist ListItems=On|Off -State=On Left=70 Right=160 Top=123 diff --git a/unicode/installer/settings/variables.nsh b/unicode/installer/settings/variables.nsh index db98d89f..bf5668d7 100644 --- a/unicode/installer/settings/variables.nsh +++ b/unicode/installer/settings/variables.nsh @@ -14,7 +14,7 @@ !define exe "USdx" -!define license "..\installerdependencies\documents\license.txt" +!define license "license.txt" ; Icons @@ -38,11 +38,10 @@ ; Download URLs for Songs and Themes: -!define download_song2 "http://downloads.sourceforge.net/ultrastardx/usdx_song-dead_smiling_pirates_-_i_18.zip" -!define download_song3 "http://downloads.sourceforge.net/ultrastardx/usdx_song-joshua_morin_-_on_the_run.zip" -!define download_song4 "http://downloads.sourceforge.net/ultrastardx/usdx_song-pornophonique_-_space_-_invaders.zip" -!define download_song5 "http://downloads.sourceforge.net/ultrastardx/usdx_song-steven_dunston_-_northern_star.zip" -!define download_song1 "http://downloads.sourceforge.net/ultrastardx/usdx_song-bodo_wartke_-_liebeslied.zip" +!define download_song1 "http://downloads.sourceforge.net/ultrastardx/usdx_song-dead_smiling_pirates_-_i_18.zip" +!define download_song2 "http://downloads.sourceforge.net/ultrastardx/usdx_song-joshua_morin_-_on_the_run.zip" +!define download_song3 "http://downloads.sourceforge.net/ultrastardx/usdx_song-pornophonique_-_space_-_invaders.zip" +!define download_song4 "http://downloads.sourceforge.net/ultrastardx/usdx_song-steven_dunston_-_northern_star.zip" !define download_sub1_song1 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_monkey_shines.zip" !define download_sub1_song2 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_i_crush_everything.zip" @@ -69,23 +68,9 @@ !define download_sub1_song23 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_skullcrusher_mountain.zip" !define download_sub1_song24 "http://downloads.sourceforge.net/ultrastardx/usdx_song-jonathan_coulton_-_chiron_beta_prime.zip" -!define download_sub2_song1 "http://downloads.sourceforge.net/ultrastardx/usdx_song-shearer_-_69.zip" -!define download_sub2_song2 "http://downloads.sourceforge.net/ultrastardx/usdx_song-shearer_-_69_kar.zip" -!define download_sub2_song3 "http://downloads.sourceforge.net/ultrastardx/usdx_song-shearer_-_cant_stop_it.zip" -!define download_sub2_song4 "http://downloads.sourceforge.net/ultrastardx/usdx_song-shearer_-_cant_stop_it_kar.zip" -!define download_sub2_song5 "http://downloads.sourceforge.net/ultrastardx/usdx_song-shearer_-_in_my_hand.zip" -!define download_sub2_song6 "http://downloads.sourceforge.net/ultrastardx/usdx_song-shearer_-_man_song.zip" -!define download_sub2_song7 "http://downloads.sourceforge.net/ultrastardx/usdx_song-shearer_-_man_song_kar.zip" -!define download_sub2_song8 "http://downloads.sourceforge.net/ultrastardx/usdx_song-shearer_-_stay_with_me.zip" -!define download_sub2_song9 "http://downloads.sourceforge.net/ultrastardx/usdx_song-shearer_-_stay_with_me_kar.zip" - -!define download_sub3_song1 "http://downloads.sourceforge.net/ultrastardx/usdx_song-wise_guys_-_lebendig_und_kraeftig_und_schaerfer.zip" -!define download_sub3_song2 "http://downloads.sourceforge.net/ultrastardx/usdx_song-wise_guys_-_mensch_wo_bist_du.zip" - !define download_theme1 "http://downloads.sourceforge.net/ultrastardx/usdx_skin-orange_by_Skar.zip" !define download_theme2 "http://downloads.sourceforge.net/ultrastardx/usdx_skin-Streetlight_by_Skar.zip" !define download_theme3 "http://downloads.sourceforge.net/ultrastardx/usdx_skin-Vistar_by_Skar.zip" -!define download_theme4 "http://downloads.sourceforge.net/ultrastardx/usdx_skin-bluesensationV5.1_by_Charis.zip" -!define download_theme6 "http://downloads.sourceforge.net/ultrastardx/usdx_skin-WiiStar_by_MasterPhW.zip" -!define download_theme7 "http://downloads.sourceforge.net/ultrastardx/usdx_skin-istar_by_MezzoX.zip" -!define download_theme5 "http://downloads.sourceforge.net/ultrastardx/usdx_skin-whitesensationV101_by_Charis.zip" \ No newline at end of file +!define download_theme4 "http://downloads.sourceforge.net/ultrastardx/usdx_skin-bluesensationV5_by_Charis.zip" +!define download_theme5 "http://downloads.sourceforge.net/ultrastardx/usdx_skin-WiiStar_by_MasterPhW.zip" +!define download_theme6 "http://downloads.sourceforge.net/ultrastardx/usdx_skin-istar_by_MezzoX.zip" \ No newline at end of file -- cgit v1.2.3