Skip to content

Commit

Permalink
Preparations for release
Browse files Browse the repository at this point in the history
git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@8587 8aca7d54-2c30-db11-9de9-000461428c89
  • Loading branch information
prissi committed Sep 17, 2018
1 parent d9a0b60 commit a9acfc5
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion get_pak.sh
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ DownloadInstallZip(){

# generated list of pak sets
paksets=( \
"http://downloads.sourceforge.net/project/simutrans/pak64/120-3/simupak64-120-3.zip" \
"http://downloads.sourceforge.net/project/simutrans/pak64/120-4/simupak64-120-4.zip" \
"https://www.simutrans-germany.com/pak.german/pak64.german_0-112-3-10_full.zip" \
"http://downloads.sourceforge.net/project/simutrans/pak64.japan/120-0/simupak64.japan-120-0-1.zip" \
"http://github.com/wa-st/pak-nippon/releases/download/v0.3.0/pak.nippon-v0.3.0.zip" \
Expand Down
10 changes: 5 additions & 5 deletions nsis/paksets.nsh
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@ SectionGroup "Pak64: main and addons" pak64group

Section "!pak (64 size) (standard)" pak
AddSize 12240
StrCpy $downloadlink "http://downloads.sourceforge.net/project/simutrans/pak64/120-3/simupak64-120-3.zip"
StrCpy $archievename "simupak64-120-3.zip"
StrCpy $downloadlink "http://downloads.sourceforge.net/project/simutrans/pak64/120-4/simupak64-120-4.zip"
StrCpy $archievename "simupak64-120-4.zip"
StrCpy $downloadname "pak"
StrCpy $VersionString "pak64 120.3 r1965"
StrCpy $VersionString "pak64 120.3 r1972"
Call DownloadInstallZip
SectionEnd


Section /o "pak64 Food addon"
AddSize 292
StrCpy $downloadlink "http://downloads.sourceforge.net/project/simutrans/pak64/112-2/simupak64-addon-food-112-2.zip"
StrCpy $archievename "simupak64-addon-food-112-2.zip"
StrCpy $downloadlink "http://downloads.sourceforge.net/project/simutrans/pak64/120-4/simupak64-addon-food-120-4.zip"
StrCpy $archievename "simupak64-addon-food-120-4.zip"
StrCpy $downloadname "pak"
StrCpy $VersionString ""
StrCmp $multiuserinstall "1" +3
Expand Down
8 changes: 4 additions & 4 deletions nsis/simutrans.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -39,17 +39,17 @@ FunctionEnd

Section /o "Executable (GDI, run one more computers)" GDIexe
AddSize 12155
StrCpy $downloadlink "http://downloads.sourceforge.net/project/simutrans/simutrans/120-3/simuwin-120-3.zip"
StrCpy $archievename "simuwin-120-3.zip"
StrCpy $downloadlink "http://downloads.sourceforge.net/project/simutrans/simutrans/120-4/simuwin-120-4.zip"
StrCpy $archievename "simuwin-120-4.zip"
StrCpy $downloadname "Simutrans Executable (GDI)"
Call DownloadInstallZip
Call PostExeInstall
SectionEnd

Section "Executable (SDL2, better sound)" SDLexe
AddSize 15087
StrCpy $downloadlink "http://downloads.sourceforge.net/project/simutrans/simutrans/120-3/simuwin-sdl-120-3.zip"
StrCpy $archievename "simuwin-sdl-120-3.zip"
StrCpy $downloadlink "http://downloads.sourceforge.net/project/simutrans/simutrans/120-4/simuwin-sdl-120-4.zip"
StrCpy $archievename "simuwin-sdl-120-4.zip"
StrCpy $downloadname "Simutrans Executable (SDL2)"
Call DownloadInstallZip
Call PostExeInstall
Expand Down
2 changes: 1 addition & 1 deletion simversion.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#define SIM_VERSION_MAJOR 120
#define SIM_VERSION_MINOR 4
#define SIM_VERSION_PATCH 0
#define SIM_VERSION_BUILD SIM_BUILD_NIGHTLY
#define SIM_VERSION_BUILD SIM_BUILD_RELEASE

// Beware: SAVEGAME minor is often ahead of version minor when there were patches.
// ==> These have no direct connection at all!
Expand Down

0 comments on commit a9acfc5

Please sign in to comment.