From c244c9ce705c17506d246bd17359abe07bc1b13a Mon Sep 17 00:00:00 2001 From: Jean-Paul Chaput Date: Sat, 27 Sep 2014 17:40:35 +0200 Subject: [PATCH] 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 --- crlcore/etc/CMakeLists.txt | 2 +- crlcore/etc/{coriolis2_techno.conf => techno.conf} | 0 crlcore/src/crlcore/coriolisInit.py | 12 ++++++------ kite/src/init/kiteInit.py | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) rename crlcore/etc/{coriolis2_techno.conf => techno.conf} (100%) diff --git a/crlcore/etc/CMakeLists.txt b/crlcore/etc/CMakeLists.txt index 874674ed..68cc8b71 100644 --- a/crlcore/etc/CMakeLists.txt +++ b/crlcore/etc/CMakeLists.txt @@ -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 ) diff --git a/crlcore/etc/coriolis2_techno.conf b/crlcore/etc/techno.conf similarity index 100% rename from crlcore/etc/coriolis2_techno.conf rename to crlcore/etc/techno.conf diff --git a/crlcore/src/crlcore/coriolisInit.py b/crlcore/src/crlcore/coriolisInit.py index 6425cb09..214b0da2 100644 --- a/crlcore/src/crlcore/coriolisInit.py +++ b/crlcore/src/crlcore/coriolisInit.py @@ -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 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: diff --git a/kite/src/init/kiteInit.py b/kite/src/init/kiteInit.py index 1a064b16..b4f75c80 100644 --- a/kite/src/init/kiteInit.py +++ b/kite/src/init/kiteInit.py @@ -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