fix ADAO catalogs path

diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt
index b5845b2fec3c2979db32ef7ff39aa2179fac44ae..7961ad3c4eb8bf9ec2dd876b670bf0835cd3a3fd 100644 (file)
--- 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 f49e95cfe62afa2d135cf34b089c70a8a90c410c..82afbff48209abfe3ea0e4908165220db911aff5 100644 (file)
--- 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 7b275e35815590923fff457c36baf6df2c9cd875..09e79f6f56f4514fc2fba9bfa13a7a04616c0dae 100644 (file)
--- 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")