*** empty log message ***

diff --git a/Aster/Cata/cataSTA7/__init__.py b/Aster/Cata/cataSTA7/__init__.py
index 273d71158b8186d8ae593b5849edf75351738ea5..118185c9985621b2f1caacad026e45c84e2b20f6 100644 (file)
--- a/Aster/Cata/cataSTA7/__init__.py
+++ b/Aster/Cata/cataSTA7/__init__.py
@@ -2,6 +2,9 @@ import os,sys
 sys.modules["Cata"]=sys.modules[__name__]
 rep_macro = os.path.dirname(__file__)
 sys.path.insert(0,rep_macro)
+rep_macro=os.path.join(rep_macro,'Macro')
+sys.path.insert(0,rep_macro)
+
 
 #compatibilite avec V9
 import Noyau

diff --git a/Aster/Cata/cataSTA8/__init__.py b/Aster/Cata/cataSTA8/__init__.py
index 85c508961af7b98aa8df238b7ae8e301c64067d6..da728a1c866d924f1490a496050029954ea935a7 100644 (file)
--- a/Aster/Cata/cataSTA8/__init__.py
+++ b/Aster/Cata/cataSTA8/__init__.py
@@ -2,6 +2,9 @@ import os,sys
 sys.modules["Cata"]=sys.modules[__name__]
 rep_macro = os.path.dirname(__file__)
 sys.path.insert(0,rep_macro)
+rep_macro=os.path.join(rep_macro,'Macro')
+sys.path.insert(0,rep_macro)
+
 
 #compatibilite avec V9
 import Noyau

diff --git a/Aster/Cata/cataSTA9/__init__.py b/Aster/Cata/cataSTA9/__init__.py
index ea9a6f6bf308b4e78635bf1ffd1a0f288968e5a8..f6816918a5865a037ac5a21d555aa13f67b02c0d 100644 (file)
--- a/Aster/Cata/cataSTA9/__init__.py
+++ b/Aster/Cata/cataSTA9/__init__.py
@@ -2,6 +2,8 @@ import os,sys
 sys.modules["Cata"]=sys.modules[__name__]
 rep_macro = os.path.dirname(__file__)
 sys.path.insert(0,rep_macro)
+rep_macro=os.path.join(rep_macro,'Macro')
+sys.path.insert(0,rep_macro)
 
 from cata import *
 from math import ceil

diff --git a/Aster/sdist.py b/Aster/sdist.py
index af1cf5cf345980e80b2242fbae8f034dec3420d4..798d24fdafc4dafb17a3cfac57436974779a9129 100644 (file)
--- a/Aster/sdist.py
+++ b/Aster/sdist.py
@@ -26,7 +26,7 @@ version="$Name:  $"[7:-2] or 'Test1_4'
 # ==========Path du noyau fourni par Aster====================
 path_Noyau="../../AccasAster"
 # ============================================================
-nom_distrib="Eficas"+version+"AsterSTA8"
+nom_distrib="Eficas"+version+"AsterSTA9"
 path_distrib=os.path.join("dist",nom_distrib)
 path_TextTools="/home/eficas/pkg/mxTools/egenix2.0.2pourWindows/mx/TextTools"
 dir_download= "/home/eficas/WWW/telechargement/eficas"
@@ -56,7 +56,7 @@ def main():
                                                            ])
 
    # Les Catalogues, Macros, Materiaux et SD
-   #copyfiles('Cata/Utilitai',os.path.join(path_distrib,'Aster','Cata','Utilitai'),['*.py'])
+   copyfiles('Cata/Utilitai',os.path.join(path_distrib,'Aster','Cata','Utilitai'),['*.py'])
    copyfiles('Cata/pre74',os.path.join(path_distrib,'Aster','Cata','pre74'),['*.py'])
 
    copyfiles('Cata/cataSTA6',os.path.join(path_distrib,'Aster','Cata','cataSTA6'),['*.py'])