LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
pull/7/head
Jean Raby 2012-12-21 13:55:03 -05:00
parent 4971e8d05a
commit ea26e0cc0a
9 changed files with 22 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
SoObjects/Mailer/GNUmakefile.preamble
View File

@ -2,6 +2,6 @@
ADDITIONAL_CPPFLAGS += \
-Wall -DCOMPILE_FOR_GSTEP_MAKE=1 \
-DUIX_MAILER_MAJOR_VERSION=$(MAJOR_VERSION) \
-DUIX_MAILER_MINOR_VERSION=$(MINOR_VERSION) \
-DUIX_MAILER_SUBMINOR_VERSION=$(SUBMINOR_VERSION)
-DUIX_MAILER_MAJOR_VERSION="@\"$(MAJOR_VERSION)\"" \
-DUIX_MAILER_MINOR_VERSION="@\"$(MINOR_VERSION)\"" \
-DUIX_MAILER_SUBMINOR_VERSION="@\"$(SUBMINOR_VERSION)\""

7
SoObjects/Mailer/SOGoDraftObject.m
View File

@ -57,6 +57,7 @@
#import <SOGo/NSArray+Utilities.h>
#import <SOGo/NSCalendarDate+SOGo.h>
#import <SOGo/NSString+Utilities.h>
#import <SOGo/SOGoBuild.h>
#import <SOGo/SOGoDomainDefaults.h>
#import <SOGo/SOGoMailer.h>
#import <SOGo/SOGoUser.h>
@ -176,10 +177,8 @@ static NSString *userAgent = nil;
{
MultiMixedType = [NGMimeType mimeType: @"multipart" subType: @"mixed"];
[MultiMixedType retain];
userAgent = [NSString stringWithFormat: @"SOGoMail %d.%d.%d",
UIX_MAILER_MAJOR_VERSION,
UIX_MAILER_MINOR_VERSION,
UIX_MAILER_SUBMINOR_VERSION];
userAgent = [NSString stringWithFormat: @"SOGoMail %@",
SOGoVersion];
[userAgent retain];
}

2
SoObjects/Mailer/SOGoMailBodyPart.m
View File

@ -56,7 +56,7 @@ static BOOL debugOn = NO;
annotations (see davEntityTag below) */
// if (![[ud objectForKey: @"SOGoMailDisableETag"] boolValue]) {
mailETag = [[NSString alloc] initWithFormat:@"\"imap4url_%d_%d_%03d\"",
mailETag = [[NSString alloc] initWithFormat:@"\"imap4url_%@_%@_%@\"",
UIX_MAILER_MAJOR_VERSION,
UIX_MAILER_MINOR_VERSION,
UIX_MAILER_SUBMINOR_VERSION];

2
SoObjects/Mailer/SOGoMailObject.m
View File

@ -85,7 +85,7 @@ static BOOL debugSoParts = NO;
/* The following disabled code should not be needed, except if we use
annotations (see davEntityTag below) */
// if (![[ud objectForKey: @"SOGoMailDisableETag"] boolValue]) {
mailETag = [[NSString alloc] initWithFormat: @"\"imap4url_%d_%d_%03d\"",
mailETag = [[NSString alloc] initWithFormat: @"\"imap4url_%@_%@_%@\"",
UIX_MAILER_MAJOR_VERSION,
UIX_MAILER_MINOR_VERSION,
UIX_MAILER_SUBMINOR_VERSION];

2
SoObjects/SOGo/GNUmakefile
View File

@ -9,8 +9,6 @@ FRAMEWORK_NAME = SOGo
#SOGo_INSTALL_DIR = $(SOGO_LIBDIR)
SOGo_INSTALL_DIR = $(DESTDIR)$(GNUSTEP_$(GNUSTEP_INSTALLATION_DOMAIN)_FRAMEWORKS)
SOGo_VERSION=$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBMINOR_VERSION)
SOGo_HEADER_FILES = \
SOGoBuild.h \
SOGoProductLoader.h \

11
SoObjects/SOGo/GNUmakefile.preamble
View File

@ -1,16 +1,17 @@
# compilation settings
SOGo_INCLUDE_DIRS += -I.. -I../../UI \
-DSOGO_MAJOR_VERSION="@\"$(MAJOR_VERSION)\"" \
-DSOGO_MINOR_VERSION="@\"$(MINOR_VERSION)\"" \
-DSOGO_SUBMINOR_VERSION="@\"$(SUBMINOR_VERSION)\""
SOGo_INCLUDE_DIRS += -I.. -I../../UI
HOSTNAME ?= $(shell hostname -f)
BUILD_DATE = $(shell echo $$USER@$(HOSTNAME); date +"%Y%m%d%H%M")
ADDITIONAL_CPPFLAGS += \
-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 += \
-Wl,--no-as-needed \

6
UI/MailerUI/GNUmakefile.preamble
View File

@ -2,6 +2,6 @@
ADDITIONAL_CPPFLAGS += \
-Wall -DCOMPILE_FOR_GSTEP_MAKE=1 \
-DSOGO_MAJOR_VERSION=$(MAJOR_VERSION) \
-DSOGO_MINOR_VERSION=$(MINOR_VERSION) \
-DSOGO_SUBMINOR_VERSION=$(SUBMINOR_VERSION)
-DSOGO_MAJOR_VERSION="@\"$(MAJOR_VERSION)\"" \
-DSOGO_MINOR_VERSION="@\"$(MINOR_VERSION)\"" \
-DSOGO_SUBMINOR_VERSION="@\"$(SUBMINOR_VERSION)\""

2
UI/MailerUI/UIxMailView.m
View File

@ -67,7 +67,7 @@ static NSString *mailETag = nil;
+ (void) initialize
{
mailETag = [[NSString alloc] initWithFormat:@"\"imap4url_%d_%d_%03d\"",
mailETag = [[NSString alloc] initWithFormat:@"\"imap4url_%@_%@_%@\"",
SOGO_MAJOR_VERSION,
SOGO_MINOR_VERSION,
SOGO_SUBMINOR_VERSION];

10
UI/MainUI/SOGoRootPage.m
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;
}