Skip to content

Commit

Permalink
Auto-commit for new-version
Browse files Browse the repository at this point in the history
  • Loading branch information
@bibi21000
bibi21000 committed Apr 13, 2017
1 parent 1a6552e commit e802e26
Show file tree
Hide file tree
Showing 10 changed files with 40 additions and 86 deletions.
2 changes: 2 additions & 0 deletions INSTALL_ARCH.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
Installing python-openzwave from archive
========================================

This method is deprecated for 0.4.X. Use pip with --embed flavor. Look at README.

This is the simplest (and the fastest) way to install python-openzwave. It comes with openzwave source files and is already cythonized.

This is surely the best solution to install python-openzwave on a raspberry pi.
Expand Down
4 changes: 1 addition & 3 deletions INSTALL_MAC.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,4 @@
Installing python-openzwave on MacOs
====================================

To be done

Looking for volunteers
Look at README for 0.4.X installation.
2 changes: 2 additions & 0 deletions INSTALL_REPO.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
Installing python-openzwave from repository
===========================================

This method is deprecated for 0.4.X. Use pip with --git flavor. Look at README.


Install the needed tools
========================
Expand Down
45 changes: 10 additions & 35 deletions INSTALL_WIN.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ Installing python-openzwave on Windows
======================================


This HOW-TO is for 0.4.X.

It should be possible to make it pip friendly. Need a command line to build openzwave c++ lib.

How To Build python-openzwave on Windows with VS2015
====================================================

Expand All @@ -25,7 +29,7 @@ Get sources
cd openzwave
git checkout Dev
cd ..
git checkout python3
git checkout
Build open-zwave
Expand All @@ -38,43 +42,14 @@ When asked, accept the project upgrade to VS2015
Build Win32|Release


Build python-openzwave lib
--------------------------

Patch libopenzwave.pyx

Cause: ValueID has no default constructor and cython needs one for allocating objects on the stack

Fix: Allocate object on the the heap as a workaround
Build python_openzwave
----------------------

Open test/python-openzwave/src-lib/libopenzwave/libopenzwave.pyx

Go to line 437 and change:
From a Command Prompt, install it :

.. code-block:: bash
values_map.insert(pair[uint64_t, ValueID](v.GetId(), v))
To:
.. code-block:: bash
newPair = new pair[uint64_t, ValueID](v.GetId(), v)
values_map.insert(deref(newPair))
del newPair
From a Command Prompt, build it :
.. code-block:: bash
python setup-lib.py build
python setup-api.py build
And install it (in a virtualenv if needed) :
.. code-block:: bash
python setup install --dev
python setup-lib.py install
python setup-api.py install
Reference for 0.3.X : https://github.com/OpenZWave/python-openzwave/issues/53

Reference : https://github.com/OpenZWave/python-openzwave/issues/53
10 changes: 5 additions & 5 deletions README.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,13 @@ python-openzwave 0.4.0 is coming !!!

.. code-block:: bash
(venvX) pip install ---egg python_openzwave --install-option="--git"
(venvX) pip install python_openzwave --install-option="--git"
To use fresh code from openzwave github :

.. code-block:: bash
(venvX) pip install --egg python_openzwave --force --install-option="--git --cleanopzw"
(venvX) pip install python_openzwave --force --install-option="--git --cleanopzw"
- If you have build and install openzwave your self, use the dynamic linking :

Expand All @@ -86,19 +86,19 @@ python-openzwave 0.4.0 is coming !!!

.. code-block:: bash
(venvX) pip install wheel six 'Louie>=1.1'
(venvX) pip install --egg python_openzwave --force --install-option="--embed"
(venvX) pip install python_openzwave --force --install-option="--embed"
For python3

.. code-block:: bash
(venvX) pip install wheel six 'PyDispatcher>=2.0.5'
(venvX) pip install --egg python_openzwave --force --install-option="--embed"
(venvX) pip install python_openzwave --force --install-option="--embed"
You can update to the last version of python_openzwave using :

.. code-block:: bash
(venvX) pip install --egg python_openzwave --force --install-option="--embed --cleanopzw"
(venvX) pip install python_openzwave --force --install-option="--embed --cleanopzw"
- At last, you can launch pyozw_check

Expand Down
2 changes: 2 additions & 0 deletions docs/INSTALL_ARCH.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
Installing python-openzwave from archive
========================================

This method is deprecated for 0.4.X. Use pip with --embed flavor. Look at README.

This is the simplest (and the fastest) way to install python-openzwave. It comes with openzwave source files and is already cythonized.

This is surely the best solution to install python-openzwave on a raspberry pi.
Expand Down
4 changes: 1 addition & 3 deletions docs/INSTALL_MAC.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,4 @@
Installing python-openzwave on MacOs
====================================

To be done

Looking for volunteers
Look at README for 0.4.X installation.
2 changes: 2 additions & 0 deletions docs/INSTALL_REPO.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
Installing python-openzwave from repository
===========================================

This method is deprecated for 0.4.X. Use pip with --git flavor. Look at README.


Install the needed tools
========================
Expand Down
45 changes: 10 additions & 35 deletions docs/INSTALL_WIN.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ Installing python-openzwave on Windows
======================================


This HOW-TO is for 0.4.X.

It should be possible to make it pip friendly. Need a command line to build openzwave c++ lib.

How To Build python-openzwave on Windows with VS2015
====================================================

Expand All @@ -25,7 +29,7 @@ Get sources
cd openzwave
git checkout Dev
cd ..
git checkout python3
git checkout
Build open-zwave
Expand All @@ -38,43 +42,14 @@ When asked, accept the project upgrade to VS2015
Build Win32|Release


Build python-openzwave lib
--------------------------

Patch libopenzwave.pyx

Cause: ValueID has no default constructor and cython needs one for allocating objects on the stack

Fix: Allocate object on the the heap as a workaround
Build python_openzwave
----------------------

Open test/python-openzwave/src-lib/libopenzwave/libopenzwave.pyx

Go to line 437 and change:
From a Command Prompt, install it :

.. code-block:: bash
values_map.insert(pair[uint64_t, ValueID](v.GetId(), v))
To:
.. code-block:: bash
newPair = new pair[uint64_t, ValueID](v.GetId(), v)
values_map.insert(deref(newPair))
del newPair
From a Command Prompt, build it :
.. code-block:: bash
python setup-lib.py build
python setup-api.py build
And install it (in a virtualenv if needed) :
.. code-block:: bash
python setup install --dev
python setup-lib.py install
python setup-api.py install
Reference for 0.3.X : https://github.com/OpenZWave/python-openzwave/issues/53

Reference : https://github.com/OpenZWave/python-openzwave/issues/53
10 changes: 5 additions & 5 deletions docs/README.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,13 @@ python-openzwave 0.4.0 is coming !!!

.. code-block:: bash
(venvX) pip install ---egg python_openzwave --install-option="--git"
(venvX) pip install python_openzwave --install-option="--git"
To use fresh code from openzwave github :

.. code-block:: bash
(venvX) pip install --egg python_openzwave --force --install-option="--git --cleanopzw"
(venvX) pip install python_openzwave --force --install-option="--git --cleanopzw"
- If you have build and install openzwave your self, use the dynamic linking :

Expand All @@ -86,19 +86,19 @@ python-openzwave 0.4.0 is coming !!!

.. code-block:: bash
(venvX) pip install wheel six 'Louie>=1.1'
(venvX) pip install --egg python_openzwave --force --install-option="--embed"
(venvX) pip install python_openzwave --force --install-option="--embed"
For python3

.. code-block:: bash
(venvX) pip install wheel six 'PyDispatcher>=2.0.5'
(venvX) pip install --egg python_openzwave --force --install-option="--embed"
(venvX) pip install python_openzwave --force --install-option="--embed"
You can update to the last version of python_openzwave using :

.. code-block:: bash
(venvX) pip install --egg python_openzwave --force --install-option="--embed --cleanopzw"
(venvX) pip install python_openzwave --force --install-option="--embed --cleanopzw"
- At last, you can launch pyozw_check

Expand Down

0 comments on commit e802e26

Please sign in to comment.