Skip to content

Commit

Permalink
Python build: copy files instead of creating link (iovisor#1989)
Browse files Browse the repository at this point in the history
After iovisor#1826 version.py is generated
by cmake in order to have the __version__ define in the module. The
previous approach of installing the python module created a link between the
src and the "build" folder, hence the version.py was actually created in the
scr folder, this caused some git noise.

This comit solves that problem by copying files instead of creating a link,
then the version.py file is only created in the "build" dir.

Signed-off-by: Mauricio Vasquez B <[email protected]>
  • Loading branch information
mauriciovasquezbernal authored and yonghong-song committed Sep 27, 2018
1 parent 27e7aea commit f138fea
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions src/python/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# Copyright (c) PLUMgrid, Inc.
# Licensed under the Apache License, Version 2.0 (the "License")

macro(symlink_file SRC DST)
execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink ${SRC} ${DST})
endmacro()
set(PYTHON_SRC __init__.py perf.py tcp.py utils.py libbcc.py table.py usdt.py)

symlink_file(${CMAKE_CURRENT_SOURCE_DIR}/bcc ${CMAKE_CURRENT_BINARY_DIR}/bcc)
foreach (PY_SRC ${PYTHON_SRC})
configure_file(bcc/${PY_SRC} ${CMAKE_CURRENT_BINARY_DIR}/bcc/${PY_SRC} COPYONLY)
endforeach()

if(NOT PYTHON_CMD)
set(PYTHON_CMD "python")
Expand Down
2 changes: 1 addition & 1 deletion tests/wrapper.sh.in
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ name=$1; shift
kind=$1; shift
cmd=$1; shift

PYTHONPATH=@CMAKE_SOURCE_DIR@/src/python
PYTHONPATH=@CMAKE_BINARY_DIR@/src/python
LD_LIBRARY_PATH=@CMAKE_BINARY_DIR@:@CMAKE_BINARY_DIR@/src/cc

ns=$name
Expand Down

0 comments on commit f138fea

Please sign in to comment.