gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-29 16:01:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Improve versioning macros

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@21279 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
CaS 2005-06-04 10:55:38 +00:00
parent 2676653a26
commit 2f39ffd602
5 changed files with 77 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Tools/AGSHtml.m
View file

@ -2368,12 +2368,12 @@ static NSString *mainFont = nil;
}
else if (add < 10)
{
[buf appendString: @"OPENSTEP"];
[buf appendString: @"OPENSTEP "];
[buf appendString: ovadd];
}
else
{
[buf appendString: @"MacOS-X"];
[buf appendString: @"MacOS-X "];
[buf appendString: ovadd];
}
if (dep > add)
@ -2381,12 +2381,12 @@ static NSString *mainFont = nil;
[buf appendString: @" deprecated at "];
if (add < 10)
{
[buf appendString: @"OPENSTEP"];
[buf appendString: @"OPENSTEP "];
[buf appendString: ovdep];
}
else
{
[buf appendString: @"MacOS-X"];
[buf appendString: @"MacOS-X "];
[buf appendString: ovdep];
}
}
@ -2395,12 +2395,12 @@ static NSString *mainFont = nil;
[buf appendString: @" removed at "];
if (add < 10)
{
[buf appendString: @"OPENSTEP"];
[buf appendString: @"OPENSTEP "];
[buf appendString: ovrem];
}
else
{
[buf appendString: @"MacOS-X"];
[buf appendString: @"MacOS-X "];
[buf appendString: ovrem];
}
}

55
Tools/AGSParser.m
View file

@ -2976,10 +2976,8 @@ fail:
ver = [self parseVersion];
if ([ver length] == 0)
{
ver = @"0";
ver = @"0.0.0";
}
i = [ver intValue];
ver = [NSString stringWithFormat: @"%d.%d", i/100, i%100];
if (openstep)
{
[top setObject: ver forKey: @"ovadd"];
@ -2997,12 +2995,10 @@ fail:
ver = [self parseVersion];
if ([ver length] == 0)
{
ver = @"9999";
ver = @"99.99.99";
}
i = [ver intValue];
if (i != 9999 && [ver isEqualToString: @"NEVER"] == NO)
if ([ver isEqualToString: @"99.99.99"] == NO)
{
ver = [NSString stringWithFormat: @"%d.%d", i/100, i%100];
if (openstep)
{
[top setObject: ver forKey: @"ovrem"];
@ -3020,12 +3016,10 @@ fail:
ver = [self parseVersion];
if ([ver length] == 0)
{
ver = @"9999";
ver = @"99.99.99";
}
i = [ver intValue];
if (i != 9999 && [ver isEqualToString: @"NEVER"] == NO)
if ([ver isEqualToString: @"99.99.99"] == NO)
{
ver = [NSString stringWithFormat: @"%d.%d", i/100, i%100];
if (openstep)
{
[top setObject: ver forKey: @"ovdep"];
@ -3343,7 +3337,8 @@ fail:
- (NSString*) parseVersion
{
unsigned start;
unsigned i;
NSString *str;
while (pos < length && [spaces characterIsMember: buffer[pos]] == YES)
{
@ -3355,18 +3350,40 @@ fail:
}
if (!isdigit(buffer[pos]))
{
return [self parseIdentifier];
str = [self parseIdentifier];
}
start = pos;
while (pos < length)
else
{
if (!isdigit(buffer[pos]))
i = pos;
while (pos < length)
{
break;
if (!isdigit(buffer[pos]))
{
break;
}
pos++;
}
pos++;
str = [NSString stringWithCharacters: &buffer[i] length: pos - i];
}
return [NSString stringWithCharacters: &buffer[start] length: pos - start];
if ([str isEqualToString: @"GS_API_LATEST"] == YES)
{
str = @"999999";
}
else if ([str isEqualToString: @"GS_API_OSSPEC"] == YES)
{
str = @"000000";
}
else if ([str isEqualToString: @"GS_API_OPENSTEP"] == YES)
{
str = @"000400";
}
else if ([str isEqualToString: @"GS_API_MACOSX"] == YES)
{
str = @"100000";
}
i = [str intValue];
return [NSString stringWithFormat: @"%d.%d.%d",
i/10000, (i/100)%100, i%100];
}
- (void) reset