PN : on change les catalogues de place

diff --git a/Aster/alphasdist.py b/Aster/alphasdist.py
index babc365d73e070423641612538657cccdd4af2cb..7dadcfbf2a2fb076c81c803d9f9fad9d63b28167 100644 (file)
--- a/Aster/alphasdist.py
+++ b/Aster/alphasdist.py
@@ -44,7 +44,6 @@ def main():
    copyfiles('../Accas',os.path.join(path_distrib,'Accas'),['*.py'])
 # Packages globaux (pour toutes les versions sauf surcharge)
    copyfiles('../Aster/Cata',os.path.join(path_distrib,'Aster','Cata'),['*.py', ])
-   copyfiles('Cata/Macro',os.path.join(path_distrib,'Aster','Cata','Macro'),['*.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'])
 # version 5
@@ -58,6 +57,10 @@ def main():
 #version 7.4
    copyfiles('Cata/cataSTA74',os.path.join(path_distrib,'Aster','Cata','cataSTA74'),['*.py'])
    copyfiles('Cata/cataSTA74/Macro',os.path.join(path_distrib,'Aster','Cata','cataSTA74','Macro'),['*.py'])
+#version 8 
+   copyfiles('Cata/cataSTA8',os.path.join(path_distrib,'Aster','Cata','cataSTA8'),['*.py'])
+   copyfiles('Cata/cataSTA8/Macro',os.path.join(path_distrib,'Aster','Cata','cataSTA8','Macro'),['*.py'])
+
    copyfiles('../AIDE',os.path.join(path_distrib,'AIDE'),['*.py'])
    copyfiles('../AIDE/fichiers',os.path.join(path_distrib,'AIDE','fichiers'),['*'])
    copyfiles('../Aster',os.path.join(path_distrib,'Aster'),['prefs.py',

diff --git a/Aster/editeur.ini b/Aster/editeur.ini
index bcb8e43f88a86bb3feb92b52199d4efd9384a958..6d8a07b16ea92ed8e132067941bec371beeb3860 100644 (file)
--- a/Aster/editeur.ini
+++ b/Aster/editeur.ini
@@ -45,6 +45,6 @@ catalogues = (
               ('ASTER','v6',os.path.join(rep_cata,'cataSTA6'),'python6'),
               #('ASTER','v73',os.path.join(rep_cata,'cataSTA73'),'python','defaut'),
               ('ASTER','v74',os.path.join(rep_cata,'cataSTA74'),'python'),
-              ('ASTER','v8',os.path.join(rep_cata,'cata_STA8.py'),'python','defaut'),
+              ('ASTER','v8',os.path.join(rep_cata,'cataSTA8'),'python','defaut'),
              )
 

diff --git a/Aster/sdist.py b/Aster/sdist.py
index f8094796a9941e47f728cac40a3b359bdb9731d1..8d5a2cef993d71365c704ad3933e7c42824d2904 100644 (file)
--- a/Aster/sdist.py
+++ b/Aster/sdist.py
@@ -51,6 +51,7 @@ def main():
                                                             'editeur.ini',
                                                             'eficas_aster.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/cataSTA5',os.path.join(path_distrib,'Aster','Cata','cataSTA5'),['*.py'])
    copyfiles('Cata/cataSTA6',os.path.join(path_distrib,'Aster','Cata','cataSTA6'),['*.py'])
@@ -58,25 +59,26 @@ def main():
    copyfiles('Cata/cataSTA73/Macro',os.path.join(path_distrib,'Aster','Cata','cataSTA73','Macro'),['*.py'])
    copyfiles('Cata/cataSTA74',os.path.join(path_distrib,'Aster','Cata','cataSTA74'),['*.py'])
    copyfiles('Cata/cataSTA74/Macro',os.path.join(path_distrib,'Aster','Cata','cataSTA74','Macro'),['*.py'])
-
-
+   copyfiles('Cata/cataSTA8',os.path.join(path_distrib,'Aster','Cata','cataSTA8'),['*.py'])
 
    copyfiles('../convert',os.path.join(path_distrib,'convert'),['*.py'])
    copyfiles('../convert/Parserv5',os.path.join(path_distrib,'convert','Parserv5'),['*.py'])
-
    copyfiles('../generator',os.path.join(path_distrib,'generator'),['*.py'])
-
    copyfiles('../Editeur/icons',os.path.join(path_distrib,'Editeur','icons'),['*.gif'])
 
    copyfiles(os.path.join(path_Noyau,'Noyau'),os.path.join(path_distrib,'Noyau'),['*.py'])
    copyfiles(os.path.join(path_Noyau,'Validation'),os.path.join(path_distrib,'Validation'),['*.py'])
-   copyfiles(os.path.join(path_Noyau,'Cata'),os.path.join(path_distrib,'Aster','Cata'),['*.py',
-                                                                                       ])
-   copyfiles(os.path.join(path_Noyau,'Macro'),os.path.join(path_distrib,'Aster','Cata','Macro'),['*.py'])
    copyfiles(os.path.join(path_Noyau,'Accas'),os.path.join(path_distrib,'Aster'),['properties.py'])
+   copyfiles(os.path.join(path_Noyau,'Cata'),os.path.join(path_distrib,'Aster','Cata'),['*.py',])
+   copyfiles(os.path.join(path_Noyau,'Macro'),os.path.join(path_distrib,'Aster','Cata','cataSTA8','Macro'),['*.py'])
+   os.system("mv "+path_distrib+"Aster/Cata/cata.py "+path_distrib+"/Aster/Cata/cataSTA8")
 
    copyfiles('../Tools',os.path.join(path_distrib,'Tools'),['*.py'])
    copyfiles('../Tools/foztools',os.path.join(path_distrib,'Tools','foztools'),['*.py'])
+   copyfiles('../Pmw',os.path.join(path_distrib,'Pmw'),['*.py'])
+   copyfiles('../Pmw/Pmw_1_2',os.path.join(path_distrib,'Pmw','Pmw_1_2'),['*.py'])
+   copyfiles('../Pmw/Pmw_1_2/lib',os.path.join(path_distrib,'Pmw','Pmw_1_2','lib'),['*.py','Pmw.def'])
+
    
    tarball= maketarball('dist',nom_distrib,nom_distrib)
    try:
@@ -116,6 +118,7 @@ def copyfiles(dir_origin,dir_cible,listfiles):
       for file in glob.glob(os.path.join(dir_origin,glob_files)):
          shutil.copy(file,dir_cible)
 
+
 def maketarball(dir_trav,dir_cible,nom_tar):
    prev=os.getcwd()
    print prev