Use string version number where applicable

The goal is to be able to use 'letter' releases such as '2.0.3a'
in the Version file.
SoObjects/Mailer/GNUmakefile.preamble: UIX_MAILER_*_VERSION are now strings
  Can't use SOGoVersion since the etag uses an 'underscore' notation (2_0_3a)
SoObjects/Mailer/*.m: updated format for UIX_MAILER_*_VERSION
SoObjects/SOGo/GNUmakefile: zap SOGo_VERSION, unsused
SoObjects/SOGo/GNUmakefile.preamble: fix defines
UI/MainUI/SOGoRootPage.m: use SOGoVersion
This commit is contained in:
Jean Raby
2012-12-21 13:55:03 -05:00
parent 4971e8d05a
commit ea26e0cc0a
9 changed files with 22 additions and 26 deletions
+4 -6
View File
@@ -44,18 +44,19 @@
#import <Appointments/SOGoAppointmentFolders.h>
#import <SOGo/NSString+Utilities.h>
#import <SOGo/SOGoBuild.h>
#import <SOGo/SOGoCache.h>
#import <SOGo/SOGoCASSession.h>
#import <SOGo/SOGoConstants.h>
#import <SOGo/SOGoDomainDefaults.h>
#if defined(SAML2_CONFIG)
#import <SOGo/SOGoSAML2Session.h>
#endif /* SAML2_ENABLE */
#import <SOGo/SOGoSession.h>
#import <SOGo/SOGoSystemDefaults.h>
#import <SOGo/SOGoUser.h>
#import <SOGo/SOGoUserManager.h>
#import <SOGo/SOGoWebAuthenticator.h>
#import <SOGo/SOGoSession.h>
#import <SOGo/SOGoConstants.h>
#import "SOGoRootPage.h"
@@ -514,10 +515,7 @@
{
NSString *aString;
aString = [NSString stringWithFormat: @"%d.%d.%d",
SOGO_MAJOR_VERSION,
SOGO_MINOR_VERSION,
SOGO_SUBMINOR_VERSION];
aString = [NSString stringWithString: SOGoVersion ];
return aString;
}