Skip to content

Commit

Permalink
DAOS-211 build: scons install must install daos headers
Browse files Browse the repository at this point in the history
scons install was not installing headers, fixing that in src/SConscript.
Now installs an include directory with daos and daos_srv headers.
This patch also compiles adds daosbench binary in bin directory.
Removed unwanted script from utils directory. This need not be in the
tree.

Change-Id: I202f34feb693297896da79c004396559cd2f08e5
Signed-off-by: Vishwanath Venkatesan <[email protected]>
Reviewed-on: https://review.whamcloud.com/24291
Tested-by: Jenkins
Reviewed-by: Johann Lombardi <[email protected]>
  • Loading branch information
vvenkates27 authored and gnailzenh committed Dec 18, 2016
1 parent 16a3aad commit 8cd2272
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 24 deletions.
10 changes: 10 additions & 0 deletions src/SConscript
Original file line number Diff line number Diff line change
@@ -1,9 +1,19 @@
#!python
import os

HEADERS = ['daos.h', 'daos_api.h', 'daos_types.h', 'daos_errno.h',
'daos_event.h', 'daos_mgmt.h', 'daos_tier.h',
'daos_types.h']
HEADERS_SRV = ['vos.h', 'vos_types.h']
Import('env', 'PREREQS', 'DAOS_VERSION')

# Generic DAOS includes
env.Append(CPPPATH = ['#/src/include'])
for header in HEADERS:
env.Install(os.path.join('$PREFIX', 'include'), 'include/%s' % header)
for header in HEADERS_SRV:
env.Install(os.path.join('$PREFIX', 'include', 'daos_srv'),
'include/daos_srv/%s' % header)

# Generate the common libraries used by everyone
SConscript('common/SConscript', exports=['env', 'PREREQS'])
Expand Down
6 changes: 3 additions & 3 deletions src/tests/SConscript
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
Import('env', 'PREREQS')

libs = ['daos', 'daos_common', 'daos_tier', 'crt_util', 'crt',
'mpi', 'uuid', 'cmocka']
'mpi', 'uuid', 'cmocka']

denv = env.Clone()

if PREREQS is not None:
PREREQS.require(denv, 'ompi')

denv.Program('simple_array', 'simple_array.c', LIBS=libs)
denv.Program('daosbench', 'daosbench.c', LIBS=libs)

daosbench = denv.Program('daosbench', 'daosbench.c', LIBS=libs)
denv.Install('$PREFIX/bin/', daosbench)
# tests
SConscript('suite/SConscript', exports = ['denv'])
21 changes: 0 additions & 21 deletions src/utils/suppress_print.sh

This file was deleted.

0 comments on commit 8cd2272

Please sign in to comment.