Zorba

Merge lp:~zorba-coders/zorba/python_installer_fix into lp:zorba

  1. python_installer_fix
  2. Merge into trunk
Proposed by Juan Zacarias
Status: Merged
Merged at revision: 11569
Proposed branch: lp:~zorba-coders/zorba/python_installer_fix
Merge into: lp:zorba
Diff against target: 11 lines (+1/-0)
1 file modified
swig/python/CMakeLists.txt (+1/-0)
To merge this branch: bzr merge lp:~zorba-coders/zorba/python_installer_fix
Reviewer Review Type Date Requested Status
Rodolfo Ochoa Approve
Juan Zacarias Approve
Review via email: mp+174895@code.launchpad.net

Commit message

Fix for python installer on Windows.

Description of the change

Fix for python installer on Windows.

To post a comment you must log in.
Revision history for this message
Juan Zacarias (juan457) :
review: Approve
Revision history for this message
Rodolfo Ochoa (rodolfo-ochoa) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/python_installer_fix/+merge/174895

Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue succeeded - proposal merged!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'swig/python/CMakeLists.txt'
2--- swig/python/CMakeLists.txt 2013-02-07 17:24:36 +0000
3+++ swig/python/CMakeLists.txt 2013-07-16 00:00:41 +0000
4@@ -56,6 +56,7 @@
5 ELSE(NOT WIN32)
6 INSTALL ( FILES
7 ${CMAKE_CURRENT_BINARY_DIR}/_zorba_api.pyd
8+ ${CMAKE_CURRENT_BINARY_DIR}/zorba_api.py
9 DESTINATION share/python
10 COMPONENT "python_swig" )
11 ENDIF(NOT WIN32)

Subscribers

People subscribed via source and target branches