From: Pascale Noyret Date: Tue, 20 Jun 2006 13:01:08 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: V1_10b5~1 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=56f4da9560c986f373f0b1de4d6ea067c4989e4c;p=modules%2Feficas.git *** empty log message *** --- diff --git a/Aster/editeur.ini b/Aster/editeur.ini index d87075ad..09c41684 100644 --- a/Aster/editeur.ini +++ b/Aster/editeur.ini @@ -23,12 +23,11 @@ import os import prefs rep_cata = os.path.join(prefs.REPINI,'Cata') -rep_homard = os.path.join(prefs.REPINI,'../Homard') rep_Pmw = os.path.join(prefs.REPINI,'../Pmw') # Accès à la documentation Aster path_doc = os.path.join(rep_cata,'..','Doc') -exec_acrobat = "/usr/bin/acroread" +exec_acrobat = "acroread" # Utilisateur/Développeur isdeveloppeur = "NON" path_cata_dev = "/tmp/cata" @@ -38,17 +37,12 @@ rep_travail = "/tmp" initialdir=os.curdir # Choix des catalogues -rep_mat="//home/noyret/Install_Eficas/materiau" +rep_mat=os.path.join(rep_cata,'..','materiau') catalogues = ( - #('ASTER','v5',os.path.join(rep_cata,'cataSTA5'),'asterv5'), - ('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','v7.6',os.path.join(rep_cata,'cataSTA76'),'python'), - #('ASTER','v8',os.path.join(rep_cata,'cataSTA8'),'python','defaut'), +# ('ASTER','v5.9',os.path.join(rep_cata,'cataSTA5'),'asterv5'), +# ('ASTER','v6.8',os.path.join(rep_cata,'cataSTA6'),'python6'), +# ('ASTER','v7.7',os.path.join(rep_cata,'cataSTA7'),'python'), ('ASTER','v8.3',os.path.join(rep_cata,'cataSTA8'),'python','defaut'), - #('ASTER','v75',os.path.join(rep_cata,'cataSTA75'),'python','defaut'), - ('HOMARD','v1',os.path.join(rep_homard,'homard_cata_V73.py'),'homard'), ) diff --git a/Aster/editeur.ini.pn b/Aster/editeur.ini.pn new file mode 100644 index 00000000..ea7a0f7f --- /dev/null +++ b/Aster/editeur.ini.pn @@ -0,0 +1,54 @@ +# CONFIGURATION MANAGEMENT OF EDF VERSION +# ====================================================================== +# COPYRIGHT (C) 1991 - 2002 EDF R&D WWW.CODE-ASTER.ORG +# THIS PROGRAM IS FREE SOFTWARE; YOU CAN REDISTRIBUTE IT AND/OR MODIFY +# IT UNDER THE TERMS OF THE GNU GENERAL PUBLIC LICENSE AS PUBLISHED BY +# THE FREE SOFTWARE FOUNDATION; EITHER VERSION 2 OF THE LICENSE, OR +# (AT YOUR OPTION) ANY LATER VERSION. +# +# THIS PROGRAM IS DISTRIBUTED IN THE HOPE THAT IT WILL BE USEFUL, BUT +# WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF +# MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. SEE THE GNU +# GENERAL PUBLIC LICENSE FOR MORE DETAILS. +# +# YOU SHOULD HAVE RECEIVED A COPY OF THE GNU GENERAL PUBLIC LICENSE +# ALONG WITH THIS PROGRAM; IF NOT, WRITE TO EDF R&D CODE_ASTER, +# 1 AVENUE DU GENERAL DE GAULLE, 92141 CLAMART CEDEX, FRANCE. +# +# +# ====================================================================== + +import os + +import prefs + +rep_cata = os.path.join(prefs.REPINI,'Cata') +rep_homard = os.path.join(prefs.REPINI,'../Homard') +rep_Pmw = os.path.join(prefs.REPINI,'../Pmw') + +# Accès à la documentation Aster +path_doc = os.path.join(rep_cata,'..','Doc') +exec_acrobat = "/usr/bin/acroread" +# Utilisateur/Développeur +isdeveloppeur = "NON" +path_cata_dev = "/tmp/cata" +# Répertoire temporaire +rep_travail = "/tmp" +# Répertoire initial +initialdir=os.curdir + +# Choix des catalogues +rep_mat="//home/noyret/Install_Eficas/materiau" + +catalogues = ( + #('ASTER','v5',os.path.join(rep_cata,'cataSTA5'),'asterv5'), + #('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','v7.6',os.path.join(rep_cata,'cataSTA76'),'python'), + #('ASTER','v8',os.path.join(rep_cata,'cataSTA8'),'python','defaut'), + ('ASTER','v8.3',os.path.join(rep_cata,'cataSTA8'),'python','defaut'), + #('ASTER','v75',os.path.join(rep_cata,'cataSTA75'),'python','defaut'), + ('HOMARD','v1',os.path.join(rep_homard,'homard_cata_V73.py'),'homard'), + ) + diff --git a/Aster/editeur.ini.win b/Aster/editeur.ini.win new file mode 100644 index 00000000..ac88a1ef --- /dev/null +++ b/Aster/editeur.ini.win @@ -0,0 +1,49 @@ +# CONFIGURATION MANAGEMENT OF EDF VERSION +# ====================================================================== +# COPYRIGHT (C) 1991 - 2002 EDF R&D WWW.CODE-ASTER.ORG +# THIS PROGRAM IS FREE SOFTWARE; YOU CAN REDISTRIBUTE IT AND/OR MODIFY +# IT UNDER THE TERMS OF THE GNU GENERAL PUBLIC LICENSE AS PUBLISHED BY +# THE FREE SOFTWARE FOUNDATION; EITHER VERSION 2 OF THE LICENSE, OR +# (AT YOUR OPTION) ANY LATER VERSION. +# +# THIS PROGRAM IS DISTRIBUTED IN THE HOPE THAT IT WILL BE USEFUL, BUT +# WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF +# MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. SEE THE GNU +# GENERAL PUBLIC LICENSE FOR MORE DETAILS. +# +# YOU SHOULD HAVE RECEIVED A COPY OF THE GNU GENERAL PUBLIC LICENSE +# ALONG WITH THIS PROGRAM; IF NOT, WRITE TO EDF R&D CODE_ASTER, +# 1 AVENUE DU GENERAL DE GAULLE, 92141 CLAMART CEDEX, FRANCE. +# +# +# ====================================================================== + +import os + +import prefs + +rep_cata = os.path.join(prefs.REPINI,'Cata') +rep_Pmw = os.path.join(prefs.REPINI,'../Pmw') + +# Accès à la documentation Aster +path_doc = os.path.join(rep_cata,'..','Doc') +exec_acrobat = os.environ['ASTER']+'/OUTILS/acroread.bat' + +# Utilisateur/Développeur +isdeveloppeur = "NON" +path_cata_dev = os.environ['TEMP'] +# Répertoire temporaire +rep_travail = os.environ['TEMP'] +# Répertoire initial +initialdir=os.curdir + +# Choix des catalogues +rep_mat=os.path.join(rep_cata,'..','materiau') + +catalogues = ( +# ('ASTER','v5.9',os.path.join(rep_cata,'cataSTA5'),'asterv5'), +# ('ASTER','v6.8',os.path.join(rep_cata,'cataSTA6'),'python6'), +# ('ASTER','v7.7',os.path.join(rep_cata,'cataSTA7'),'python'), + ('ASTER','v8.3',os.path.join(rep_cata,'cataSTA8'),'python','defaut'), + ) + diff --git a/Aster/prefs.py b/Aster/prefs.py index ffbccd76..28a5c8ed 100644 --- a/Aster/prefs.py +++ b/Aster/prefs.py @@ -68,7 +68,7 @@ menu_defs={ 'bureau': [ ('Enregistrer','saveJDC','','Ctrl+S'), ('Enregistrer sous','saveasJDC','','Ctrl+E'), None, - ('Fermer','closeJDC','','Ctrl+F'), + ('Fermer','closeJDC','','Ctrl+W'), ('Quitter','exitEFICAS','','Ctrl+Q'), ] ), @@ -91,7 +91,10 @@ menu_defs={ 'bureau': [ ] } -userprefs=os.path.expanduser("~/Eficas_install/prefs.py") +if os.name == 'nt': + userprefs = os.sep.join( [ os.environ['HOMEDRIVE'], os.environ['HOMEPATH'], 'Eficas_install', 'prefs.py' ]) +else : + userprefs=os.path.expanduser("~/Eficas_install/prefs.py") if os.path.isfile(userprefs): try: execfile(userprefs) diff --git a/Aster/prefs.py.win b/Aster/prefs.py.win new file mode 100644 index 00000000..1ffe8892 --- /dev/null +++ b/Aster/prefs.py.win @@ -0,0 +1,101 @@ +# -*- coding: utf-8 -*- +# CONFIGURATION MANAGEMENT OF EDF VERSION +# ====================================================================== +# COPYRIGHT (C) 1991 - 2002 EDF R&D WWW.CODE-ASTER.ORG +# THIS PROGRAM IS FREE SOFTWARE; YOU CAN REDISTRIBUTE IT AND/OR MODIFY +# IT UNDER THE TERMS OF THE GNU GENERAL PUBLIC LICENSE AS PUBLISHED BY +# THE FREE SOFTWARE FOUNDATION; EITHER VERSION 2 OF THE LICENSE, OR +# (AT YOUR OPTION) ANY LATER VERSION. +# +# THIS PROGRAM IS DISTRIBUTED IN THE HOPE THAT IT WILL BE USEFUL, BUT +# WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF +# MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. SEE THE GNU +# GENERAL PUBLIC LICENSE FOR MORE DETAILS. +# +# YOU SHOULD HAVE RECEIVED A COPY OF THE GNU GENERAL PUBLIC LICENSE +# ALONG WITH THIS PROGRAM; IF NOT, WRITE TO EDF R&D CODE_ASTER, +# 1 AVENUE DU GENERAL DE GAULLE, 92141 CLAMART CEDEX, FRANCE. +# +# +# ====================================================================== + +import os,sys + +# REPINI sert à localiser le fichier editeur.ini +# Obligatoire +REPINI=os.path.dirname(os.path.abspath(__file__)) + +# INSTALLDIR sert à localiser l'installation d'Eficas +# Obligatoire +INSTALLDIR=os.path.join(REPINI,'..') + +# CODE_PATH sert à localiser Noyau et Validation éventuellement +# non contenus dans la distribution EFICAS +# Par défaut on utilise les modules de INSTALLDIR +# Peut valoir None (defaut) +CODE_PATH = None +#CODE_PATH = os.path.join(REPINI,'../../Superv') + +# la variable code donne le nom du code a selectionner +code="ASTER" + +# ICONDIR sert à localiser le répertoire contenant les icones +# Par défaut on utilise le répertoire icons dans Editeur +ICONDIR=os.path.join(INSTALLDIR,'Editeur','icons') + +# lang indique la langue utilisée pour les chaines d'aide : fr ou ang +lang='fr' + +# Codage des strings qui accepte les accents (en remplacement de 'ascii') +encoding='iso-8859-1' + +labels= ('Fichier','Edition','Jeu de commandes', +# 'Catalogue','Browsers', + 'Options', + 'Aide', + ) + +appli_composants=['readercata','bureau', +# 'browser', + 'options', + ] + +menu_defs={ 'bureau': [ + ('Fichier',[ + ('Nouveau','newJDC','','Ctrl+N'), + ('Nouvel INCLUDE','newJDC_include'), + ('Ouvrir','openJDC','','Ctrl+O'), + ('Enregistrer','saveJDC','','Ctrl+S'), + ('Enregistrer sous','saveasJDC','','Ctrl+E'), + None, + ('Fermer','closeJDC','','Ctrl+W'), + ('Quitter','exitEFICAS','','Ctrl+Q'), + ] + ), + ('Edition',[ + ('Copier','copy','','Ctrl+C'), + ('Couper','cut','','Ctrl+X'), + ('Coller','paste','','Ctrl+V'), + ] + ), + ('Jeu de commandes',[ + ('Rapport de validation','visuCRJDC','','Ctrl+R'), + ('Fichier source','visu_txt_brut_JDC','','Ctrl+B'), + #('Paramètres Eficas','affichage_fichier_ini'), + ] + ), + ('Aide',[ + ('Aide EFICAS','aideEFICAS','','Ctrl+A'), + ] + ), + ] + } + +userprefs=os.path.expanduser("~/Eficas_install/prefs.py") +if os.path.isfile(userprefs): + try: + execfile(userprefs) + except: + pass + +sys.path[:0]=[INSTALLDIR] diff --git a/Aster/sdist.py b/Aster/sdist.py index 94cab30a..fc491606 100644 --- a/Aster/sdist.py +++ b/Aster/sdist.py @@ -59,8 +59,8 @@ def main(): copyfiles('Cata/cataSTA6/Macro',os.path.join(path_distrib,'Aster','Cata','cataSTA6','Macro'),['*.py']) #copyfiles('Cata/cataSTA73',os.path.join(path_distrib,'Aster','Cata','cataSTA73'),['*.py']) #copyfiles('Cata/cataSTA73/Macro',os.path.join(path_distrib,'Aster','Cata','cataSTA73','Macro'),['*.py']) - copyfiles('Cata/cataSTA76',os.path.join(path_distrib,'Aster','Cata','cataSTA76'),['*.py']) - copyfiles('Cata/cataSTA76/Macro',os.path.join(path_distrib,'Aster','Cata','cataSTA76','Macro'),['*.py']) + copyfiles('Cata/cataSTA7',os.path.join(path_distrib,'Aster','Cata','cataSTA7'),['*.py']) + copyfiles('Cata/cataSTA7/Macro',os.path.join(path_distrib,'Aster','Cata','cataSTA7','Macro'),['*.py']) copyfiles('Cata/cataSTA8',os.path.join(path_distrib,'Aster','Cata','cataSTA8'),['*.py']) copyfiles('Cata',os.path.join(path_distrib,'Aster','Cata'),['*c_clefs_docu']) copyfiles('../Aster/Cata',os.path.join(path_distrib,'Aster'),['aster.py',]) @@ -92,6 +92,13 @@ def main(): except: print "Repertoire de download inconnu : ",dir_download + copyfiles('../Aster',os.path.join(path_distrib,'Aster'),['prefs.py.win', + 'editeur.ini.win' + ]) + os.chdir('../Aster') + os.system("mv prefs.py.win prefs.py") + os.system("mv editeur.ini.win editeur.ini") + try: shutil.copytree(path_TextTools,os.path.join(path_distrib,'Tools','TextTools')) except: