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

Monotone-Parent: 10ffe772d1b4699a4fc8aa41c3f3354e492d3e35 

Monotone-Revision: 2f3c94605759601f796021ed2469cb5eb7910364

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2011-03-30T15:01:55
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2011-03-30 15:01:55 +00:00
parent 5708eb23a3
commit e8026e67c8
11 changed files with 34 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -1,5 +1,7 @@
2011-03-30 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/SOGo/SOGoBuild.m: export new SOGoVersion NSString.
* Main/SOGo.m (+initialize): moved most initialization code from
-init and -run here since this method is invoked before forking
and data memory is in "copy-on-write" mode, slightly reducing

5
Main/GNUmakefile.preamble
View File

@ -1,10 +1,7 @@
# compile settings
ADDITIONAL_CPPFLAGS += \
-D_GNU_SOURCE \
-DSOGO_MAJOR_VERSION=$(MAJOR_VERSION) \
-DSOGO_MINOR_VERSION=$(MINOR_VERSION) \
-DSOGO_SUBMINOR_VERSION=$(SUBMINOR_VERSION)
-D_GNU_SOURCE
ADDITIONAL_INCLUDE_DIRS += \
-I../SOPE/ \

5
Main/SOGo.m
View File

@ -106,9 +106,8 @@ static BOOL debugLeaks;
SoClassSecurityInfo *sInfo;
NSArray *basicRoles;
[self logWithFormat: @"version %d.%d.%d (build %@) -- starting",
SOGO_MAJOR_VERSION, SOGO_MINOR_VERSION, SOGO_SUBMINOR_VERSION,
SOGoBuildDate];
[self logWithFormat: @"version %@ (build %@) -- starting",
SOGoVersion, SOGoBuildDate];
defaults = [SOGoSystemDefaults sharedSystemDefaults];
doCrashOnSessionCreate = [defaults crashOnSessionCreate];

5
SoObjects/Appointments/SOGoAppointmentFolderObject.m
View File

@ -32,6 +32,7 @@
#import <NGCards/iCalCalendar.h>
#import <NGCards/iCalTimeZone.h>
#import <SOGo/SOGoBuild.h>
#import <SOGo/SOGoDomainDefaults.h>
#import <SOGo/SOGoUser.h>
@ -220,7 +221,9 @@ static NSArray *contentFields = nil;
calendar = [iCalCalendar groupWithTag: @"vcalendar"];
[calendar setMethod: @"PUBLISH"];
[calendar setVersion: @"2.0"];
[calendar setProdID: @"-//Inverse inc./SOGo 1.0//EN"];
[calendar setProdID: [NSString stringWithFormat:
@"-//Inverse inc./SOGo %@//EN",
SOGoVersion]];
[calendar addChildren: [timeZones allValues]];
[calendar addChildren: components];

8
SoObjects/Appointments/SOGoCalendarComponent.m
View File

@ -47,6 +47,7 @@
#import <SOGo/NSObject+DAV.h>
#import <SOGo/NSObject+Utilities.h>
#import <SOGo/NSString+Utilities.h>
#import <SOGo/SOGoBuild.h>
#import <SOGo/SOGoDomainDefaults.h>
#import <SOGo/SOGoMailer.h>
#import <SOGo/SOGoGroup.h>
@ -428,7 +429,7 @@ static inline BOOL _occurenceHasID (iCalRepeatableEntityObject *occurence,
{
iCalRepeatableEntityObject *newComponent;
iCalCalendar **calendar, *returnedCopy;
NSString *iCalString, *tag;
NSString *iCalString, *tag, *prodID;
if (secure)
calendar = &safeCalendar;
@ -454,7 +455,10 @@ static inline BOOL _occurenceHasID (iCalRepeatableEntityObject *occurence,
{
ASSIGN (*calendar, [iCalCalendar groupWithTag: @"vcalendar"]);
[*calendar setVersion: @"2.0"];
[*calendar setProdID: @"-//Inverse inc./SOGo 1.0//EN"];
prodID = [NSString stringWithFormat:
@"-//Inverse inc./SOGo %@//EN",
SOGoVersion];
[*calendar setProdID: prodID];
tag = [[self componentTag] uppercaseString];
newComponent = [[*calendar classForTag: tag]
groupWithTag: tag];

5
SoObjects/Appointments/SOGoFreeBusyObject.m
View File

@ -31,6 +31,7 @@
#import <NGCards/iCalFreeBusy.h>
#import <NGCards/iCalPerson.h>
#import <SOGo/SOGoBuild.h>
#import <SOGo/SOGoDomainDefaults.h>
#import <SOGo/SOGoUser.h>
#import <SOGo/SOGoUserDefaults.h>
@ -106,7 +107,9 @@
user = [SOGoUser userWithLogin: login];
calendar = [iCalCalendar groupWithTag: @"vcalendar"];
[calendar setProdID: @"//Inverse inc./SOGo 1.0//EN"];
[calendar setProdID: [NSString stringWithFormat:
@"-//Inverse inc./SOGo %@//EN",
SOGoVersion]];
[calendar setVersion: @"2.0"];
if (method)
[calendar setMethod: method];

6
SoObjects/Contacts/SOGoContactLDIFEntry.m
View File

@ -28,6 +28,8 @@
#import <NGCards/NGVCard.h>
#import <NGCards/CardVersitRenderer.h>
#import <SOGo/SOGoBuild.h>
#import "SOGoContactGCSEntry.h"
#import "SOGoContactLDIFEntry.h"
@ -115,7 +117,9 @@
{
vcard = [[NGVCard alloc] initWithUid: [self nameInContainer]];
[vcard setVClass: @"PUBLIC"];
[vcard setProdID: @"-//Inverse inc./SOGo 1.0//EN"];
[vcard setProdID: [NSString
stringWithFormat: @"-//Inverse inc./SOGo %@//EN",
SOGoVersion]];
[vcard setProfile: @"VCARD"];
info = [ldifEntry objectForKey: @"c_cn"];
if (![info length])

5
SoObjects/SOGo/GNUmakefile.preamble
View File

@ -1,6 +1,9 @@
# compilation settings
SOGo_INCLUDE_DIRS += -I.. -I../../UI -DSOGO_MAJOR_VERSION="\"$(MAJOR_VERSION)\"" -DSOGO_MINOR_VERSION="\"$(MINOR_VERSION)\""
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)
BUILD_DATE = $(shell echo $$USER@$(HOSTNAME); date +"%Y%m%d%H%M")

1
SoObjects/SOGo/SOGoBuild.h
View File

@ -24,5 +24,6 @@
#define BUILD_H
extern NSString *SOGoBuildDate;
extern NSString *SOGoVersion;
#endif /* BUILD_H */

3
SoObjects/SOGo/SOGoBuild.m
View File

@ -23,3 +23,6 @@
#import <Foundation/NSString.h>
NSString *SOGoBuildDate = SOGO_BUILD_DATE;
NSString *SOGoVersion = (SOGO_MAJOR_VERSION
@"." SOGO_MINOR_VERSION
@"." SOGO_SUBMINOR_VERSION);

6
UI/MailerUI/UIxMailView.m
View File

@ -38,6 +38,7 @@
#import <NGImap4/NGImap4EnvelopeAddress.h>
#import <SOGo/NSString+Utilities.h>
#import <SOGo/SOGoBuild.h>
#import <SOGo/SOGoMailer.h>
#import <SOGo/SOGoUser.h>
#import <SOGo/SOGoUserDefaults.h>
@ -399,10 +400,7 @@ static NSString *mailETag = nil;
[map release];
mdnPartMessage = [[NSMutableString alloc] initWithCapacity: 100];
[mdnPartMessage appendFormat: @"Reporting-UA: SOGoMail %d.%d.%d\n",
SOGO_MAJOR_VERSION,
SOGO_MINOR_VERSION,
SOGO_SUBMINOR_VERSION];
[mdnPartMessage appendFormat: @"Reporting-UA: SOGoMail %@\n", SOGoVersion];
[mdnPartMessage appendFormat: @"Final-Recipient: rfc822;%@\n",
[self _matchingIdentityEMail]];
messageId = [[self clientObject] messageId];