====== Commit 2007-05-17 ====== ===== Modifs ===== ==== Interpréteur ==== * Possibilité de lancer un script avec Metafor en lui fournissant des arguments (voir plus bas l'utilité). ==== Batterie gérée par python ==== * Vu la lenteur extrême des nouvelles versions de Cygwin (dont la cause est inconnue), j'ai pensé qu'on pourrait se passer de Cygwin et ses Makefiles pour la batterie de Metafor. J'ai donc réécrit un (seul) script python grâce à l'expérience que j'ai acquise ces dernières semaines. Le résultat est beaucoup plus rapide, multi-plateforme et surtout améliorable (interface graphique, lancement de la batterie a travers le réseau, etc - tout est possible). * __Petites améliorations__: * Un seul fichier (au lieu des 25000 makefiles - voir plus bas les fichiers supprimés ) * Pilotage des baconneries à travers un pipe (au lieu de passer par le disque) * Plus de fichiers ''STP.txt'', ''ITE.txt'', ... Seuls les fichiers utiles sont générés (''STP-machine-All.txt'', ''ITE-machine-All.txt'', ...) et le grep géré par python est plus efficace. * Gestion automatique de toute la batterie (y compris ''oo_nda'') sans artifices: il suffit qu'un module soit dans le ''PYTHONPATH'' pour pouvoir être lancé!) * Gestion simplifiée des cas "complex": ils sont simplement exécutés (''execfile'') * Option pour garder les facs (''-keep'') * Pour lancer la nouvelle batterie sous Windows, facile: double cliquez sur le script ''battery.sh'' (et désinstallez cette m☆☆☆☆ de Cygwin!). * Pour les rétifs au progrès, en ligne de commande ''cmd'' (ou même cygwin((ça marche tant que le ''python'' dans votre ''PATH'' est bien celui utilisé par Metafor - ne mixez pas 2)) pour les plus atteints): batterie.py [-keep] [clean|verif|buildfdb|run] [module1] [module2] ... * Vous pouvez vous amuser à lancer la batterie avec Metafor, ça marche aussi (préfixez le tout par ''./metafor -nogui'') * __Reste à faire__: * Nettoyer certaines crasses qui doivent trainer après la batterie. * Paralléliser le truc. ===== Mode d'emploi ===== __Guide d'utilisation__ ^ Makfiles/bash ^ Python ^ | ''./batterieAll.sh'' | ''battery.py [run]'' (ou Double clic sous Window) | | ''cd apps/qs ; gmake cont2.res'' | ''batterie.py run apps.qs.cont2'' | | ''gmake clean'' | ''battery.py clean'' | | ''./buildPyFiles.sh'' | ''battery.py buildfdb'' (génère uniquement les fdb) | | ''verif.sh'' (+''merge.sh'') | ''battery.py verif'' | N'oubliez pas de préfixer par un ''./'' sous Unix si le répertoire courant n'est pas dans votre ''PATH''. __Autres exemples__ ^ Commande ^ Action ^ | ''battery.py clean apps.qs.cont2 apps.bImp apps.complex'' | nettoie uniquement les tests spécifiés (fichiers ou répertoires) | | ''battery.py run sabca.tests gdTech.tests.stp.palplanche'' | lance uniquement les tests spécifiés (fichiers ou répertoires) | | ''battery.py -keep run apps.stp'' | lance des tests et garde les facs | __Comment lancer la ligne de commande DOS facilement?__((j'anticipe)) * Créez un raccourci vers ''cmd.exe'' (Click-droit/Nouveau/Raccourci sur le bureau) * Click-droit/Propriétés et modifiez le nom du répertoire "Démarrer dans" (''e:\dev\oo_meta'' chez moi). ===== Fichiers ajoutés/supprimés ====== battery.py added apps/ale/Makefile deleted apps/bExp/Makefile deleted apps/bIe/Makefile deleted apps/bImp/Makefile deleted apps/bIso/Makefile deleted apps/boundariesElements/Makefile deleted apps/bQs/Makefile deleted apps/contactTm/Makefile deleted apps/exp/Makefile deleted apps/full/Makefile deleted apps/ie/Makefile deleted apps/imp/Makefile deleted apps/iso/Makefile deleted apps/makefiles deleted apps/makefiles/Makefile_common deleted apps/makefiles/Makefile_cplx deleted apps/makefiles/Makefile_dat deleted apps/makefiles/Makefile_local deleted apps/makefiles/Makefile_parametric deleted apps/makefiles/Makefile_py deleted apps/makefiles/Makefile_stp deleted apps/monosMaterials/Makefile deleted apps/monosMeca/Makefile deleted apps/monosThermoMeca2/Makefile deleted apps/monosThermoMeca/Makefile deleted apps/nas/Makefile deleted apps/parametric/Makefile deleted apps/qs/Makefile deleted apps/stp/Makefile deleted apps/batterie.sh deleted apps/batterieAll.sh deleted apps/buildPyFiles.sh deleted apps/clean.sh deleted apps/cleanAll.sh deleted apps/localVerif.sh deleted apps/merge.sh deleted apps/verif.sh deleted apps/verif/CPU-AlphaLinux.txt deleted apps/verif/CPU-CYGWIN.txt deleted apps/verif/CPU-Linux.txt deleted apps/verif/CPU-Linux64.txt deleted apps/verif/CPU-OSF1.txt deleted apps/verif/EXT-AlphaLinux.txt deleted apps/verif/EXT-CYGWIN.txt deleted apps/verif/EXT-Linux.txt deleted apps/verif/EXT-Linux64.txt deleted apps/verif/EXT-OSF1.txt deleted apps/verif/EXW-AlphaLinux.txt deleted apps/verif/EXW-CYGWIN.txt deleted apps/verif/EXW-Linux.txt deleted apps/verif/EXW-Linux64.txt deleted apps/verif/EXW-OSF1.txt deleted apps/verif/FAILED-AlphaLinux.txt deleted apps/verif/FAILED-CYGWIN.txt deleted apps/verif/FAILED-Linux.txt deleted apps/verif/FAILED-Linux64.txt deleted apps/verif/FAILED-OSF1.txt deleted apps/verif/INW-AlphaLinux.txt deleted apps/verif/INW-CYGWIN.txt deleted apps/verif/INW-Linux.txt deleted apps/verif/INW-Linux64.txt deleted apps/verif/INW-OSF1.txt deleted apps/verif/ITE-AlphaLinux.txt deleted apps/verif/ITE-CYGWIN.txt deleted apps/verif/ITE-Linux.txt deleted apps/verif/ITE-Linux64.txt deleted apps/verif/ITE-OSF1.txt deleted apps/verif/STP-AlphaLinux.txt deleted apps/verif/STP-CYGWIN.txt deleted apps/verif/STP-Linux.txt deleted apps/verif/STP-Linux64.txt deleted apps/verif/STP-OSF1.txt deleted sabca/tests/verif/STP-OSF1.txt deleted sabca/tests/verif/STP-Linux64.txt deleted sabca/tests/verif/STP-Linux.txt deleted sabca/tests/verif/STP-CYGWIN.txt deleted sabca/tests/verif/STP-AlphaLinux.txt deleted sabca/tests/verif/ITE-OSF1.txt deleted sabca/tests/verif/ITE-Linux64.txt deleted sabca/tests/verif/ITE-Linux.txt deleted sabca/tests/verif/ITE-CYGWIN.txt deleted sabca/tests/verif/ITE-AlphaLinux.txt deleted sabca/tests/verif/INW-OSF1.txt deleted sabca/tests/verif/INW-Linux64.txt deleted sabca/tests/verif/INW-Linux.txt deleted sabca/tests/verif/INW-CYGWIN.txt deleted sabca/tests/verif/INW-AlphaLinux.txt deleted sabca/tests/verif/FAILED-OSF1.txt deleted sabca/tests/verif/FAILED-Linux64.txt deleted sabca/tests/verif/FAILED-Linux.txt deleted sabca/tests/verif/FAILED-CYGWIN.txt deleted sabca/tests/verif/FAILED-AlphaLinux.txt deleted sabca/tests/verif/EXW-OSF1.txt deleted sabca/tests/verif/EXW-Linux64.txt deleted sabca/tests/verif/EXW-Linux.txt deleted sabca/tests/verif/EXW-CYGWIN.txt deleted sabca/tests/verif/EXW-AlphaLinux.txt deleted sabca/tests/verif/EXT-OSF1.txt deleted sabca/tests/verif/EXT-Linux64.txt deleted sabca/tests/verif/EXT-Linux.txt deleted sabca/tests/verif/EXT-CYGWIN.txt deleted sabca/tests/verif/EXT-AlphaLinux.txt deleted sabca/tests/verif/CPU-OSF1.txt deleted sabca/tests/verif/CPU-Linux64.txt deleted sabca/tests/verif/CPU-Linux.txt deleted sabca/tests/verif/CPU-CYGWIN.txt deleted sabca/tests/verif/CPU-AlphaLinux.txt deleted intelSig/tests/verif/STP-OSF1.txt deleted intelSig/tests/verif/STP-Linux64.txt deleted intelSig/tests/verif/STP-Linux.txt deleted intelSig/tests/verif/STP-CYGWIN.txt deleted intelSig/tests/verif/STP-AlphaLinux.txt deleted intelSig/tests/verif/ITE-OSF1.txt deleted intelSig/tests/verif/ITE-Linux64.txt deleted intelSig/tests/verif/ITE-Linux.txt deleted intelSig/tests/verif/ITE-CYGWIN.txt deleted intelSig/tests/verif/ITE-AlphaLinux.txt deleted intelSig/tests/verif/INW-OSF1.txt deleted intelSig/tests/verif/INW-Linux64.txt deleted intelSig/tests/verif/INW-Linux.txt deleted intelSig/tests/verif/INW-CYGWIN.txt deleted intelSig/tests/verif/INW-AlphaLinux.txt deleted intelSig/tests/verif/FAILED-OSF1.txt deleted intelSig/tests/verif/FAILED-Linux64.txt deleted intelSig/tests/verif/FAILED-Linux.txt deleted intelSig/tests/verif/FAILED-CYGWIN.txt deleted intelSig/tests/verif/FAILED-AlphaLinux.txt deleted intelSig/tests/verif/EXW-OSF1.txt deleted intelSig/tests/verif/EXW-Linux64.txt deleted intelSig/tests/verif/EXW-Linux.txt deleted intelSig/tests/verif/EXW-CYGWIN.txt deleted intelSig/tests/verif/EXW-AlphaLinux.txt deleted intelSig/tests/verif/EXT-OSF1.txt deleted intelSig/tests/verif/EXT-Linux64.txt deleted intelSig/tests/verif/EXT-Linux.txt deleted intelSig/tests/verif/EXT-CYGWIN.txt deleted intelSig/tests/verif/EXT-AlphaLinux.txt deleted intelSig/tests/verif/CPU-OSF1.txt deleted intelSig/tests/verif/CPU-Linux64.txt deleted intelSig/tests/verif/CPU-Linux.txt deleted intelSig/tests/verif/CPU-CYGWIN.txt deleted intelSig/tests/verif/CPU-AlphaLinux.txt deleted gdTech/tests/verif/STP-OSF1.txt deleted gdTech/tests/verif/STP-Linux64.txt deleted gdTech/tests/verif/STP-Linux.txt deleted gdTech/tests/verif/STP-CYGWIN.txt deleted gdTech/tests/verif/STP-AlphaLinux.txt deleted gdTech/tests/verif/ITE-OSF1.txt deleted gdTech/tests/verif/ITE-Linux64.txt deleted gdTech/tests/verif/ITE-Linux.txt deleted gdTech/tests/verif/ITE-CYGWIN.txt deleted gdTech/tests/verif/ITE-AlphaLinux.txt deleted gdTech/tests/verif/INW-OSF1.txt deleted gdTech/tests/verif/INW-Linux64.txt deleted gdTech/tests/verif/INW-Linux.txt deleted gdTech/tests/verif/INW-CYGWIN.txt deleted gdTech/tests/verif/INW-AlphaLinux.txt deleted gdTech/tests/verif/FAILED-OSF1.txt deleted gdTech/tests/verif/FAILED-Linux64.txt deleted gdTech/tests/verif/FAILED-Linux.txt deleted gdTech/tests/verif/FAILED-CYGWIN.txt deleted gdTech/tests/verif/FAILED-AlphaLinux.txt deleted gdTech/tests/verif/EXW-OSF1.txt deleted gdTech/tests/verif/EXW-Linux64.txt deleted gdTech/tests/verif/EXW-Linux.txt deleted gdTech/tests/verif/EXW-CYGWIN.txt deleted gdTech/tests/verif/EXW-AlphaLinux.txt deleted gdTech/tests/verif/EXT-OSF1.txt deleted gdTech/tests/verif/EXT-Linux64.txt deleted gdTech/tests/verif/EXT-Linux.txt deleted gdTech/tests/verif/EXT-CYGWIN.txt deleted gdTech/tests/verif/EXT-AlphaLinux.txt deleted gdTech/tests/verif/CPU-OSF1.txt deleted gdTech/tests/verif/CPU-Linux64.txt deleted gdTech/tests/verif/CPU-Linux.txt deleted gdTech/tests/verif/CPU-CYGWIN.txt deleted gdTech/tests/verif/CPU-AlphaLinux.txt deleted copraImport/tests/verif/STP-OSF1.txt deleted copraImport/tests/verif/STP-Linux64.txt deleted copraImport/tests/verif/STP-Linux.txt deleted copraImport/tests/verif/STP-CYGWIN.txt deleted copraImport/tests/verif/STP-AlphaLinux.txt deleted copraImport/tests/verif/ITE-OSF1.txt deleted copraImport/tests/verif/ITE-Linux64.txt deleted copraImport/tests/verif/ITE-Linux.txt deleted copraImport/tests/verif/ITE-CYGWIN.txt deleted copraImport/tests/verif/ITE-AlphaLinux.txt deleted copraImport/tests/verif/INW-OSF1.txt deleted copraImport/tests/verif/INW-Linux64.txt deleted copraImport/tests/verif/INW-Linux.txt deleted copraImport/tests/verif/INW-CYGWIN.txt deleted copraImport/tests/verif/INW-AlphaLinux.txt deleted copraImport/tests/verif/FAILED-OSF1.txt deleted copraImport/tests/verif/FAILED-Linux64.txt deleted copraImport/tests/verif/FAILED-Linux.txt deleted copraImport/tests/verif/FAILED-CYGWIN.txt deleted copraImport/tests/verif/FAILED-AlphaLinux.txt deleted copraImport/tests/verif/EXW-OSF1.txt deleted copraImport/tests/verif/EXW-Linux64.txt deleted copraImport/tests/verif/EXW-Linux.txt deleted copraImport/tests/verif/EXW-CYGWIN.txt deleted copraImport/tests/verif/EXW-AlphaLinux.txt deleted copraImport/tests/verif/EXT-OSF1.txt deleted copraImport/tests/verif/EXT-Linux64.txt deleted copraImport/tests/verif/EXT-Linux.txt deleted copraImport/tests/verif/EXT-CYGWIN.txt deleted copraImport/tests/verif/EXT-AlphaLinux.txt deleted copraImport/tests/verif/CPU-OSF1.txt deleted copraImport/tests/verif/CPU-Linux64.txt deleted copraImport/tests/verif/CPU-Linux.txt deleted copraImport/tests/verif/CPU-CYGWIN.txt deleted copraImport/tests/verif/CPU-AlphaLinux.txt deleted sabca/tests/verif.sh deleted sabca/tests/localVerif.sh deleted sabca/tests/clean.sh deleted sabca/tests/batterie.sh deleted intelSig/tests/verif.sh deleted intelSig/tests/localVerif.sh deleted intelSig/tests/clean.sh deleted intelSig/tests/batterie.sh deleted gdTech/tests/verif.sh deleted gdTech/tests/localVerif.sh deleted gdTech/tests/clean.sh deleted gdTech/tests/batterie.sh deleted copraImport/tests/verif.sh deleted copraImport/tests/localVerif.sh deleted copraImport/tests/clean.sh deleted copraImport/tests/batterie.sh deleted sabca/tests/verif deleted sabca/tests/ValidationTm/Makefile deleted sabca/tests/Validation2219Funct/Makefile deleted sabca/tests/Validation2219/Makefile deleted sabca/tests/makefiles/Makefile_local deleted sabca/tests/makefiles deleted sabca/tests/creepforming2219/Makefile deleted intelSig/tests/xfem/Makefile deleted intelSig/tests/verif deleted intelSig/tests/makefiles/Makefile_local deleted intelSig/tests/makefiles deleted gdTech/tests/verif deleted gdTech/tests/stp/Makefile deleted gdTech/tests/makefiles/Makefile_local deleted gdTech/tests/makefiles deleted copraImport/tests/verif deleted copraImport/tests/makefiles/Makefile_local deleted copraImport/tests/makefiles deleted copraImport/tests/copraProfiling5/Makefile deleted --- //[[r_boman@yahoo.fr|Romain BOMAN]] 2007/05/17 11:12//