From 27b1219a5d0585f348a86988598d241168202da5 Mon Sep 17 00:00:00 2001 From: Paul RASCLE Date: Tue, 26 Mar 2019 11:57:22 +0100 Subject: [PATCH] fix ADAO catalogs path --- resources/CMakeLists.txt | 4 ++-- src/daSalome/daGUI/daGuiImpl/adaoCase.py | 6 +++--- src/daSalome/daYacsSchemaCreator/methods.py | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt index b5845b2..7961ad3 100644 --- a/resources/CMakeLists.txt +++ b/resources/CMakeLists.txt @@ -19,7 +19,7 @@ # Author: Anthony Geay, anthony.geay@edf.fr, EDF R&D if(ADAO_SALOME_MODULE) - install(FILES SalomeApp.xml DESTINATION ${ADAO_RES}) + install(FILES SalomeApp.xml ADAOCatalog.xml DESTINATION ${ADAO_RES}) else(ADAO_SALOME_MODULE) - install(FILES ADAOCatalog.xml ADAOSchemaCatalog.xml DESTINATION ${ADAO_RES}) + install(FILES ADAOSchemaCatalog.xml DESTINATION ${ADAO_RES}) endif(ADAO_SALOME_MODULE) diff --git a/src/daSalome/daGUI/daGuiImpl/adaoCase.py b/src/daSalome/daGUI/daGuiImpl/adaoCase.py index f49e95c..82afbff 100644 --- a/src/daSalome/daGUI/daGuiImpl/adaoCase.py +++ b/src/daSalome/daGUI/daGuiImpl/adaoCase.py @@ -83,10 +83,10 @@ class AdaoCase: msg += "case with the ADAO/EFICAS editor." return msg - if "ADAO_ROOT_DIR" not in os.environ: - return "Please add ADAO_ROOT_DIR to your environnement." + if "ADAO_ENGINE_ROOT_DIR" not in os.environ: + return "Please add ADAO_ENGINE_ROOT_DIR to your environnement." - adao_path = os.environ["ADAO_ROOT_DIR"] + adao_path = os.environ["ADAO_ENGINE_ROOT_DIR"] adao_exe = adao_path + "/bin/salome/AdaoYacsSchemaCreator.py" args = ["python", adao_exe, filename, self.yacs_filename] p = subprocess.Popen(args) diff --git a/src/daSalome/daYacsSchemaCreator/methods.py b/src/daSalome/daYacsSchemaCreator/methods.py index 7b275e3..09e79f6 100644 --- a/src/daSalome/daYacsSchemaCreator/methods.py +++ b/src/daSalome/daYacsSchemaCreator/methods.py @@ -56,7 +56,7 @@ def create_yacs_proc(study_config): l.registerProcCataLoader() runtime = pilot.getRuntime() try: - catalogAd = runtime.loadCatalog("proc", os.environ["ADAO_ROOT_DIR"] + "/share/salome/resources/adao/ADAOSchemaCatalog.xml") + catalogAd = runtime.loadCatalog("proc", os.environ["ADAO_ENGINE_ROOT_DIR"] + "/share/salome/resources/adao/ADAOSchemaCatalog.xml") runtime.addCatalog(catalogAd) except: raise ValueError("Exception in loading ADAO YACS Schema catalog") -- 2.39.2