From: Jean-Philippe ARGAUD Date: Fri, 11 Nov 2016 20:33:46 +0000 (+0100) Subject: File name and documentation corrections X-Git-Tag: V8_2_0~8 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=53cbd5d5da9c4ec72311c7562a711952e3625ed4;p=modules%2Fadao.git File name and documentation corrections --- diff --git a/doc/en/advanced.rst b/doc/en/advanced.rst index d425459..520163c 100644 --- a/doc/en/advanced.rst +++ b/doc/en/advanced.rst @@ -427,6 +427,13 @@ is not guaranteed for all the commands or keywords. In general also, an ADAO case file for one version can not be read by a previous minor or major version of the ADAO module. +Switching from 8.x to 8.y with x < y +++++++++++++++++++++++++++++++++++++ + +There is no known incompatibility for the ADAO case files. The upgrade procedure +is to read the old ADAO case file with the new SALOME/ADAO module, and save it +with a new name. + Switching from 7.8 to 8.1 +++++++++++++++++++++++++ diff --git a/doc/fr/advanced.rst b/doc/fr/advanced.rst index 7d17af7..23a60d6 100644 --- a/doc/fr/advanced.rst +++ b/doc/fr/advanced.rst @@ -450,6 +450,13 @@ commandes ou tous les mots-cl version ne peut pas être lu par une précédente version mineure ou majeure du module ADAO. +Passer de la version 8.x à la 8.y avec x < y +++++++++++++++++++++++++++++++++++++++++++++ + +Il n'y a pas d'incompatibilité connue pour les fichiers de cas ADAO. La +procédure de montée en version consiste à lire l'ancien fichier de cas ADAO +avec le nouveau module SALOME/ADAO, et à l'enregistrer avec un nouveau nom. + Passer de la version 7.8 à la 8.1 +++++++++++++++++++++++++++++++++ diff --git a/src/daEficas/Makefile.am b/src/daEficas/Makefile.am index 78e5944..73a17b2 100644 --- a/src/daEficas/Makefile.am +++ b/src/daEficas/Makefile.am @@ -32,12 +32,13 @@ mypkgpython_PYTHON = \ __init__.py \ prefs_ADAO.py \ prefs.py \ - traduitADAOsansToV8_1_0.py \ - traduitADAOV7_4_0ToV8_1_0.py \ - traduitADAOV7_5_0ToV8_1_0.py \ - traduitADAOV7_5_1ToV8_1_0.py \ - traduitADAOV7_6_0ToV8_1_0.py \ - traduitADAOV7_7_0ToV8_1_0.py \ - traduitADAOV7_8_0ToV8_1_0.py + traduitADAOsansToV8_2_0.py \ + traduitADAOV7_4_0ToV8_2_0.py \ + traduitADAOV7_5_0ToV8_2_0.py \ + traduitADAOV7_5_1ToV8_2_0.py \ + traduitADAOV7_6_0ToV8_2_0.py \ + traduitADAOV7_7_0ToV8_2_0.py \ + traduitADAOV7_8_0ToV8_2_0.py \ + traduitADAOV8_1_0ToV8_2_0.py EXTRA_DIST = prefs_ADAO.py.in diff --git a/src/daEficas/traduitADAO8_1_0ToV8_2_0.py b/src/daEficas/traduitADAO8_1_0ToV8_2_0.py deleted file mode 100644 index cc82022..0000000 --- a/src/daEficas/traduitADAO8_1_0ToV8_2_0.py +++ /dev/null @@ -1,98 +0,0 @@ -#-*-coding:iso-8859-1-*- -# -# Copyright (C) 2008-2016 EDF R&D -# -# This file is part of SALOME ADAO module -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library 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 -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D - -import optparse -import sys -import re - -import Traducteur.log as log -from Traducteur.load import getJDC, getJDCFromTexte -from Traducteur.mocles import parseKeywords -from Traducteur.dictErreurs import GenereErreurPourCommande -from Traducteur.inseremocle import * -from Traducteur.movemocle import * -from Traducteur.renamemocle import * - -version_out = "V8_2_0" - -usage="""Usage: python %prog [options] - -Typical use is: - python %prog --infile=xxxx.comm --outfile=yyyy.comm""" - -atraiter = ( - ) - -dict_erreurs = { - } - -sys.dict_erreurs=dict_erreurs - -def traduc(infile=None,outfile=None,texte=None,flog=None): - hdlr = log.initialise(flog) - if infile is not None: - jdc = getJDC(infile,atraiter) - elif texte is not None: - jdc = getJDCFromTexte(texte,atraiter) - else: - raise ValueError("Traduction du JDC impossible") - # ========================================================================== - - - # ========================================================================== - fsrc = jdc.getSource() - fsrc = re.sub( "#VERSION_CATALOGUE:.*:FIN VERSION_CATALOGUE", "#VERSION_CATALOGUE:%s:FIN VERSION_CATALOGUE"%version_out, fsrc) - fsrc = re.sub( "#CHECKSUM.*FIN CHECKSUM", "", fsrc ) - # - log.ferme(hdlr) - if outfile is not None: - f=open(outfile,'w') - f.write( fsrc ) - f.close() - else: - return fsrc - -class MonTraducteur: - def __init__(self,texte): - self.__texte = str(texte) - def traduit(self): - return traduc(infile=None,outfile=None,texte=self.__texte,flog=None) - -def main(): - parser = optparse.OptionParser(usage=usage) - - parser.add_option('-i','--infile', dest="infile", - help="Le fichier COMM en entree, a traduire") - parser.add_option('-o','--outfile', dest="outfile", default='out.comm', - help="Le fichier COMM en sortie, traduit") - - options, args = parser.parse_args() - if len(options.infile) == 0: - print - parser.print_help() - print - sys.exit(1) - - traduc(options.infile,options.outfile) - -if __name__ == '__main__': - main() diff --git a/src/daEficas/traduitADAOV8_1_0ToV8_2_0.py b/src/daEficas/traduitADAOV8_1_0ToV8_2_0.py new file mode 100644 index 0000000..cc82022 --- /dev/null +++ b/src/daEficas/traduitADAOV8_1_0ToV8_2_0.py @@ -0,0 +1,98 @@ +#-*-coding:iso-8859-1-*- +# +# Copyright (C) 2008-2016 EDF R&D +# +# This file is part of SALOME ADAO module +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library 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 +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D + +import optparse +import sys +import re + +import Traducteur.log as log +from Traducteur.load import getJDC, getJDCFromTexte +from Traducteur.mocles import parseKeywords +from Traducteur.dictErreurs import GenereErreurPourCommande +from Traducteur.inseremocle import * +from Traducteur.movemocle import * +from Traducteur.renamemocle import * + +version_out = "V8_2_0" + +usage="""Usage: python %prog [options] + +Typical use is: + python %prog --infile=xxxx.comm --outfile=yyyy.comm""" + +atraiter = ( + ) + +dict_erreurs = { + } + +sys.dict_erreurs=dict_erreurs + +def traduc(infile=None,outfile=None,texte=None,flog=None): + hdlr = log.initialise(flog) + if infile is not None: + jdc = getJDC(infile,atraiter) + elif texte is not None: + jdc = getJDCFromTexte(texte,atraiter) + else: + raise ValueError("Traduction du JDC impossible") + # ========================================================================== + + + # ========================================================================== + fsrc = jdc.getSource() + fsrc = re.sub( "#VERSION_CATALOGUE:.*:FIN VERSION_CATALOGUE", "#VERSION_CATALOGUE:%s:FIN VERSION_CATALOGUE"%version_out, fsrc) + fsrc = re.sub( "#CHECKSUM.*FIN CHECKSUM", "", fsrc ) + # + log.ferme(hdlr) + if outfile is not None: + f=open(outfile,'w') + f.write( fsrc ) + f.close() + else: + return fsrc + +class MonTraducteur: + def __init__(self,texte): + self.__texte = str(texte) + def traduit(self): + return traduc(infile=None,outfile=None,texte=self.__texte,flog=None) + +def main(): + parser = optparse.OptionParser(usage=usage) + + parser.add_option('-i','--infile', dest="infile", + help="Le fichier COMM en entree, a traduire") + parser.add_option('-o','--outfile', dest="outfile", default='out.comm', + help="Le fichier COMM en sortie, traduit") + + options, args = parser.parse_args() + if len(options.infile) == 0: + print + parser.print_help() + print + sys.exit(1) + + traduc(options.infile,options.outfile) + +if __name__ == '__main__': + main()