projects
/
platform
/
upstream
/
iotivity.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[IOT-1442] Apply the new ACL policy for device owner and resource owner.
[platform/upstream/iotivity.git]
/
SConstruct
diff --git
a/SConstruct
b/SConstruct
index
1e8ebfb
..
ac76f39
100644
(file)
--- a/
SConstruct
+++ b/
SConstruct
@@
-56,18
+56,18
@@
build_dir = env.get('BUILD_DIR')
# Build 'resource' sub-project
SConscript(build_dir + 'resource/SConscript')
# Build 'resource' sub-project
SConscript(build_dir + 'resource/SConscript')
-if target_os not in ['arduino','darwin','ios', 'android']:
+if target_os not in ['arduino','darwin','ios', 'android'
, 'msys_nt', 'windows'
]:
SConscript(build_dir + 'examples/OICMiddle/SConscript')
# Build 'service' sub-project
SConscript(build_dir + 'service/SConscript')
SConscript(build_dir + 'examples/OICMiddle/SConscript')
# Build 'service' sub-project
SConscript(build_dir + 'service/SConscript')
-# Build "plugin interface" sub-project
-SConscript(build_dir + 'plugins/SConscript')
-
# Build "cloud" sub-project
SConscript(build_dir + 'cloud/SConscript')
# Build "cloud" sub-project
SConscript(build_dir + 'cloud/SConscript')
+# Build "plugin interface" sub-project
+SConscript(build_dir + 'plugins/SConscript')
+
# Append targets information to the help information, to see help info, execute command line:
# $ scon [options] -h
env.PrintTargets()
# Append targets information to the help information, to see help info, execute command line:
# $ scon [options] -h
env.PrintTargets()
@@
-76,6
+76,6
@@
env.PrintTargets()
if target_os == 'arduino':
env.UploadHelp()
if target_os == 'arduino':
env.UploadHelp()
-# to install the generated pc file into custom
e
prefix location
+# to install the generated pc file into custom prefix location
env.UserInstallTargetPCFile('iotivity.pc', 'iotivity.pc')
env.UserInstallTargetPCFile('iotivity.pc', 'iotivity.pc')