Group all the user configuration file under a ".coriolis/" directory.
* Change: In CRL Core, in coriolisInit.py now read the configuration files from a ".coriolis2/" directory. This is to avoid too many dot files in the user's directory. Files have also been renamed: .coriolis2.conf ==> .coriolis2/settings.conf .coriolis2_techno.conf ==> .coriolis2/techno.conf * Change: In Kite, in kiteInit.py follow the same policy as CRL Core for configuration file. .coriolis2.kite.py ==> .coriolis2/kite.py
This commit is contained in:
parent
9c322501fe
commit
c244c9ce70
|
@ -1,5 +1,5 @@
|
|||
|
||||
install ( FILES coriolis2_techno.conf DESTINATION ${SYS_CONF_DIR}/coriolis2 )
|
||||
install ( FILES techno.conf DESTINATION ${SYS_CONF_DIR}/coriolis2 )
|
||||
install ( DIRECTORY common DESTINATION ${SYS_CONF_DIR}/coriolis2 )
|
||||
install ( DIRECTORY cmos DESTINATION ${SYS_CONF_DIR}/coriolis2 )
|
||||
install ( DIRECTORY vsc200 DESTINATION ${SYS_CONF_DIR}/coriolis2 )
|
||||
|
|
|
@ -86,10 +86,10 @@ def coriolisConfigure():
|
|||
|
||||
Cfg.Configuration.pushDefaultPriority ( Cfg.Parameter.Priority.ConfigurationFile )
|
||||
|
||||
technoFiles = [ helpers.sysConfDir+'/coriolis2_techno.conf' ]
|
||||
technoFiles = [ helpers.sysConfDir+'/techno.conf' ]
|
||||
if os.getenv('HOME'):
|
||||
technoFiles += [ os.getenv('HOME')+'/.coriolis2_techno.conf' ]
|
||||
technoFiles += [ os.getcwd()+'/.coriolis2_techno.conf' ]
|
||||
technoFiles += [ os.getenv('HOME')+'/.coriolis2/techno.conf' ]
|
||||
technoFiles += [ os.getcwd()+'/.coriolis2/techno.conf' ]
|
||||
|
||||
technoFiles.reverse()
|
||||
for technoFile in technoFiles:
|
||||
|
@ -121,13 +121,13 @@ def coriolisConfigure():
|
|||
, (helpers.sysConfDir+'/'+symbolicTechno+'/plugins.conf' , SystemFile|ConfigurationHelper)
|
||||
]
|
||||
if os.getenv('HOME'):
|
||||
confFiles += [ (os.getenv('HOME')+'/.coriolis2.conf', 0) ]
|
||||
confFiles += [ (os.getenv('HOME')+'/.coriolis2/settings.conf', 0) ]
|
||||
else:
|
||||
w = WarningMessage(['The <HOME> environment variable is not defined, this is most unusual.'
|
||||
,'It prevents the loading of ${HOME}/.coriolis2.conf'])
|
||||
,'It prevents the loading of ${HOME}/.coriolis2/settings.conf'])
|
||||
print w
|
||||
|
||||
confFiles += [ (os.getcwd()+'/.coriolis2.conf', 0) ]
|
||||
confFiles += [ (os.getcwd()+'/.coriolis2/settings.conf', 0) ]
|
||||
|
||||
|
||||
if helpers.xmlCompatMode:
|
||||
|
|
|
@ -33,7 +33,7 @@ def kiteHook ( **kw ):
|
|||
print ErrorMessage( 3, 'kiteHook(): Must be run from a KiteEngine.' )
|
||||
return
|
||||
|
||||
userInit = os.path.join( os.getcwd(), '.coriolis2.kite.py' )
|
||||
userInit = os.path.join( os.getcwd(), '.coriolis2/kite.py' )
|
||||
if (os.path.exists(userInit)):
|
||||
execfile( userInit )
|
||||
return
|
||||
|
|
Loading…
Reference in New Issue