supress 'MODULES' from all pyconf of each module

diff --git a/commands/config.py b/commands/config.py
index 300888441c78396c23de3f2e2a4dc895135d29fa..5071b811094b09d30ca88730136e74040a4ee099 100644 (file)
--- a/commands/config.py
+++ b/commands/config.py
@@ -297,7 +297,7 @@ class ConfigManager:
                     e = str(error)
                     raise src.SatException( e );
                 
-                merger.merge(cfg, mod_cfg)
+                merger.merge(cfg.MODULES, mod_cfg)
 
         # apply overwrite from command line if needed
         for rule in self.get_command_line_overrides(options, ["MODULES"]):

diff --git a/data/modules/KERNEL.pyconf b/data/modules/KERNEL.pyconf
index 973037f129f40e5628d7332fa02ea6d88758425d..bb3c00a108572225dbb2a3e3e7d60b9b6af1a215 100644 (file)
--- a/data/modules/KERNEL.pyconf
+++ b/data/modules/KERNEL.pyconf
@@ -1,28 +1,25 @@
-MODULES :
+KERNEL_7_7_1 :
 {
-       KERNEL_7_7_1 :
-       {
-               name : "KERNEL"
-           has_gui : "no"
-           compile_method : "cmake"
-           get_method : "git"
-           git_info:
-           {
-               repo : "http://git.salome-platform.org/gitpub/modules/kernel.git"
-               repo_dev : $SITE.prepare.default_git_server_dev + $VARS.sep + $name
-               tag : 'V7_7_1'
-           }
-           environ :
-           {
-               "_LD_LIBRARY_PATH" : "${SOFT_ROOT_DIR}" + $VARS.sep + "lib"
-               "_PYTHONPATH" : ["${SOFT_ROOT_DIR}" + $VARS.sep + "lib"
-                   "${SOFT_ROOT_DIR}" + $VARS.sep + "${PYTHON_LIBDIR0}"
-                   "${SOFT_ROOT_DIR}" + $VARS.sep + "${PYTHON_LIBDIR1}"]
-           }
-           depend : []
-           opt_depend : []
-           module_type : "sample"
-           source_dir : $APPLICATION.out_dir + $VARS.sep + 'SOURCES' + $VARS.sep + $name
-           build_dir : $APPLICATION.out_dir + $VARS.sep + 'BUILD' + $VARS.sep + $name
-       }
+       name : "KERNEL"
+    has_gui : "no"
+    compile_method : "cmake"
+    get_method : "git"
+    git_info:
+    {
+        repo : "http://git.salome-platform.org/gitpub/modules/kernel.git"
+        repo_dev : $SITE.prepare.default_git_server_dev + $VARS.sep + $name
+        tag : 'V7_7_1'
+    }
+    environ :
+    {
+        "_LD_LIBRARY_PATH" : "${SOFT_ROOT_DIR}" + $VARS.sep + "lib"
+        "_PYTHONPATH" : ["${SOFT_ROOT_DIR}" + $VARS.sep + "lib"
+            "${SOFT_ROOT_DIR}" + $VARS.sep + "${PYTHON_LIBDIR0}"
+            "${SOFT_ROOT_DIR}" + $VARS.sep + "${PYTHON_LIBDIR1}"]
+    }
+    depend : []
+    opt_depend : []
+    module_type : "sample"
+    source_dir : $APPLICATION.out_dir + $VARS.sep + 'SOURCES' + $VARS.sep + $name
+    build_dir : $APPLICATION.out_dir + $VARS.sep + 'BUILD' + $VARS.sep + $name
 }

diff --git a/data/modules/MODULE_ARCHIVE.pyconf b/data/modules/MODULE_ARCHIVE.pyconf
index 77ef5d050754d833b0a77a0ff2b88eb2568cabe6..5152d107e283d7b860a8f59f137f63bd3d85a427 100644 (file)
--- a/data/modules/MODULE_ARCHIVE.pyconf
+++ b/data/modules/MODULE_ARCHIVE.pyconf
@@ -1,33 +1,30 @@
-MODULES :
+MODULE_ARCHIVE :
 {
-       MODULE_ARCHIVE :
-       {
-               name : "MODULE_ARCHIVE"
-           has_gui : "no"
-           compile_method : "cmake"
-           get_method : "archive"
-           git_info:
-           {
-               repo : "http://git.salome-platform.org/gitpub/modules/kernel.git"
-               repo_dev : $SITE.prepare.default_git_server_dev + $VARS.sep + $name
-               tag : 'V7_7_1'
-           }
-           archive_info:
-           {
-                       archive_name : '/data/tmpsalome/salome/prerequis/archives/tclx8.4.tar.bz2'
-           }
-           environ :
-           {
-               "_LD_LIBRARY_PATH" : "${SOFT_ROOT_DIR}" + $VARS.sep + "lib"
-               "_PYTHONPATH" : ["${SOFT_ROOT_DIR}" + $VARS.sep + "lib"
-                   "${SOFT_ROOT_DIR}" + $VARS.sep + "${PYTHON_LIBDIR0}"
-                   "${SOFT_ROOT_DIR}" + $VARS.sep + "${PYTHON_LIBDIR1}"]
-           }
-           depend : []
-           opt_depend : []
-           module_type : "sample"
-           source_dir : $APPLICATION.out_dir + $VARS.sep + 'SOURCES' + $VARS.sep + $name
-           build_dir : $APPLICATION.out_dir + $VARS.sep + 'BUILD' + $VARS.sep + $name
-           patches : ['/home/salome/salomeTools-4.3.7/data/compil_scripts/patches/scipy.patch', '/export/home/serioja/MODULE_ARCHIVE.patch']
-       }
-}
+       name : "MODULE_ARCHIVE"
+    has_gui : "no"
+    compile_method : "cmake"
+    get_method : "archive"
+    git_info:
+    {
+        repo : "http://git.salome-platform.org/gitpub/modules/kernel.git"
+        repo_dev : $SITE.prepare.default_git_server_dev + $VARS.sep + $name
+        tag : 'V7_7_1'
+    }
+    archive_info:
+    {
+               archive_name : '/data/tmpsalome/salome/prerequis/archives/tclx8.4.tar.bz2'
+    }
+    environ :
+    {
+        "_LD_LIBRARY_PATH" : "${SOFT_ROOT_DIR}" + $VARS.sep + "lib"
+        "_PYTHONPATH" : ["${SOFT_ROOT_DIR}" + $VARS.sep + "lib"
+            "${SOFT_ROOT_DIR}" + $VARS.sep + "${PYTHON_LIBDIR0}"
+            "${SOFT_ROOT_DIR}" + $VARS.sep + "${PYTHON_LIBDIR1}"]
+    }
+    depend : []
+    opt_depend : []
+    module_type : "sample"
+    source_dir : $APPLICATION.out_dir + $VARS.sep + 'SOURCES' + $VARS.sep + $name
+    build_dir : $APPLICATION.out_dir + $VARS.sep + 'BUILD' + $VARS.sep + $name
+    patches : ['/home/salome/salomeTools-4.3.7/data/compil_scripts/patches/scipy.patch', '/export/home/serioja/MODULE_ARCHIVE.patch']
+}
\ No newline at end of file

diff --git a/data/modules/MODULE_CVS.pyconf b/data/modules/MODULE_CVS.pyconf
index 0f2686745e941fe2884ef152a690437ef2e37c6e..c8c75fc8fecbbe10289e7aa0da369ec952245a16 100644 (file)
--- a/data/modules/MODULE_CVS.pyconf
+++ b/data/modules/MODULE_CVS.pyconf
@@ -1,39 +1,36 @@
-MODULES :
+MODULE_CVS_6_7_0 :
 {
-       MODULE_CVS_6_7_0 :
-       {
-               name : "MODULE_CVS"
-           has_gui : "no"
-           compile_method : "cmake"
-           get_method : "cvs"
-           git_info:
-           {
-               repo : "http://git.salome-platform.org/gitpub/modules/kernel.git"
-               repo_dev : $SITE.prepare.default_git_server_dev + $VARS.sep + $name
-               tag : 'V7_7_1'
-           }
-           archive_info:
-           {
-                       archive_name : ''
-           }
-           cvs_info:
-           {
-               server : "cvs.opencascade.com"
-               module_base : "/home/server/cvs/KERNEL"
-               source : 'KERNEL_SRC'
-               tag : "V6_7_0"
-           }
-           environ :
-           {
-               "_LD_LIBRARY_PATH" : "${SOFT_ROOT_DIR}" + $VARS.sep + "lib"
-               "_PYTHONPATH" : ["${SOFT_ROOT_DIR}" + $VARS.sep + "lib"
-                   "${SOFT_ROOT_DIR}" + $VARS.sep + "${PYTHON_LIBDIR0}"
-                   "${SOFT_ROOT_DIR}" + $VARS.sep + "${PYTHON_LIBDIR1}"]
-           }
-           depend : []
-           opt_depend : []
-           module_type : "sample"
-           source_dir : $APPLICATION.out_dir + $VARS.sep + 'SOURCES' + $VARS.sep + $name
-           build_dir : $APPLICATION.out_dir + $VARS.sep + 'BUILD' + $VARS.sep + $name
-       }
-}
+       name : "MODULE_CVS"
+    has_gui : "no"
+    compile_method : "cmake"
+    get_method : "cvs"
+    git_info:
+    {
+        repo : "http://git.salome-platform.org/gitpub/modules/kernel.git"
+        repo_dev : $SITE.prepare.default_git_server_dev + $VARS.sep + $name
+        tag : 'V7_7_1'
+    }
+    archive_info:
+    {
+               archive_name : ''
+    }
+    cvs_info:
+    {
+        server : "cvs.opencascade.com"
+        module_base : "/home/server/cvs/KERNEL"
+        source : 'KERNEL_SRC'
+        tag : "V6_7_0"
+    }
+    environ :
+    {
+        "_LD_LIBRARY_PATH" : "${SOFT_ROOT_DIR}" + $VARS.sep + "lib"
+        "_PYTHONPATH" : ["${SOFT_ROOT_DIR}" + $VARS.sep + "lib"
+            "${SOFT_ROOT_DIR}" + $VARS.sep + "${PYTHON_LIBDIR0}"
+            "${SOFT_ROOT_DIR}" + $VARS.sep + "${PYTHON_LIBDIR1}"]
+    }
+    depend : []
+    opt_depend : []
+    module_type : "sample"
+    source_dir : $APPLICATION.out_dir + $VARS.sep + 'SOURCES' + $VARS.sep + $name
+    build_dir : $APPLICATION.out_dir + $VARS.sep + 'BUILD' + $VARS.sep + $name
+}
\ No newline at end of file

diff --git a/data/modules/MODULE_DIR.pyconf b/data/modules/MODULE_DIR.pyconf
index dccb5120839bc9ac5f613f52c8b99fd542f5eb46..bd5e5e6aace6162fbe684be6448698d0adfbd4ce 100644 (file)
--- a/data/modules/MODULE_DIR.pyconf
+++ b/data/modules/MODULE_DIR.pyconf
@@ -1,41 +1,38 @@
-MODULES :
+MODULE_DIR :
 {
-       MODULE_DIR :
-       {
-               name : "MODULE_DIR"
-           has_gui : "no"
-           compile_method : "cmake"
-           get_method : "dir"
-           git_info:
-           {
-               repo : "http://git.salome-platform.org/gitpub/modules/kernel.git"
-               repo_dev : $SITE.prepare.default_git_server_dev + $VARS.sep + $name
-               tag : 'V7_7_1'
-           }
-           archive_info:
-           {
-                       archive_name : '/data/tmpsalome/salome/prerequis/archives/tclx8.4.tar.bz2'
-           }
-           dir_info:
-           {
-                       dir : '/data/tmpsalome/salome/prerequis/tmp/hdf5-1.8.8debug'
-           }
-           svn_info:
-           {
-                       repo: 'https://www-svn-corpus.cea.fr/corpus/CORPUS'
-                       tag: 'master'
-           }
-           environ :
-           {
-               "_LD_LIBRARY_PATH" : "${SOFT_ROOT_DIR}" + $VARS.sep + "lib"
-               "_PYTHONPATH" : ["${SOFT_ROOT_DIR}" + $VARS.sep + "lib"
-                   "${SOFT_ROOT_DIR}" + $VARS.sep + "${PYTHON_LIBDIR0}"
-                   "${SOFT_ROOT_DIR}" + $VARS.sep + "${PYTHON_LIBDIR1}"]
-           }
-           depend : []
-           opt_depend : []
-           module_type : "sample"
-           source_dir : $APPLICATION.out_dir + $VARS.sep + 'SOURCES' + $VARS.sep + $name
-           build_dir : $APPLICATION.out_dir + $VARS.sep + 'BUILD' + $VARS.sep + $name
-       }
-}
+       name : "MODULE_DIR"
+    has_gui : "no"
+    compile_method : "cmake"
+    get_method : "dir"
+    git_info:
+    {
+        repo : "http://git.salome-platform.org/gitpub/modules/kernel.git"
+        repo_dev : $SITE.prepare.default_git_server_dev + $VARS.sep + $name
+        tag : 'V7_7_1'
+    }
+    archive_info:
+    {
+               archive_name : '/data/tmpsalome/salome/prerequis/archives/tclx8.4.tar.bz2'
+    }
+    dir_info:
+    {
+               dir : '/data/tmpsalome/salome/prerequis/tmp/hdf5-1.8.8debug'
+    }
+    svn_info:
+    {
+               repo: 'https://www-svn-corpus.cea.fr/corpus/CORPUS'
+               tag: 'master'
+    }
+    environ :
+    {
+        "_LD_LIBRARY_PATH" : "${SOFT_ROOT_DIR}" + $VARS.sep + "lib"
+        "_PYTHONPATH" : ["${SOFT_ROOT_DIR}" + $VARS.sep + "lib"
+            "${SOFT_ROOT_DIR}" + $VARS.sep + "${PYTHON_LIBDIR0}"
+            "${SOFT_ROOT_DIR}" + $VARS.sep + "${PYTHON_LIBDIR1}"]
+    }
+    depend : []
+    opt_depend : []
+    module_type : "sample"
+    source_dir : $APPLICATION.out_dir + $VARS.sep + 'SOURCES' + $VARS.sep + $name
+    build_dir : $APPLICATION.out_dir + $VARS.sep + 'BUILD' + $VARS.sep + $name
+}
\ No newline at end of file

diff --git a/data/modules/MODULE_SVN.pyconf b/data/modules/MODULE_SVN.pyconf
index 3624f40609375c708b5391644d0e0b9674d0a4ca..228f0e4770bd8af75e52e0c50b854c4ce8de1ff4 100644 (file)
--- a/data/modules/MODULE_SVN.pyconf
+++ b/data/modules/MODULE_SVN.pyconf
@@ -1,37 +1,34 @@
-MODULES :
+MODULE_SVN :
 {
-       MODULE_SVN :
-       {
-               name : "MODULE_SVN"
-           has_gui : "no"
-           compile_method : "cmake"
-           get_method : "svn"
-           git_info:
-           {
-               repo : "http://git.salome-platform.org/gitpub/modules/kernel.git"
-               repo_dev : $SITE.prepare.default_git_server_dev + $VARS.sep + $name
-               tag : 'V7_7_1'
-           }
-           archive_info:
-           {
-                       archive_name : '/data/tmpsalome/salome/prerequis/archives/tclx8.4.tar.bz2'
-           }
-           svn_info:
-           {
-                       repo: 'https://www-svn-corpus.cea.fr/corpus/CORPUS'
-                       tag: 'master'
-           }
-           environ :
-           {
-               "_LD_LIBRARY_PATH" : "${SOFT_ROOT_DIR}" + $VARS.sep + "lib"
-               "_PYTHONPATH" : ["${SOFT_ROOT_DIR}" + $VARS.sep + "lib"
-                   "${SOFT_ROOT_DIR}" + $VARS.sep + "${PYTHON_LIBDIR0}"
-                   "${SOFT_ROOT_DIR}" + $VARS.sep + "${PYTHON_LIBDIR1}"]
-           }
-           depend : []
-           opt_depend : []
-           module_type : "sample"
-           source_dir : $APPLICATION.out_dir + $VARS.sep + 'SOURCES' + $VARS.sep + $name
-           build_dir : $APPLICATION.out_dir + $VARS.sep + 'BUILD' + $VARS.sep + $name
-       }
-}
+       name : "MODULE_SVN"
+    has_gui : "no"
+    compile_method : "cmake"
+    get_method : "svn"
+    git_info:
+    {
+        repo : "http://git.salome-platform.org/gitpub/modules/kernel.git"
+        repo_dev : $SITE.prepare.default_git_server_dev + $VARS.sep + $name
+        tag : 'V7_7_1'
+    }
+    archive_info:
+    {
+               archive_name : '/data/tmpsalome/salome/prerequis/archives/tclx8.4.tar.bz2'
+    }
+    svn_info:
+    {
+               repo: 'https://www-svn-corpus.cea.fr/corpus/CORPUS'
+               tag: 'master'
+    }
+    environ :
+    {
+        "_LD_LIBRARY_PATH" : "${SOFT_ROOT_DIR}" + $VARS.sep + "lib"
+        "_PYTHONPATH" : ["${SOFT_ROOT_DIR}" + $VARS.sep + "lib"
+            "${SOFT_ROOT_DIR}" + $VARS.sep + "${PYTHON_LIBDIR0}"
+            "${SOFT_ROOT_DIR}" + $VARS.sep + "${PYTHON_LIBDIR1}"]
+    }
+    depend : []
+    opt_depend : []
+    module_type : "sample"
+    source_dir : $APPLICATION.out_dir + $VARS.sep + 'SOURCES' + $VARS.sep + $name
+    build_dir : $APPLICATION.out_dir + $VARS.sep + 'BUILD' + $VARS.sep + $name
+}
\ No newline at end of file

diff --git a/data/modules/softA.pyconf b/data/modules/softA.pyconf
index 13ab39b9791f6ddf0afff36c5f001766abb33bdc..c1b66bcd573fb89994ecf2f5b26035ccd98b8027 100644 (file)
--- a/data/modules/softA.pyconf
+++ b/data/modules/softA.pyconf
@@ -1,36 +1,33 @@
-MODULES :
+softA :
 {
-       softA :
-       {
-               name : "softA"
-           has_gui : "no"
-           compile_method : "cmake" # ou autotools, ou script
-           get_method : "git" # "archive", embedded", "native" "fixed"
-           cvs_info:
-           {
-               server : $SITE.prepare.default_cvs_server
-               module_base : $SITE.prepare.cvs_dir + $name
-               source : 'softA_SRC'
-               tag : ''
-           }
-           git_info:
-           {
-               repo : $SITE.prepare.default_git_server + $VARS.sep + $name
-               repo_dev : $SITE.prepare.default_git_server_dev + $VARS.sep + $name
-               tag : $APPLICATION.default_version_to_download
-           }
-           archive_info:
-           {
-               archive_name : $SITE.prepare.archive_dir + $VARS.sep +  $name + '.tar.gz'
-           }
-           environ :
-           {
-               "_LD_LIBRARY_PATH" : "${SOFT_ROOT_DIR}" + $VARS.sep + "lib"
-               "_PYTHONPATH" : ["${SOFT_ROOT_DIR}" + $VARS.sep + "lib"
-                   "${SOFT_ROOT_DIR}" + $VARS.sep + "${PYTHON_LIBDIR0}"
-                   "${SOFT_ROOT_DIR}" + $VARS.sep + "${PYTHON_LIBDIR1}"]
-           }
-           depend : []
-           opt_depend : []
-       }
+       name : "softA"
+    has_gui : "no"
+    compile_method : "cmake" # ou autotools, ou script
+    get_method : "git" # "archive", embedded", "native" "fixed"
+    cvs_info:
+    {
+        server : $SITE.prepare.default_cvs_server
+        module_base : $SITE.prepare.cvs_dir + $name
+        source : 'softA_SRC'
+        tag : ''
+    }
+    git_info:
+    {
+        repo : $SITE.prepare.default_git_server + $VARS.sep + $name
+        repo_dev : $SITE.prepare.default_git_server_dev + $VARS.sep + $name
+        tag : $APPLICATION.default_version_to_download
+    }
+    archive_info:
+    {
+        archive_name : $SITE.prepare.archive_dir + $VARS.sep +  $name + '.tar.gz'
+    }
+    environ :
+    {
+        "_LD_LIBRARY_PATH" : "${SOFT_ROOT_DIR}" + $VARS.sep + "lib"
+        "_PYTHONPATH" : ["${SOFT_ROOT_DIR}" + $VARS.sep + "lib"
+            "${SOFT_ROOT_DIR}" + $VARS.sep + "${PYTHON_LIBDIR0}"
+            "${SOFT_ROOT_DIR}" + $VARS.sep + "${PYTHON_LIBDIR1}"]
+    }
+    depend : []
+    opt_depend : []
 }
\ No newline at end of file

diff --git a/data/modules/softB.pyconf b/data/modules/softB.pyconf
index 0d648c5ae4599a37ce1c45881976d872edff8bc8..e433544689535d8d28b847f0ae89ac95e0451d4b 100644 (file)
--- a/data/modules/softB.pyconf
+++ b/data/modules/softB.pyconf
@@ -1,36 +1,33 @@
-MODULES :
+softB :
 {
-       softB :
-       {
-               name : "softB"
-           has_gui : "no"
-           compile_method : "cmake" # ou autotools, ou script
-           get_method : "git" # "archive", embedded", "native" "fixed"
-           cvs_info:
-           {
-               server : $SITE.prepare.default_cvs_server
-               module_base : $SITE.prepare.cvs_dir + $name
-               source : 'softB_SRC'
-               tag : ''
-           }
-           git_info:
-           {
-               repo : $SITE.prepare.default_git_server + $VARS.sep + $name
-               repo_dev : $SITE.prepare.default_git_server_dev + $VARS.sep + $name
-               tag : $APPLICATION.default_version_to_download
-           }
-           archive_info:
-           {
-               archive_name : $SITE.prepare.archive_dir + $VARS.sep +  $name + '.tar.gz'
-           }
-           environ :
-           {
-               "_LD_LIBRARY_PATH" : "${SOFT_ROOT_DIR}" + $VARS.sep + "lib"
-               "_PYTHONPATH" : ["${SOFT_ROOT_DIR}" + $VARS.sep + "lib"
-                   "${SOFT_ROOT_DIR}" + $VARS.sep + "${PYTHON_LIBDIR0}"
-                   "${SOFT_ROOT_DIR}" + $VARS.sep + "${PYTHON_LIBDIR1}"]
-           }
-           depend : ['softA']
-           opt_depend : []
-       }
+       name : "softB"
+    has_gui : "no"
+    compile_method : "cmake" # ou autotools, ou script
+    get_method : "git" # "archive", embedded", "native" "fixed"
+    cvs_info:
+    {
+        server : $SITE.prepare.default_cvs_server
+        module_base : $SITE.prepare.cvs_dir + $name
+        source : 'softB_SRC'
+        tag : ''
+    }
+    git_info:
+    {
+        repo : $SITE.prepare.default_git_server + $VARS.sep + $name
+        repo_dev : $SITE.prepare.default_git_server_dev + $VARS.sep + $name
+        tag : $APPLICATION.default_version_to_download
+    }
+    archive_info:
+    {
+        archive_name : $SITE.prepare.archive_dir + $VARS.sep +  $name + '.tar.gz'
+    }
+    environ :
+    {
+        "_LD_LIBRARY_PATH" : "${SOFT_ROOT_DIR}" + $VARS.sep + "lib"
+        "_PYTHONPATH" : ["${SOFT_ROOT_DIR}" + $VARS.sep + "lib"
+            "${SOFT_ROOT_DIR}" + $VARS.sep + "${PYTHON_LIBDIR0}"
+            "${SOFT_ROOT_DIR}" + $VARS.sep + "${PYTHON_LIBDIR1}"]
+    }
+    depend : ['softA']
+    opt_depend : []
 }
\ No newline at end of file

diff --git a/src/internal_config/salomeTools.pyconf b/src/internal_config/salomeTools.pyconf
index aa4a2917108b502634ae555d4ab9b5f586326701..d89f32dea2cfa8effc2e919bd4d8b4a934eb035f 100644 (file)
--- a/src/internal_config/salomeTools.pyconf
+++ b/src/internal_config/salomeTools.pyconf
@@ -9,4 +9,6 @@ INTERNAL :
        not_shown_commands : ["log"]
     }
 }
-
+MODULES :
+{
+}