Installer, Win: allow "pre-release" in version name (inno setup)

git-svn-id: trunk@42825 -
This commit is contained in:
martin 2013-09-15 18:20:56 +00:00
parent 156b1bffea
commit 2899e3dc78
2 changed files with 12 additions and 4 deletions

View File

@ -6,9 +6,13 @@ EnableISX=true
// A valid file version contains only digits, so drop the RC part // A valid file version contains only digits, so drop the RC part
#if pos('RC',AppVersion)>0 #if pos('RC',AppVersion)>0
#define FileVersion = copy(AppVersion, 1, pos('RC', AppVersion)-1) #define FileVersion = copy(AppVersion, 1, pos('RC', AppVersion)-1)
#else
#if pos('pre',AppVersion)>0
#define FileVersion = copy(AppVersion, 1, pos('pre', AppVersion)-1)
#else #else
#define FileVersion = AppVersion #define FileVersion = AppVersion
#endif #endif
#endif
#define LazRevision GetEnv('LazRevision') #define LazRevision GetEnv('LazRevision')
#define FPCVersion GetEnv('FPCVersion') #define FPCVersion GetEnv('FPCVersion')
#define FPCFullVersion GetEnv('FPCFullVersion') #define FPCFullVersion GetEnv('FPCFullVersion')

View File

@ -6,9 +6,13 @@ EnableISX=true
// A valid file version contains only digits, so drop the RC part // A valid file version contains only digits, so drop the RC part
#if pos('RC',AppVersion)>0 #if pos('RC',AppVersion)>0
#define FileVersion = copy(AppVersion, 1, pos('RC', AppVersion)-1) #define FileVersion = copy(AppVersion, 1, pos('RC', AppVersion)-1)
#else
#if pos('pre',AppVersion)>0
#define FileVersion = copy(AppVersion, 1, pos('pre', AppVersion)-1)
#else #else
#define FileVersion = AppVersion #define FileVersion = AppVersion
#endif #endif
#endif
#define FPCVersion GetEnv('FPCVersion') #define FPCVersion GetEnv('FPCVersion')
#define FPCTargetOS GetEnv('FPCTargetOS') #define FPCTargetOS GetEnv('FPCTargetOS')
#define FPCFullTarget GetEnv('FPCFullTarget') #define FPCFullTarget GetEnv('FPCFullTarget')