From a4229bf800ba21faf73e7bff32a42cf3c9483edb Mon Sep 17 00:00:00 2001 From: pouillot Date: Sat, 7 Apr 2012 10:53:58 +0000 Subject: [PATCH] Added unmaintained source and windows binary package specs + moved Career raceman files to the WIP package + added new raceman files for 36GP, LS1 and MP5 git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@4661 30fe4595-0a0c-4342-8851-515496e4dcbd Former-commit-id: ca837861d9360eda8f44f1b9a4e57c66f78962ab Former-commit-id: 43b6e0a004b5248e2b89cacb9f36202719a7c249 --- INSTALL.txt | 9 +- packaging/sources/build.sh | 9 +- packaging/sources/sd-src-base.lst | 15 ++- .../sources/sd-src-hq-cars-and-tracks.lst | 7 ++ .../sd-src-more-hq-cars-and-tracks.lst | 4 + packaging/sources/sd-src-unmaintained.lst | 2 + .../sources/sd-src-wip-cars-and-tracks.lst | 8 ++ packaging/windows/speed-dreams-base.nsi | 30 +++++- .../speed-dreams-hq-cars-and-tracks.nsi | 7 +- .../windows/speed-dreams-unmaintained.nsi | 102 ++++++++++++++++++ .../speed-dreams-wip-cars-and-tracks.nsi | 4 + packaging/windows/speed-dreams.nsh | 1 + 12 files changed, 184 insertions(+), 14 deletions(-) create mode 100644 packaging/sources/sd-src-unmaintained.lst create mode 100644 packaging/windows/speed-dreams-unmaintained.nsi diff --git a/INSTALL.txt b/INSTALL.txt index 6ffbdb829..62dca45c1 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -63,13 +63,16 @@ The Speed Dreams Team. 2 - Installation from the official tarballs a - get these tarballs : please go to our SF.net download page at - http://sourceforge.net/projects/speed-dreams/files/2.0.0, + + http://sourceforge.net/projects/speed-dreams/files/2.0.0, + and you should find : speed-dreams-src-base-.tar.xz speed-dreams-src-hq-cars-and-tracks-.tar.xz speed-dreams-src-more-hq-cars-and-tracks-.tar.xz speed-dreams-src-wip-cars-and-tracks-.tar.xz + speed-dreams-src-unmaintained-.tar.xz where is something like "2.0.0-rc1-r4420", "2.0.0-r45xx", ... @@ -79,7 +82,7 @@ The Speed Dreams Team. Let's say you downloaded them all in $HOME/sd, and that is 2.0.0-rc1-r4420. (you can do as you like, but we'll use this folder in the explanations below). - b - uncompress the 4 tarballs : + b - uncompress the tarballs : $ cd $HOME/sd $ mkdir 2.0.0-rc1-r4420 @@ -241,7 +244,7 @@ II - Windows installation from sources Note: If you use an "Express" version, don't forget to install also the Windows SDK. a. Install CMake v2.6+ http://www.cmake.org/cmake/resources/software.html - b. Download the 4 official tarballs from SF.net + b. Download the official tarballs from SF.net http://sourceforge.net/projects/speed-dreams/files/2.0.0 (speed-dreams-src--.tar.xz) c. Extract their contents to your local disk (7Zip is an excellent tool for that), diff --git a/packaging/sources/build.sh b/packaging/sources/build.sh index c48760d5d..9235c6029 100755 --- a/packaging/sources/build.sh +++ b/packaging/sources/build.sh @@ -6,7 +6,8 @@ # cd my/svn/sandbox/tags/2.0.0-rc1 # ./packaging/sources/build.sh 2.0.0-rc1-r4420 # -# Warning: You need to get and extract all 4 packages before building. +# Warning: The generated packages can't be used separately for building : +# you need to get and extract all of them before building. # # copyright : (C) 2011 onwards Jean-Philippe Meuret # $Id$ @@ -38,12 +39,16 @@ tar -c -J -X $specDir/sd-src-exclude.lst --exclude-vcs -T $specDir/sd-src-more-h ls -l speed-dreams-src-more-hq*.tar.xz - # WIP cars and tracks echo "* 'WIP cars and tracks' package ..." tar -c -J -X $specDir/sd-src-exclude.lst --exclude-vcs -T $specDir/sd-src-wip-cars-and-tracks.lst -f speed-dreams-src-wip-cars-and-tracks-$1.tar.xz ls -l speed-dreams-src-wip*.tar.xz + echo "* 'unmaintained' package ..." + tar -c -J -X $specDir/sd-src-exclude.lst --exclude-vcs -T $specDir/sd-src-unmaintained.lst -f speed-dreams-src-unmaintained-$1.tar.xz + + ls -l speed-dreams-src-unmaintained*.tar.xz + echo "Done (`date`)." else diff --git a/packaging/sources/sd-src-base.lst b/packaging/sources/sd-src-base.lst index 380530826..36db177fc 100644 --- a/packaging/sources/sd-src-base.lst +++ b/packaging/sources/sd-src-base.lst @@ -33,10 +33,21 @@ src/drivers/human src/interfaces src/libs src/main -src/modules -src/raceman src/tools +src/raceman/extra +src/raceman/practice.xml +src/raceman/quickrace.xml +src/raceman/singleevent-challenge.xml +src/raceman/singleevent-endurance.xml + +src/modules/graphic +src/modules/networking +src/modules/simu/simuv2.1 +src/modules/telemetry +src/modules/track +src/modules/userinterface + data/CMakeLists.txt data/data diff --git a/packaging/sources/sd-src-hq-cars-and-tracks.lst b/packaging/sources/sd-src-hq-cars-and-tracks.lst index cb859bebc..1e6864ac3 100644 --- a/packaging/sources/sd-src-hq-cars-and-tracks.lst +++ b/packaging/sources/sd-src-hq-cars-and-tracks.lst @@ -1,3 +1,10 @@ +src/raceman/singleevent-36gp.xml +src/raceman/singleevent-ls-gt1.xml +src/raceman/championship.xml +src/raceman/championship-supercars.xml +src/raceman/championship-36gp.xml +src/raceman/championship-ls-gt1.xml + src/drivers/usr/usr_ls1 src/drivers/usr/usr_36GP diff --git a/packaging/sources/sd-src-more-hq-cars-and-tracks.lst b/packaging/sources/sd-src-more-hq-cars-and-tracks.lst index ce4fd8653..d24aee17d 100644 --- a/packaging/sources/sd-src-more-hq-cars-and-tracks.lst +++ b/packaging/sources/sd-src-more-hq-cars-and-tracks.lst @@ -1,3 +1,7 @@ +src/raceman/championship.xml +src/raceman/championship-supercars.xml +src/raceman/championship-trb1.xml + src/drivers/usr/usr_trb1 src/drivers/simplix/simplix_trb1 diff --git a/packaging/sources/sd-src-unmaintained.lst b/packaging/sources/sd-src-unmaintained.lst new file mode 100644 index 000000000..175777375 --- /dev/null +++ b/packaging/sources/sd-src-unmaintained.lst @@ -0,0 +1,2 @@ +src/modules/simu/simuv2 +src/modules/simu/simuv3 diff --git a/packaging/sources/sd-src-wip-cars-and-tracks.lst b/packaging/sources/sd-src-wip-cars-and-tracks.lst index e0c76e2d4..343401c2c 100644 --- a/packaging/sources/sd-src-wip-cars-and-tracks.lst +++ b/packaging/sources/sd-src-wip-cars-and-tracks.lst @@ -1,3 +1,11 @@ +src/raceman/singleevent-mp5.xml +src/raceman/championship.xml +src/raceman/championship-supercars.xml +src/raceman/championship-mp5.xml +src/raceman/career.xml +src/raceman/career_supercars.xmls +src/raceman/career_ls1.xmls + src/drivers/usr/usr_ls2 src/drivers/usr/usr_rs diff --git a/packaging/windows/speed-dreams-base.nsi b/packaging/windows/speed-dreams-base.nsi index 10155e1f4..53763ce09 100644 --- a/packaging/windows/speed-dreams-base.nsi +++ b/packaging/windows/speed-dreams-base.nsi @@ -89,8 +89,16 @@ Section "!Base System" SEC01 File /x sd-*.* /x *.lib "${BUILD_INST_DIR}\bin\*.*" ; Core loadable modules (physics and graphics engines, track loader, ...) - SetOutPath "$INSTDIR\lib\modules" - File /r /x *.lib "${BUILD_INST_DIR}\lib\modules\*.*" + SetOutPath "$INSTDIR\lib\modules\graphic" + File /r /x *.lib "${BUILD_INST_DIR}\lib\modules\graphic\*.*" + SetOutPath "$INSTDIR\lib\modules\simu\simuv2.1" + File /r /x *.lib "${BUILD_INST_DIR}\lib\modules\simu\simuv2.1\*.*" + SetOutPath "$INSTDIR\lib\modules\telemetry" + File /r /x *.lib "${BUILD_INST_DIR}\lib\modules\telemetry\*.*" + SetOutPath "$INSTDIR\lib\modules\track" + File /r /x *.lib "${BUILD_INST_DIR}\lib\modules\track\*.*" + SetOutPath "$INSTDIR\lib\modules\userinterface" + File /r /x *.lib "${BUILD_INST_DIR}\lib\modules\userinterface\*.*" ; Core data files (sound, textures, menus, car categories, ...) SetOutPath "$INSTDIR\data" @@ -99,8 +107,14 @@ Section "!Base System" SEC01 SetOutPath "$INSTDIR\data\categories" File /r "${BUILD_INST_DIR}\data\categories\*.*" - SetOutPath "$INSTDIR\data\config" - File /r /x career*.* /x championship*.* /x *-mp5.xml "${BUILD_INST_DIR}\data\config\*.*" + SetOutPath "$INSTDIR\data\config\raceman\extra" + File /r "${BUILD_INST_DIR}\data\config\raceman\extra\*.*" + + SetOutPath "$INSTDIR\data\config\raceman" + File "${BUILD_INST_DIR}\data\config\raceman\practice.xml" + File "${BUILD_INST_DIR}\data\config\raceman\quickrace.xml" + File "${BUILD_INST_DIR}\data\config\raceman\singleevent-challenge.xml" + File "${BUILD_INST_DIR}\data\config\raceman\singleevent-endurance.xml" SetOutPath "$INSTDIR\data\data" File /r "${BUILD_INST_DIR}\data\data\*.*" @@ -217,6 +231,14 @@ Section /o "WIP cars and tracks" SEC05 SectionEnd +Section /o "Unmaintained" SEC06 + + StrCpy $1 "speed-dreams-${UNMAINTAINED_SETUP_KEY}-${GAME_LONG_VERSION}-win32-setup.exe" + StrCpy $2 "Unmaintained stuff" + !insertmacro DownloadPackageIfNeededAndThenInstall $1 $2 1 + +SectionEnd + Section -Shortcuts ; Start menu entries diff --git a/packaging/windows/speed-dreams-hq-cars-and-tracks.nsi b/packaging/windows/speed-dreams-hq-cars-and-tracks.nsi index f11b62bee..42d1fe7d7 100644 --- a/packaging/windows/speed-dreams-hq-cars-and-tracks.nsi +++ b/packaging/windows/speed-dreams-hq-cars-and-tracks.nsi @@ -63,11 +63,12 @@ Section -CoreData ; Game core data files (racemanagers, ...) SetOutPath "$INSTDIR\data\config\raceman" + File "${BUILD_INST_DIR}\data\config\raceman\singleevent-36gp.xml" + File "${BUILD_INST_DIR}\data\config\raceman\singleevent-ls-gt1.xml" File "${BUILD_INST_DIR}\data\config\raceman\championship.xml" File "${BUILD_INST_DIR}\data\config\raceman\championship-supercars.xml" - File "${BUILD_INST_DIR}\data\config\raceman\career.xml" - File "${BUILD_INST_DIR}\data\config\raceman\career_supercars.xmls" - File "${BUILD_INST_DIR}\data\config\raceman\career_ls1.xmls" + File "${BUILD_INST_DIR}\data\config\raceman\championship-36gp.xml" + File "${BUILD_INST_DIR}\data\config\raceman\championship-ls-gt1.xml" SectionEnd diff --git a/packaging/windows/speed-dreams-unmaintained.nsi b/packaging/windows/speed-dreams-unmaintained.nsi new file mode 100644 index 000000000..0aec42fff --- /dev/null +++ b/packaging/windows/speed-dreams-unmaintained.nsi @@ -0,0 +1,102 @@ +; +; Windows NSIS configuration file for the "Unmaintained contents" installer +; (obsolete physics engines, ...) +; +; copyright : (C) 2012 onwards Jean-Philippe Meuret +; $Id$ +; +; This program is free software; you can redistribute it and/or modify +; it under the terms of the GNU General Public License as published by +; the Free Software Foundation; either version 2 of the License, or +; (at your option) any later version. + +; Common definitions. +!include "speed-dreams.nsh" + +; MUI Settings +!define MUI_WELCOMEPAGE_TITLE "${GAME_NAME}\n ${GAME_SUBTITLE}\nUnmaintained contents" +!define MUI_WELCOMEPAGE_TITLE_3LINES + +; Installer pages +;Page custom EnterXXXPage LeaveXXXPage +!insertmacro MUI_PAGE_WELCOME +!insertmacro MUI_PAGE_INSTFILES + +; Language files (Warning: Can't be upper in the script) +!insertmacro MUI_LANGUAGE "English" +!insertmacro MUI_LANGUAGE "Dutch" +!insertmacro MUI_LANGUAGE "Danish" +!insertmacro MUI_LANGUAGE "Swedish" +!insertmacro MUI_LANGUAGE "Finnish" +!insertmacro MUI_LANGUAGE "Norwegian" +!insertmacro MUI_LANGUAGE "German" +!insertmacro MUI_LANGUAGE "French" +!insertmacro MUI_LANGUAGE "Spanish" +!insertmacro MUI_LANGUAGE "Italian" +!insertmacro MUI_LANGUAGE "Russian" +!insertmacro MUI_LANGUAGE "Polish" +!insertmacro MUI_LANGUAGE "Czech" +!insertmacro MUI_LANGUAGE "Slovak" +!insertmacro MUI_LANGUAGE "Hungarian" +!insertmacro MUI_LANGUAGE "Romanian" +!insertmacro MUI_LANGUAGE "Greek" +!insertmacro MUI_LANGUAGE "Turkish" +!insertmacro MUI_LANGUAGE "Arabic" +!insertmacro MUI_LANGUAGE "Farsi" +!insertmacro MUI_LANGUAGE "Japanese" +!insertmacro MUI_LANGUAGE "SimpChinese" + +; Global installer settings. +Name "${GAME_VERSIONNED_NAME}" +Caption "Install Unmaintained contents for ${GAME_VERSIONNED_NAME}" +OutFile "speed-dreams-${UNMAINTAINED_SETUP_KEY}-${GAME_LONG_VERSION}-win32-setup.exe" +InstallDir "$PROGRAMFILES\${INST_INST_DIR_SUFFIX}" ; TODO: Detect base package install dir +InstallDirRegKey ${GAME_ROOT_REGKEY} "${GAME_DIR_REGKEY}" "" +ShowInstDetails show +ShowUnInstDetails show + +Section -CoreBinaries + + SetOverwrite on + + ; Obsolete physics engines. + SetOutPath "$INSTDIR\lib\modules\simu\simuv2" + File /r /x *.lib "${BUILD_INST_DIR}\lib\modules\simu\simuv2\*.*" + + SetOutPath "$INSTDIR\lib\modules\simu\simuv3" + File /r /x *.lib "${BUILD_INST_DIR}\lib\modules\simu\simuv3\*.*" + +SectionEnd + +Section -CoreData + + SetOverwrite on + +SectionEnd + +Section -Drivers + + SetOverwrite on + +SectionEnd + +Section -Cars + + SetOverwrite on + +SectionEnd + +Section -Tracks + + SetOverwrite on + +SectionEnd + +; This function is called at installer startup. +Function .onInit + + ; Check if the base package is installed and OK, and abort if not. + !insertmacro CheckIfBasePackageInstalled + +FunctionEnd + diff --git a/packaging/windows/speed-dreams-wip-cars-and-tracks.nsi b/packaging/windows/speed-dreams-wip-cars-and-tracks.nsi index b1dbce182..7ba6ee042 100644 --- a/packaging/windows/speed-dreams-wip-cars-and-tracks.nsi +++ b/packaging/windows/speed-dreams-wip-cars-and-tracks.nsi @@ -65,6 +65,10 @@ Section -CoreData File "${BUILD_INST_DIR}\data\config\raceman\singleevent-mp5.xml" File "${BUILD_INST_DIR}\data\config\raceman\championship.xml" File "${BUILD_INST_DIR}\data\config\raceman\championship-supercars.xml" + File "${BUILD_INST_DIR}\data\config\raceman\championship-mp5.xml" + File "${BUILD_INST_DIR}\data\config\raceman\career.xml" + File "${BUILD_INST_DIR}\data\config\raceman\career_supercars.xmls" + File "${BUILD_INST_DIR}\data\config\raceman\career_ls1.xmls" SectionEnd diff --git a/packaging/windows/speed-dreams.nsh b/packaging/windows/speed-dreams.nsh index 6f9e0cab5..c489079a9 100644 --- a/packaging/windows/speed-dreams.nsh +++ b/packaging/windows/speed-dreams.nsh @@ -46,6 +46,7 @@ !define HQCARSTRACKS_SETUP_KEY "hq-cars-and-tracks" !define MOREHQCARSTRACKS_SETUP_KEY "more-hq-cars-and-tracks" !define WIPCARSTRACKS_SETUP_KEY "wip-cars-and-tracks" +!define UNMAINTAINED_SETUP_KEY "unmaintained" ; Common installer settings SetCompressor /SOLID lzma ; 1-block compression, smaller but longer (generation, extraction)