# HG changeset patch # User laurent # Date 1317395547 -7200 # Node ID 8584ddae9385da64ad990232dffa04bdcd176be9 # Parent c6b1a22aa614e0a62d74c79494519698b6902147 Fixes after moving xmlclass and docutils into plcopeneditor diff -r c6b1a22aa614 -r 8584ddae9385 .hgignore --- a/.hgignore Tue Sep 27 18:27:14 2011 +0200 +++ b/.hgignore Fri Sep 30 17:12:27 2011 +0200 @@ -13,6 +13,4 @@ syntax: regexp ^.*\.pyc$ syntax: regexp -^xmlclass$ -syntax: regexp ^\.settings/org.eclipse.core.resources.prefs$ diff -r c6b1a22aa614 -r 8584ddae9385 Beremiz.py --- a/Beremiz.py Tue Sep 27 18:27:14 2011 +0200 +++ b/Beremiz.py Fri Sep 30 17:12:27 2011 +0200 @@ -140,7 +140,6 @@ base_folder = os.path.split(sys.path[0])[0] sys.path.append(base_folder) sys.path.append(os.path.join(base_folder, "plcopeneditor")) -sys.path.append(os.path.join(base_folder, "docutils")) import wx.lib.buttons, wx.lib.statbmp import TextCtrlAutoComplete, cPickle diff -r c6b1a22aa614 -r 8584ddae9385 debian/control --- a/debian/control Tue Sep 27 18:27:14 2011 +0200 +++ b/debian/control Fri Sep 30 17:12:27 2011 +0200 @@ -7,7 +7,7 @@ Package: beremiz Architecture: any -Depends: build-essential, python-wxgtk2.8, python-ctypes, python-numpy, python-twisted, python-nevow, python-simplejson, python-wxglade, xpdf, canfestival-devel, canfestival-objdictedit, matiec, docutils, pyro, xmlclass, plcopeneditor +Depends: build-essential, python-wxgtk2.8, python-ctypes, python-numpy, python-twisted, python-nevow, python-simplejson, python-wxglade, xpdf, canfestival-devel, canfestival-objdictedit, matiec, pyro, plcopeneditor Description: Beremiz is an Open Source framework for automation With Beremiz, you can : - Automate everything. diff -r c6b1a22aa614 -r 8584ddae9385 plugger.py --- a/plugger.py Tue Sep 27 18:27:14 2011 +0200 +++ b/plugger.py Fri Sep 30 17:12:27 2011 +0200 @@ -13,7 +13,6 @@ #Quick hack to be able to find Beremiz IEC tools. Should be config params. base_folder = os.path.split(sys.path[0])[0] -from docpdf import * from xmlclass import GenerateClassesFromXSDstring from wxPopen import ProcessLogger