beremiz

merged greg's recent commits

2009-08-12, b taylor
75ae46b66315
Parents 9db62e0280f532339ad7d9ae
Children 71c441104cac
merged greg's recent commits
6 files changed, 7 insertions(+), 39 deletions(-)
  • +0 -8
    .cvsignore
  • +1 -0
    .hgignore
  • +0 -17
    .project
  • +0 -6
    .pydevproject
  • +1 -1
    debian/control
  • +5 -7
    plugins/canfestival/cf_runtime.c
    • --- a/.cvsignore Wed Aug 12 16:18:57 2009 -0600
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,8 +0,0 @@
    -*.pyc
    -.settings
    -.project
    -bug_report_*.txt
    -.pyproject
    -.externalToolBuilders
    -.pydevproject
    -xmlclass
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/.hgignore Wed Aug 12 16:23:59 2009 -0600
    @@ -0,0 +1,1 @@
    +.project
    --- a/.project Wed Aug 12 16:18:57 2009 -0600
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,17 +0,0 @@
    -<?xml version="1.0" encoding="UTF-8"?>
    -<projectDescription>
    - <name>beremiz</name>
    - <comment></comment>
    - <projects>
    - </projects>
    - <buildSpec>
    - <buildCommand>
    - <name>org.python.pydev.PyDevBuilder</name>
    - <arguments>
    - </arguments>
    - </buildCommand>
    - </buildSpec>
    - <natures>
    - <nature>org.python.pydev.pythonNature</nature>
    - </natures>
    -</projectDescription>
    --- a/.pydevproject Wed Aug 12 16:18:57 2009 -0600
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,6 +0,0 @@
    -<?xml version="1.0" encoding="UTF-8" standalone="no"?>
    -<?eclipse-pydev version="1.0"?>
    -
    -<pydev_project>
    -<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.5</pydev_property>
    -</pydev_project>
    --- a/debian/control Wed Aug 12 16:18:57 2009 -0600
    +++ b/debian/control Wed Aug 12 16:23:59 2009 -0600
    @@ -7,7 +7,7 @@
    Package: beremiz
    Architecture: any
    -Depends: build-essential, python-wxgtk2.8, python-ctypes, xpdf, canfestival-devel, canfestival-objdictedit, matiec, docutils, pyro, xmlclass, plcopeneditor
    +Depends: build-essential, python-wxgtk2.8, python-ctypes, python-wxglade, xpdf, canfestival-devel, canfestival-objdictedit, matiec, docutils, pyro, xmlclass, plcopeneditor
    Description: Beremiz is an Open Source framework for automation
    With Beremiz, you can :
    - Automate everything.
    --- a/plugins/canfestival/cf_runtime.c Wed Aug 12 16:18:57 2009 -0600
    +++ b/plugins/canfestival/cf_runtime.c Wed Aug 12 16:23:59 2009 -0600
    @@ -83,13 +83,12 @@
    {
    // Stop timer thread
    if(init_level-- > 0){
    - int init_level_c = init_level;
    + int init_level_c = init_level;
    StopTimerLoop(&Exit);
    %(nodes_close)s
    }
    - #if !defined(WIN32) || defined(__CYGWIN__)
    - TimerCleanup();
    - #endif
    +
    + TimerCleanup();
    }
    #define NODE_OPEN(nodename)\
    @@ -110,9 +109,8 @@
    return -1;
    }
    #endif
    - #if !defined(WIN32) || defined(__CYGWIN__)
    - TimerInit();
    - #endif
    +
    + TimerInit();
    %(nodes_open)s