# HG changeset patch # User greg # Date 1257159449 -3600 # Node ID 092060fd8afb1d950fe467724ce0209bddc48716 # Parent ca07a88ee68aa7c13f49131cc36769c1a06fbaed Replace \"lolitech\" contact by \"edouard\" contact diff -r ca07a88ee68a -r 092060fd8afb Beremiz.py --- a/Beremiz.py Wed Oct 28 11:42:47 2009 +0100 +++ b/Beremiz.py Mon Nov 02 11:57:29 2009 +0100 @@ -1458,10 +1458,8 @@ An unhandled exception (bug) occured. Bug report saved at : (%s) -Please contact LOLITech at: -+33 (0)3 29 57 60 42 -or please be kind enough to send this file to: -bugs_beremiz@lolitech.fr +Please be kind enough to send this file to: +edouard.tisserant@gmail.com You should now restart Beremiz. diff -r ca07a88ee68a -r 092060fd8afb beremiz_postinst.py --- a/beremiz_postinst.py Wed Oct 28 11:42:47 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,91 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- - -# La première ligne doit commencer par #! et contenir python. -# Elle sera adaptée au système de destination automatiquement - -""" This is a part of Beremiz project. - - Post installation script for win32 system - - This script creat a shortcut for Beremiz.py in the desktop and the - start menu, and remove them at the uninstallation - -""" - -import os -import sys - -# Ce script sera aussi lancé lors de la désinstallation. -# Pour n'exécuter du code que lors de l'installation : -if sys.argv[1] == '-install': - # On récupère le dossier où mes fichiers seront installés (dossier où python est aussi installé sous windows) - python_path = sys.prefix - # On récupère le chemin de pythonw.exe (l'exécutable python qui n'affiche pas de console). - # Si vous voulez une console, remplacez pythonw.exe par python.exe - pyw_path = os.path.abspath(os.path.join(python_path, 'pythonw.exe')) - # On récupère le dossier coincoin - Beremiz_dir = os.path.abspath(os.path.join(python_path, 'LOLITech', 'Beremiz')) - - # On récupère les chemins de coincoin.py, et de coincoin.ico - # (Ben oui, l'icone est au format ico, oubliez le svg, ici on en est encore à la préhistoire. - # Heureusement que the GIMP sait faire la conversion !) - ico_path = os.path.join(Beremiz_dir, 'Beremiz.ico') - script_path = os.path.join(Beremiz_dir, 'Beremiz.py') - - # Création des raccourcis - # Pour chaque raccourci, on essaye de le faire pour tous les utilisateurs (Windows NT/2000/XP), - # sinon on le fait pour l'utilisateur courant (Windows 95/98/ME) - - # Raccourcis du bureau - # On essaye de trouver un bureau - try: - desktop_path = get_special_folder_path("CSIDL_COMMON_DESKTOPDIRECTORY") - except OSError: - desktop_path = get_special_folder_path("CSIDL_DESKTOPDIRECTORY") - - # On créé le raccourcis - create_shortcut(pyw_path, # programme à lancer - "Can Node Editor", # Description - os.path.join(desktop_path, 'Beremiz.lnk'), # fichier du raccourcis (gardez le .lnk) - script_path, # Argument (script python) - Beremiz_dir, # Dossier courant - ico_path # Fichier de l'icone - ) - # On va cafter au programme de désinstallation qu'on a fait un fichier, pour qu'il soit supprimé - # lors de la désinstallation - file_created(os.path.join(desktop_path, 'Beremiz.lnk')) - - # Raccourcis dans le menu démarrer (idem qu'avant) - try: - start_path = get_special_folder_path("CSIDL_COMMON_PROGRAMS") - except OSError: - start_path = get_special_folder_path("CSIDL_PROGRAMS") - - - - # Création du dossier dans le menu programme - programs_path = os.path.join(start_path, "Beremiz project") - try : - os.mkdir(programs_path) - - except OSError: - - pass - directory_created(programs_path) - - create_shortcut(pyw_path, # Cible - "Can Node Editor", #Description - os.path.join(programs_path, 'Beremiz.lnk'), # Fichier - script_path, # Argument - Beremiz_dir, # Dossier de travail - ico_path # Icone - ) - file_created(os.path.join(programs_path, 'Beremiz.lnk')) - - # End (youpi-message) - # Ce message sera affiché (très) furtivement dans l'installateur. - # Vous pouvez vous en servir comme moyen de communication secret, c'est très in. - sys.stdout.write("Shortcuts created.") - # Fin du bidule - sys.exit() diff -r ca07a88ee68a -r 092060fd8afb debian/README.Debian --- a/debian/README.Debian Wed Oct 28 11:42:47 2009 +0100 +++ b/debian/README.Debian Mon Nov 02 11:57:29 2009 +0100 @@ -3,4 +3,4 @@ - -- lolitech Thu, 29 Nov 2007 14:55:13 +0100 + -- edouard Thu, 29 Nov 2007 14:55:13 +0100 diff -r ca07a88ee68a -r 092060fd8afb debian/changelog --- a/debian/changelog Wed Oct 28 11:42:47 2009 +0100 +++ b/debian/changelog Mon Nov 02 11:57:29 2009 +0100 @@ -2,5 +2,5 @@ * Initial release (Closes: #nnnn) - -- lolitech Thu, 29 Nov 2007 14:55:13 +0100 + -- edouard Thu, 29 Nov 2007 14:55:13 +0100 diff -r ca07a88ee68a -r 092060fd8afb debian/control --- a/debian/control Wed Oct 28 11:42:47 2009 +0100 +++ b/debian/control Mon Nov 02 11:57:29 2009 +0100 @@ -1,7 +1,7 @@ Source: beremiz Section: devel Priority: standard -Maintainer: lolitech +Maintainer: edouard Build-Depends: debhelper (>= 5) Standards-Version: 3.7.2 diff -r ca07a88ee68a -r 092060fd8afb doc/about.html --- a/doc/about.html Wed Oct 28 11:42:47 2009 +0100 +++ b/doc/about.html Mon Nov 02 11:57:29 2009 +0100 @@ -17,15 +17,6 @@ http://www.fe.up.pt/si/web_page.inicial - - - Supported by : - - - LOLITech
- http://www.lolitech.fr - - diff -r ca07a88ee68a -r 092060fd8afb i18n/Beremiz_fr_FR.po --- a/i18n/Beremiz_fr_FR.po Wed Oct 28 11:42:47 2009 +0100 +++ b/i18n/Beremiz_fr_FR.po Mon Nov 02 11:57:29 2009 +0100 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-10-26 10:51+0100\n" -"PO-Revision-Date: 2009-10-26 10:51+0100\n" +"POT-Creation-Date: 2009-11-02 10:40+0100\n" +"PO-Revision-Date: 2009-11-02 10:52+0100\n" "Last-Translator: \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -22,10 +22,8 @@ "An unhandled exception (bug) occured. Bug report saved at :\n" "(%s)\n" "\n" -"Please contact LOLITech at:\n" -"+33 (0)3 29 57 60 42\n" -"or please be kind enough to send this file to:\n" -"bugs_beremiz@lolitech.fr\n" +"Please be kind enough to send this file to:\n" +"edouard.tisserant@gmail.com\n" "\n" "You should now restart Beremiz.\n" "\n" @@ -35,10 +33,8 @@ "Une erreur inconnue (bug) est apparu. Le rapport d'erreur a été sauvé dans :\n" "(%s)\n" "\n" -"Veuillez contacter LOLITech au :\n" -"+33 (0)3 29 57 60 42\n" -"ou envoyez ce fichier à l'adresse :\n" -"bugs_beremiz@lolitech.fr\n" +"Envoyez ce fichier à l'adresse :\n" +"edouard.tisserant@gmail.com\n" "\n" "Vous devriez redémarrer Beremiz.\n" "\n" @@ -393,8 +389,8 @@ msgid "Enter the IP of the interface to bind" msgstr "Saisissez l'adresse IP de l'interface à lier" -#: ../Beremiz.py:1471 -#: ../Beremiz.py:1481 +#: ../Beremiz.py:1469 +#: ../Beremiz.py:1479 #: ../plugger.py:873 #: ../Beremiz_service.py:268 #: ../Beremiz_service.py:392 diff -r ca07a88ee68a -r 092060fd8afb i18n/app.fil --- a/i18n/app.fil Wed Oct 28 11:42:47 2009 +0100 +++ b/i18n/app.fil Mon Nov 02 11:57:29 2009 +0100 @@ -1,6 +1,5 @@ ../Beremiz.py ../plugger.py -../beremiz_postinst.py ../Beremiz_service.py ../discovery.py ../wxPopen.py diff -r ca07a88ee68a -r 092060fd8afb i18n/messages.pot --- a/i18n/messages.pot Wed Oct 28 11:42:47 2009 +0100 +++ b/i18n/messages.pot Mon Nov 02 11:57:29 2009 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-10-26 10:51+0100\n" +"POT-Creation-Date: 2009-11-02 10:40+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -23,10 +23,8 @@ "An unhandled exception (bug) occured. Bug report saved at :\n" "(%s)\n" "\n" -"Please contact LOLITech at:\n" -"+33 (0)3 29 57 60 42\n" -"or please be kind enough to send this file to:\n" -"bugs_beremiz@lolitech.fr\n" +"Please be kind enough to send this file to:\n" +"edouard.tisserant@gmail.com\n" "\n" "You should now restart Beremiz.\n" "\n" @@ -372,7 +370,7 @@ msgid "Enter the IP of the interface to bind" msgstr "" -#: ../Beremiz.py:1471 ../Beremiz.py:1481 ../plugger.py:873 +#: ../Beremiz.py:1469 ../Beremiz.py:1479 ../plugger.py:873 #: ../Beremiz_service.py:268 ../Beremiz_service.py:392 msgid "Error" msgstr "" diff -r ca07a88ee68a -r 092060fd8afb images/EditCfile.png Binary file images/EditCfile.png has changed diff -r ca07a88ee68a -r 092060fd8afb images/HideVars.png Binary file images/HideVars.png has changed diff -r ca07a88ee68a -r 092060fd8afb images/Maximize.png Binary file images/Maximize.png has changed diff -r ca07a88ee68a -r 092060fd8afb images/Minimize.png Binary file images/Minimize.png has changed diff -r ca07a88ee68a -r 092060fd8afb images/ShowIECcode.png Binary file images/ShowIECcode.png has changed diff -r ca07a88ee68a -r 092060fd8afb images/ShowVars.png Binary file images/ShowVars.png has changed diff -r ca07a88ee68a -r 092060fd8afb images/editIECrawcode.png Binary file images/editIECrawcode.png has changed diff -r ca07a88ee68a -r 092060fd8afb images/editPYTHONcode.png Binary file images/editPYTHONcode.png has changed diff -r ca07a88ee68a -r 092060fd8afb images/editWXGLADE.png Binary file images/editWXGLADE.png has changed diff -r ca07a88ee68a -r 092060fd8afb images/icons.svg --- a/images/icons.svg Wed Oct 28 11:42:47 2009 +0100 +++ b/images/icons.svg Mon Nov 02 11:57:29 2009 +0100 @@ -41,12 +41,12 @@ pagecolor="#ffffff" id="base" showgrid="false" - inkscape:zoom="1.9999999" - inkscape:cx="408.78078" - inkscape:cy="837.40927" - inkscape:window-x="15" - inkscape:window-y="25" - inkscape:current-layer="g16611" + inkscape:zoom="0.99999995" + inkscape:cx="225.84672" + inkscape:cy="158.90122" + inkscape:window-x="84" + inkscape:window-y="59" + inkscape:current-layer="g18993" showguides="true" inkscape:guide-bbox="true"> 2009.0 Beta - - - - - + transform="matrix(0.5511608,0,0,0.5511608,-977.19352,996.99467)"> - diff -r ca07a88ee68a -r 092060fd8afb plugins/python/pous.xml --- a/plugins/python/pous.xml Wed Oct 28 11:42:47 2009 +0100 +++ b/plugins/python/pous.xml Mon Nov 02 11:57:29 2009 +0100 @@ -3,7 +3,7 @@ xmlns="http://www.plcopen.org/xml/tc6.xsd" xmlns:xhtml="http://www.w3.org/1999/xhtml" xsi:schemaLocation="http://www.plcopen.org/xml/tc6.xsd"> - diff -r ca07a88ee68a -r 092060fd8afb setup.py --- a/setup.py Wed Oct 28 11:42:47 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,39 +0,0 @@ -import os,sys,glob -from distutils.core import setup - - -install_dir=os.path.join("LOLITech","beremiz") - -data_files=[] -os.getcwd() -os.chdir(os.getcwd()) - -def generate(base_dir): - listfile=[] - if base_dir == "": - directory = "." - else: - directory = base_dir - data_files.append((os.path.join(install_dir, base_dir), listfile)) - - for element in os.listdir(directory): - element_path=os.path.join(base_dir, element) - if os.path.isdir(element_path): - generate(element_path) - elif os.path.isfile(element_path): - listfile.append(element_path) - -generate("") - - -setup(name='Beremiz', - version='0.1', - description='Open Source framework for automation', - author='Edouard Tisserant, Laurent Bessard', - author_email='edouard.tisserant@lolitech.fr,laurent.bessard@lolitech.fr,gregory.trelat@lolitech.fr', - url='http://www.beremiz.org', - license='GPL', - windows=["Beremiz.py"], - scripts=['beremiz_postinst.py'], - data_files=data_files, # Add files to install -) \ No newline at end of file