gnustep/libs-ec
0
0
Fork 0
mirror of https://github.com/gnustep/libs-ec.git synced 2025-06-01 01:41:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

tweaks for allowing registration domain values to be defined

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/devmodules/dev-libs/ec@34937 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2012-03-16 11:19:17 +00:00
parent 905aaf9e33
commit 6b1f4df262
3 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Console.m
View file

@ -47,6 +47,7 @@ inner_main()
cmdVersion(@"$Date: 2012-02-13 08:11:49 +0000 (Mon, 13 Feb 2012) $ $Revision: 65934 $"); cmdVersion(@"$Date: 2012-02-13 08:11:49 +0000 (Mon, 13 Feb 2012) $ $Revision: 65934 $");
defs = [NSDictionary dictionaryWithObjectsAndKeys: defs = [NSDictionary dictionaryWithObjectsAndKeys:
@"NO", @"Daemon",
#if defined(EC_REGISTRATION_DOMAIN) #if defined(EC_REGISTRATION_DOMAIN)
EC_REGISTRATION_DOMAIN EC_REGISTRATION_DOMAIN
#endif #endif

7
EcConsole.m
View file

@ -690,7 +690,12 @@ static BOOL commandIsRepeat (NSString *string)
appDefaults = [NSDictionary dictionaryWithObjects: objects appDefaults = [NSDictionary dictionaryWithObjects: objects
forKeys: keys forKeys: keys
count: NUMARGS]; count: NUMARGS];
self = [super initWithDefaults: appDefaults]; return [self initWithDefaults: appDefaults];
}
- (id) initWithDefaults: (NSDictionary*)defs
{
self = [super initWithDefaults: defs];
if (self) if (self)
{ {
NSUserDefaults *defs = [self cmdDefaults]; NSUserDefaults *defs = [self cmdDefaults];

4
local.make
View file

@ -29,7 +29,6 @@ ECCL_CPPFLAGS += \
'-DEC_DEFAULTS_PREFIX=@"BS"'\ '-DEC_DEFAULTS_PREFIX=@"BS"'\
'-DEC_DEFAULTS_STRICT=NO'\ '-DEC_DEFAULTS_STRICT=NO'\
'-DEC_EFFECTIVE_USER=@"brains99"'\ '-DEC_EFFECTIVE_USER=@"brains99"'\
'-DEC_REGISTRATION_DOMAIN=@"1.3.6.1.4.1.39543.3.0.1",@"TrapOID",@"1.3.6.1.4.1.39543.1",@"AlarmsOID",@"1.3.6.1.4.1.39543.2",@"ObjectsOID",'\
# Command_CPPFLAGS ... # Command_CPPFLAGS ...
# Allow an alternative base class to be specified ... # Allow an alternative base class to be specified ...
@ -49,6 +48,9 @@ Console_CPPFLAGS += \
# Allow an alternative base class to be specified ... # Allow an alternative base class to be specified ...
# The file containing that class will also need to be added to the build/link # The file containing that class will also need to be added to the build/link
# flags if it's not in the standard libraries. # flags if it's not in the standard libraries.
# The Control server contains the SNMP alarming support, so we may want to
# define the OID settings for that.
Control_CPPFLAGS += \ Control_CPPFLAGS += \
'-DEC_BASE_CLASS=EcControl'\ '-DEC_BASE_CLASS=EcControl'\
'-DEC_REGISTRATION_DOMAIN=@"1.3.6.1.4.1.39543.3.0.1",@"TrapOID",@"1.3.6.1.4.1.39543.1",@"AlarmsOID",@"1.3.6.1.4.1.39543.2",@"ObjectsOID",'\