Merged from tags/2.0.0 : Final 2.0.0 packaging

git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@4694 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 1e2eb58d3909d03867fe9f4bece7b0fb8cead5a0
Former-commit-id: aa23ec481d6100ca9516be1201b22067078e380c

packaging/windows/readme_for_user.txt

@@ -3,6 +3,22 @@ License
 
 The whole distribution is licensed according to the GPL 2+ and the Free Art Licenses.
 
+Installation instructions
+-------------------------
+
+Among the 5 binary packages (speed-dreams-xxxx-2.0.0-r4687-win32-setup.exe),
+only the "base" one is mandatory : it contains the core components of the game.
+It is also a kind of "demo" package, as it also ships 1 track (Espie)
+and 1 car set (the Supercars), plus the relevant AI drivers :
+that way, you can quickly get the taste of Speed Dreams.
+
+If you're reading this, sure you already installed it :-)
+
+Then, you might want to download and install at least one
+of the "HQ cars and tracks" packages :-)
+You can install them in any order, either by directly running them,
+or by re-running the "base" installer and "Add / re-install components".
+
 Completing the installation
 ---------------------------
 
@@ -24,7 +40,7 @@ recommended) and an OpenGL 1.3 capable graphics card with 32Mb GRAM (64Mb recomm
 You need more now, as Speed Dreams is constantly improving visual rendering :
 - Video card : at least 128Mb ; better with 256 Mb or more 
 - CPU        : at least 1 GHz ; better with 1.5 or 2.0 GHz
-- RAM        : from at least 512 Mb (Win XP 32) to 2Gb (Win Vista 32) ; better with 1 Gb to 3 Gb
+- RAM        : from at least 512 Mb (Win XP 32) to 2Gb (Win Vista 32) ; better with 1 to 3 Gb
 
 For more details, see http://sourceforge.net/apps/trac/speed-dreams/wiki/HardSoftRequirements
 
@@ -34,16 +50,17 @@ Running the game
 ----------------
 
 - Read the "User manual" :
+  * Simon's great online tutorial videos http://www.youtube.com/user/mungewell/feed?feature=context
+  * WIP online manual http://sourceforge.net/apps/trac/speed-dreams/wiki/SD2.0Manual
   * Windows : Start menu / Programs / Speed Dreams x.y.z / User Manual
-    (Note: Might not be perfectly up-to-date ...)  
+    (Note: Now out-dated, as was written for 1.4.0 ...)  
-  * WIP online manual http://sourceforge.net/apps/trac/speed-dreams/wiki/SD2.0Manual  
   * Others (soon available online at http://www.speed-dreams.org) :
     - source distribution : open speed-dreams-x.y.z-src/doc/userman/how_to_drive.html 
       in a web browser
     - SubVersion repository : download a GNU tarball of the user manual here :
         http://speed-dreams.svn.sourceforge.net/viewvc/speed-dreams/tags/x.y.z/doc/userman
       then uncompress it and finally open how_to_drive.html in a web browser
-    (Note: Might not be perfectly up-to-date ...)  
+      (Note: Now out-dated, as was written for 1.4.0)  
 
 - Start the game :
   * Windows : Start menu / Programs / Speed Dreams x.y.z / Speed Dreams
@@ -53,10 +70,10 @@ Running the game
   Note: Under Windows XP at least, first-ever startups sometimes fail to correctly write
         the necesary stuff into <My documents>\speed-dreams-2.settings and this prevents
         the game from starting.
-        If this happens, simply remove the <My documents>\speed-dreams-2.settings folder
+        If this happens, remove the <My documents>\speed-dreams-2.settings folder
         with the Windows explorer, and restart the game : it should now work.
 
-- Press F1 in any screen to get help (do it as well during the ride to learn about the options).
+- Press F1 in any screen to get help (do it as well during the ride, to learn about the options).
 
 - Read the FAQ to learn about split screen multiplayer and more.
 
@@ -80,12 +97,12 @@ Creating Tracks
 ---------------
 
 There is a new track editor in development (by Mart Kelder) :
-have a look soon at Speed Dreams SVN repository (in the subprojects folder).
+have a look soon at Speed Dreams SVN repository (in the 'subprojects' folder).
 
 Robot programming
 -----------------
 
-You find a robot programming tutorial on www.berniw.org in the TORCS section.
+You'll find a robot programming tutorial at www.berniw.org in the TORCS section.
 
 Wolf-Dieter is also starting a new "Robot Programming Academy" : soon news !
 

packaging/windows/speed-dreams-base.nsi

@@ -91,8 +91,8 @@ Section "!Base System" SEC01
   ; Core loadable modules (physics and graphics engines, track loader, ...)
   SetOutPath "$INSTDIR\lib\modules\graphic"
   File /r /x *.lib "${BUILD_INST_DIR}\lib\modules\graphic\*.*"
-  SetOutPath "$INSTDIR\lib\modules\simu\simuv2.1"
+  SetOutPath "$INSTDIR\lib\modules\simu"
-  File /r /x *.lib "${BUILD_INST_DIR}\lib\modules\simu\simuv2.1\*.*"
+  File "${BUILD_INST_DIR}\lib\modules\simu\simuv2.1.dll"
   SetOutPath "$INSTDIR\lib\modules\telemetry"
   File /r /x *.lib "${BUILD_INST_DIR}\lib\modules\telemetry\*.*"
   SetOutPath "$INSTDIR\lib\modules\track"
@@ -107,6 +107,9 @@ Section "!Base System" SEC01
   SetOutPath "$INSTDIR\data\categories"
   File /r "${BUILD_INST_DIR}\data\categories\*.*"
 
+  SetOutPath "$INSTDIR\data\config"
+  File "${BUILD_INST_DIR}\data\config\*.*"
+
   SetOutPath "$INSTDIR\data\config\raceman\extra"
   File /r "${BUILD_INST_DIR}\data\config\raceman\extra\*.*"
 
@@ -211,7 +214,7 @@ Section /o "HQ cars and tracks (1)" SEC03
 
   StrCpy $1 "speed-dreams-${HQCARSTRACKS_SETUP_KEY}-${GAME_LONG_VERSION}-win32-setup.exe"
   StrCpy $2 "HQ cars and tracks (1)"
-  !insertmacro DownloadPackageIfNeededAndThenInstall $1 $2 320
+  !insertmacro DownloadPackageIfNeededAndThenInstall $1 $2 340
 
 SectionEnd
 
@@ -227,14 +230,14 @@ Section /o "WIP cars and tracks" SEC05
 
   StrCpy $1 "speed-dreams-${WIPCARSTRACKS_SETUP_KEY}-${GAME_LONG_VERSION}-win32-setup.exe"
   StrCpy $2 "WIP cars and tracks"
-  !insertmacro DownloadPackageIfNeededAndThenInstall $1 $2 140
+  !insertmacro DownloadPackageIfNeededAndThenInstall $1 $2 150
 
 SectionEnd
 
 Section /o "Unmaintained" SEC06
 
   StrCpy $1 "speed-dreams-${UNMAINTAINED_SETUP_KEY}-${GAME_LONG_VERSION}-win32-setup.exe"
-  StrCpy $2 "Unmaintained stuff"
+  StrCpy $2 "Unmaintained contents"
   !insertmacro DownloadPackageIfNeededAndThenInstall $1 $2 1
 
 SectionEnd
@@ -255,6 +258,8 @@ Section -Shortcuts
   CreateShortCut "$SMPROGRAMS\${GAME_VERSIONNED_NAME}\Web site.lnk" "$INSTDIR\${GAME_NAME}.url"
   WriteIniStr "$INSTDIR\${GAME_NAME} Community.url" "InternetShortcut" "URL" "${COMMUNITY_WEB_SITE}"
   CreateShortCut "$SMPROGRAMS\${GAME_VERSIONNED_NAME}\Community.lnk" "$INSTDIR\${GAME_NAME} Community.url"
+  WriteIniStr "$INSTDIR\BugTracker.url" "InternetShortcut" "URL" "${GAME_BUG_TRACKER}"
+  CreateShortCut "$SMPROGRAMS\${GAME_VERSIONNED_NAME}\Bug tracker.lnk" "$INSTDIR\BugTracker.url"
   CreateShortCut "$SMPROGRAMS\${GAME_VERSIONNED_NAME}\Uninstall.lnk" "$INSTDIR\uninst.exe"
 
   ; Desktop shortcut
@@ -302,6 +307,7 @@ SectionEnd
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC03} "HQ tracks, fine-tuned LS1 + 36GP cars and AI drivers$\n(will be downloaded if needed and agreed)"
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC04} "More HQ tracks, fine-tuned TRB1 cars and AI drivers$\n(will be downloaded if needed and agreed)"
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC05} "Work-in-progress cars (LS2, RS, MP5) and tracks$\n(will be downloaded if needed and agreed)"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SEC06} "Unmaintained contents (Old physics engines)$\n(will be downloaded if needed and agreed)"
 
 !insertmacro MUI_FUNCTION_DESCRIPTION_END
 

packaging/windows/speed-dreams-unmaintained.nsi

@@ -60,11 +60,9 @@ Section -CoreBinaries
   SetOverwrite on
 
   ; Obsolete physics engines.
-  SetOutPath "$INSTDIR\lib\modules\simu\simuv2"
+  SetOutPath "$INSTDIR\lib\modules\simu"
-  File /r /x *.lib "${BUILD_INST_DIR}\lib\modules\simu\simuv2\*.*"
+  File "${BUILD_INST_DIR}\lib\modules\simu\simuv2.dll"
-
+  File "${BUILD_INST_DIR}\lib\modules\simu\simuv3.dll"
-  SetOutPath "$INSTDIR\lib\modules\simu\simuv3"
-  File /r /x *.lib "${BUILD_INST_DIR}\lib\modules\simu\simuv3\*.*"
 
 SectionEnd
 

packaging/windows/speed-dreams.nsh

@@ -12,9 +12,9 @@
 !define VER_MAJOR 2
 !define VER_MINOR 0
 !define VER_PATCH 0
-!define VER_EXTRA "-rc1"
+!define VER_EXTRA ""
-!define VER_REVISION "r4420"
+!define VER_REVISION "r4687"
-!define VER_RELDATE 20120115
+!define VER_RELDATE 20120408
 
 !define GAME_SHORT_NAME "Speed Dreams"
 !define GAME_NAME "${GAME_SHORT_NAME} 2"
@@ -27,8 +27,9 @@
 !define GAME_LONG_NAME "${GAME_SHORT_NAME} ${GAME_LONG_VERSION}"
 !define GAME_PUBLISHER "the Speed Dreams Team"
 !define GAME_WEB_SITE "http://www.speed-dreams.org"
-!define COMMUNITY_WEB_SITE "http://community.speed-dreams.org"
+!define GAME_BUG_TRACKER "http://sourceforge.net/apps/trac/speed-dreams/report/3"
 !define GAME_DOWNLOAD_URL "http://sourceforge.net/projects/speed-dreams/files/2.0.0"
+!define COMMUNITY_WEB_SITE "http://community.speed-dreams.org"
 
 !define GAME_ROOT_REGKEY "HKLM"
 !define GAME_INST_REGKEY "Software\Microsoft\Windows\CurrentVersion\${GAME_FS_NAME}.exe"