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 SOGoVersionpull/7/head
parent
4971e8d05a
commit
ea26e0cc0a
|
@ -2,6 +2,6 @@
|
||||||
|
|
||||||
ADDITIONAL_CPPFLAGS += \
|
ADDITIONAL_CPPFLAGS += \
|
||||||
-Wall -DCOMPILE_FOR_GSTEP_MAKE=1 \
|
-Wall -DCOMPILE_FOR_GSTEP_MAKE=1 \
|
||||||
-DUIX_MAILER_MAJOR_VERSION=$(MAJOR_VERSION) \
|
-DUIX_MAILER_MAJOR_VERSION="@\"$(MAJOR_VERSION)\"" \
|
||||||
-DUIX_MAILER_MINOR_VERSION=$(MINOR_VERSION) \
|
-DUIX_MAILER_MINOR_VERSION="@\"$(MINOR_VERSION)\"" \
|
||||||
-DUIX_MAILER_SUBMINOR_VERSION=$(SUBMINOR_VERSION)
|
-DUIX_MAILER_SUBMINOR_VERSION="@\"$(SUBMINOR_VERSION)\""
|
||||||
|
|
|
@ -57,6 +57,7 @@
|
||||||
#import <SOGo/NSArray+Utilities.h>
|
#import <SOGo/NSArray+Utilities.h>
|
||||||
#import <SOGo/NSCalendarDate+SOGo.h>
|
#import <SOGo/NSCalendarDate+SOGo.h>
|
||||||
#import <SOGo/NSString+Utilities.h>
|
#import <SOGo/NSString+Utilities.h>
|
||||||
|
#import <SOGo/SOGoBuild.h>
|
||||||
#import <SOGo/SOGoDomainDefaults.h>
|
#import <SOGo/SOGoDomainDefaults.h>
|
||||||
#import <SOGo/SOGoMailer.h>
|
#import <SOGo/SOGoMailer.h>
|
||||||
#import <SOGo/SOGoUser.h>
|
#import <SOGo/SOGoUser.h>
|
||||||
|
@ -176,10 +177,8 @@ static NSString *userAgent = nil;
|
||||||
{
|
{
|
||||||
MultiMixedType = [NGMimeType mimeType: @"multipart" subType: @"mixed"];
|
MultiMixedType = [NGMimeType mimeType: @"multipart" subType: @"mixed"];
|
||||||
[MultiMixedType retain];
|
[MultiMixedType retain];
|
||||||
userAgent = [NSString stringWithFormat: @"SOGoMail %d.%d.%d",
|
userAgent = [NSString stringWithFormat: @"SOGoMail %@",
|
||||||
UIX_MAILER_MAJOR_VERSION,
|
SOGoVersion];
|
||||||
UIX_MAILER_MINOR_VERSION,
|
|
||||||
UIX_MAILER_SUBMINOR_VERSION];
|
|
||||||
[userAgent retain];
|
[userAgent retain];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -56,7 +56,7 @@ static BOOL debugOn = NO;
|
||||||
annotations (see davEntityTag below) */
|
annotations (see davEntityTag below) */
|
||||||
// if (![[ud objectForKey: @"SOGoMailDisableETag"] boolValue]) {
|
// if (![[ud objectForKey: @"SOGoMailDisableETag"] boolValue]) {
|
||||||
|
|
||||||
mailETag = [[NSString alloc] initWithFormat:@"\"imap4url_%d_%d_%03d\"",
|
mailETag = [[NSString alloc] initWithFormat:@"\"imap4url_%@_%@_%@\"",
|
||||||
UIX_MAILER_MAJOR_VERSION,
|
UIX_MAILER_MAJOR_VERSION,
|
||||||
UIX_MAILER_MINOR_VERSION,
|
UIX_MAILER_MINOR_VERSION,
|
||||||
UIX_MAILER_SUBMINOR_VERSION];
|
UIX_MAILER_SUBMINOR_VERSION];
|
||||||
|
|
|
@ -85,7 +85,7 @@ static BOOL debugSoParts = NO;
|
||||||
/* The following disabled code should not be needed, except if we use
|
/* The following disabled code should not be needed, except if we use
|
||||||
annotations (see davEntityTag below) */
|
annotations (see davEntityTag below) */
|
||||||
// if (![[ud objectForKey: @"SOGoMailDisableETag"] boolValue]) {
|
// if (![[ud objectForKey: @"SOGoMailDisableETag"] boolValue]) {
|
||||||
mailETag = [[NSString alloc] initWithFormat: @"\"imap4url_%d_%d_%03d\"",
|
mailETag = [[NSString alloc] initWithFormat: @"\"imap4url_%@_%@_%@\"",
|
||||||
UIX_MAILER_MAJOR_VERSION,
|
UIX_MAILER_MAJOR_VERSION,
|
||||||
UIX_MAILER_MINOR_VERSION,
|
UIX_MAILER_MINOR_VERSION,
|
||||||
UIX_MAILER_SUBMINOR_VERSION];
|
UIX_MAILER_SUBMINOR_VERSION];
|
||||||
|
|
|
@ -9,8 +9,6 @@ FRAMEWORK_NAME = SOGo
|
||||||
#SOGo_INSTALL_DIR = $(SOGO_LIBDIR)
|
#SOGo_INSTALL_DIR = $(SOGO_LIBDIR)
|
||||||
SOGo_INSTALL_DIR = $(DESTDIR)$(GNUSTEP_$(GNUSTEP_INSTALLATION_DOMAIN)_FRAMEWORKS)
|
SOGo_INSTALL_DIR = $(DESTDIR)$(GNUSTEP_$(GNUSTEP_INSTALLATION_DOMAIN)_FRAMEWORKS)
|
||||||
|
|
||||||
SOGo_VERSION=$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBMINOR_VERSION)
|
|
||||||
|
|
||||||
SOGo_HEADER_FILES = \
|
SOGo_HEADER_FILES = \
|
||||||
SOGoBuild.h \
|
SOGoBuild.h \
|
||||||
SOGoProductLoader.h \
|
SOGoProductLoader.h \
|
||||||
|
|
|
@ -1,16 +1,17 @@
|
||||||
# compilation settings
|
# compilation settings
|
||||||
|
|
||||||
SOGo_INCLUDE_DIRS += -I.. -I../../UI \
|
SOGo_INCLUDE_DIRS += -I.. -I../../UI
|
||||||
-DSOGO_MAJOR_VERSION="@\"$(MAJOR_VERSION)\"" \
|
|
||||||
-DSOGO_MINOR_VERSION="@\"$(MINOR_VERSION)\"" \
|
|
||||||
-DSOGO_SUBMINOR_VERSION="@\"$(SUBMINOR_VERSION)\""
|
|
||||||
|
|
||||||
HOSTNAME ?= $(shell hostname -f)
|
HOSTNAME ?= $(shell hostname -f)
|
||||||
BUILD_DATE = $(shell echo $$USER@$(HOSTNAME); date +"%Y%m%d%H%M")
|
BUILD_DATE = $(shell echo $$USER@$(HOSTNAME); date +"%Y%m%d%H%M")
|
||||||
|
|
||||||
ADDITIONAL_CPPFLAGS += \
|
ADDITIONAL_CPPFLAGS += \
|
||||||
-DSOGO_BUILD_DATE="@\"$(BUILD_DATE)\"" \
|
-DSOGO_BUILD_DATE="@\"$(BUILD_DATE)\"" \
|
||||||
-DSOGO_LIBDIR="\"$(SOGO_LIBDIR)\""
|
-DSOGO_LIBDIR="\"$(SOGO_LIBDIR)\"" \
|
||||||
|
-DSOGO_MAJOR_VERSION="@\"$(MAJOR_VERSION)\"" \
|
||||||
|
-DSOGO_MINOR_VERSION="@\"$(MINOR_VERSION)\"" \
|
||||||
|
-DSOGO_SUBMINOR_VERSION="@\"$(SUBMINOR_VERSION)\""
|
||||||
|
|
||||||
|
|
||||||
SOGo_LIBRARIES_DEPEND_UPON += \
|
SOGo_LIBRARIES_DEPEND_UPON += \
|
||||||
-Wl,--no-as-needed \
|
-Wl,--no-as-needed \
|
||||||
|
|
|
@ -2,6 +2,6 @@
|
||||||
|
|
||||||
ADDITIONAL_CPPFLAGS += \
|
ADDITIONAL_CPPFLAGS += \
|
||||||
-Wall -DCOMPILE_FOR_GSTEP_MAKE=1 \
|
-Wall -DCOMPILE_FOR_GSTEP_MAKE=1 \
|
||||||
-DSOGO_MAJOR_VERSION=$(MAJOR_VERSION) \
|
-DSOGO_MAJOR_VERSION="@\"$(MAJOR_VERSION)\"" \
|
||||||
-DSOGO_MINOR_VERSION=$(MINOR_VERSION) \
|
-DSOGO_MINOR_VERSION="@\"$(MINOR_VERSION)\"" \
|
||||||
-DSOGO_SUBMINOR_VERSION=$(SUBMINOR_VERSION)
|
-DSOGO_SUBMINOR_VERSION="@\"$(SUBMINOR_VERSION)\""
|
||||||
|
|
|
@ -67,7 +67,7 @@ static NSString *mailETag = nil;
|
||||||
|
|
||||||
+ (void) initialize
|
+ (void) initialize
|
||||||
{
|
{
|
||||||
mailETag = [[NSString alloc] initWithFormat:@"\"imap4url_%d_%d_%03d\"",
|
mailETag = [[NSString alloc] initWithFormat:@"\"imap4url_%@_%@_%@\"",
|
||||||
SOGO_MAJOR_VERSION,
|
SOGO_MAJOR_VERSION,
|
||||||
SOGO_MINOR_VERSION,
|
SOGO_MINOR_VERSION,
|
||||||
SOGO_SUBMINOR_VERSION];
|
SOGO_SUBMINOR_VERSION];
|
||||||
|
|
|
@ -44,18 +44,19 @@
|
||||||
#import <Appointments/SOGoAppointmentFolders.h>
|
#import <Appointments/SOGoAppointmentFolders.h>
|
||||||
|
|
||||||
#import <SOGo/NSString+Utilities.h>
|
#import <SOGo/NSString+Utilities.h>
|
||||||
|
#import <SOGo/SOGoBuild.h>
|
||||||
#import <SOGo/SOGoCache.h>
|
#import <SOGo/SOGoCache.h>
|
||||||
#import <SOGo/SOGoCASSession.h>
|
#import <SOGo/SOGoCASSession.h>
|
||||||
|
#import <SOGo/SOGoConstants.h>
|
||||||
#import <SOGo/SOGoDomainDefaults.h>
|
#import <SOGo/SOGoDomainDefaults.h>
|
||||||
#if defined(SAML2_CONFIG)
|
#if defined(SAML2_CONFIG)
|
||||||
#import <SOGo/SOGoSAML2Session.h>
|
#import <SOGo/SOGoSAML2Session.h>
|
||||||
#endif /* SAML2_ENABLE */
|
#endif /* SAML2_ENABLE */
|
||||||
|
#import <SOGo/SOGoSession.h>
|
||||||
#import <SOGo/SOGoSystemDefaults.h>
|
#import <SOGo/SOGoSystemDefaults.h>
|
||||||
#import <SOGo/SOGoUser.h>
|
#import <SOGo/SOGoUser.h>
|
||||||
#import <SOGo/SOGoUserManager.h>
|
#import <SOGo/SOGoUserManager.h>
|
||||||
#import <SOGo/SOGoWebAuthenticator.h>
|
#import <SOGo/SOGoWebAuthenticator.h>
|
||||||
#import <SOGo/SOGoSession.h>
|
|
||||||
#import <SOGo/SOGoConstants.h>
|
|
||||||
|
|
||||||
#import "SOGoRootPage.h"
|
#import "SOGoRootPage.h"
|
||||||
|
|
||||||
|
@ -514,10 +515,7 @@
|
||||||
{
|
{
|
||||||
NSString *aString;
|
NSString *aString;
|
||||||
|
|
||||||
aString = [NSString stringWithFormat: @"%d.%d.%d",
|
aString = [NSString stringWithString: SOGoVersion ];
|
||||||
SOGO_MAJOR_VERSION,
|
|
||||||
SOGO_MINOR_VERSION,
|
|
||||||
SOGO_SUBMINOR_VERSION];
|
|
||||||
|
|
||||||
return aString;
|
return aString;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue