projects
/
platform
/
upstream
/
iotivity.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix build error with scons-4.4.0 version which is based on python3
[platform/upstream/iotivity.git]
/
service
/
resource-container
/
SConscript
diff --git
a/service/resource-container/SConscript
b/service/resource-container/SConscript
index
a5d80ff
..
1251252
100644
(file)
--- a/
service/resource-container/SConscript
+++ b/
service/resource-container/SConscript
@@
-29,9
+29,7
@@
containerJavaSupport = ARGUMENTS.get('containerJavaSupport',0)
def filtered_glob(env, pattern, omit=[],
ondisk=True, source=False, strings=False):
def filtered_glob(env, pattern, omit=[],
ondisk=True, source=False, strings=False):
- return filter(
- lambda f: os.path.basename(f.path) not in omit,
- env.Glob(pattern))
+ return [f for f in env.Glob(pattern) if os.path.basename(f.path) not in omit]
env.AddMethod(filtered_glob, "FilteredGlob");
env.AddMethod(filtered_glob, "FilteredGlob");
@@
-47,11
+45,11
@@
target_os = env.get('TARGET_OS')
if int(containerJavaSupport):
try:
if int(containerJavaSupport):
try:
- print
'Java Home: ', os.environ['JAVA_HOME']
- print
'Java Lib: ', os.environ['JAVA_LIB']
+ print
('Java Home: ', os.environ['JAVA_HOME'])
+ print
('Java Lib: ', os.environ['JAVA_LIB'])
resource_container_env.Append(CPPDEFINES={'JAVA_SUPPORT':1})
except KeyError:
resource_container_env.Append(CPPDEFINES={'JAVA_SUPPORT':1})
except KeyError:
- print
'''
+ print
(
'''
*********************************** Error *************************************
* Building resource container without Java support. JAVA_HOME or JAVA_LIB are not set properly
* Please configure JAVA_HOME to point to your Java 7 JDK and
*********************************** Error *************************************
* Building resource container without Java support. JAVA_HOME or JAVA_LIB are not set properly
* Please configure JAVA_HOME to point to your Java 7 JDK and
@@
-59,7
+57,7
@@
if int(containerJavaSupport):
* Example: export JAVA_HOME=/usr/lib/jvm/java-7-openjdk-i386
* export JAVA_LIB=/usr/lib/jvm/java-7-openjdk-i386/jre/lib/i386/server
*******************************************************************************
* Example: export JAVA_HOME=/usr/lib/jvm/java-7-openjdk-i386
* export JAVA_LIB=/usr/lib/jvm/java-7-openjdk-i386/jre/lib/i386/server
*******************************************************************************
- '''
+ '''
)
resource_container_env.Append(CPPDEFINES={'JAVA_SUPPORT':0})
resource_container_env.Append(CPPDEFINES={'JAVA_SUPPORT':0})
@@
-80,7
+78,7
@@
if int(containerJavaSupport):
os.environ['JAVA_HOME']+'/include/linux'
])
except KeyError:
os.environ['JAVA_HOME']+'/include/linux'
])
except KeyError:
- print
''
+ print
('')
if target_os not in ['windows']:
if target_os not in ['windows']:
@@
-98,7
+96,7
@@
if target_os == 'android':
try:
resource_container_env.AppendUnique(LIBPATH = [os.environ['JAVA_LIB']])
except KeyError:
try:
resource_container_env.AppendUnique(LIBPATH = [os.environ['JAVA_LIB']])
except KeyError:
- print
''
+ print
('')
resource_container_env.PrependUnique(LIBS = ['coap'])
resource_container_env.AppendUnique(LIBS = ['connectivity_abstraction'])
resource_container_env.PrependUnique(LIBS = ['coap'])
resource_container_env.AppendUnique(LIBS = ['connectivity_abstraction'])
@@
-119,10
+117,10
@@
if resource_container_env.get('SECURED') == '1':
if int(containerJavaSupport):
try:
if int(containerJavaSupport):
try:
- print
'Java Lib: ', os.environ['JAVA_LIB']
+ print
('Java Lib: ', os.environ['JAVA_LIB'])
resource_container_env.AppendUnique(LIBS = ['jvm'])
except KeyError:
resource_container_env.AppendUnique(LIBS = ['jvm'])
except KeyError:
- print
''
+ print
('')
######################################################################
# Source files and Targets
######################################################################
# Source files and Targets
@@
-193,7
+191,7
@@
if target_os in ['linux', 'tizen', 'android']:
conf2 = Configure(lib_env)
if not conf2.CheckLib('curl'):
conf2 = Configure(lib_env)
if not conf2.CheckLib('curl'):
- print
'''X
+ print
(
'''X
*********************************** Error *************************************
* Cannot build hue sample. Please install libcurl.
* Example (Ubuntu):
*********************************** Error *************************************
* Cannot build hue sample. Please install libcurl.
* Example (Ubuntu):
@@
-202,7
+200,7
@@
if not conf2.CheckLib('curl'):
* Hint: check with pkg-config --libs libcurl and clear scons cache.
* Skipping hue sample build.
*******************************************************************************
* Hint: check with pkg-config --libs libcurl and clear scons cache.
* Skipping hue sample build.
*******************************************************************************
- '''
+ '''
)
else:
hue_resource_bundle_env = resource_container_env.Clone()
hue_resource_bundle_env.AppendUnique(CCFLAGS = ['-fPIC'])
else:
hue_resource_bundle_env = resource_container_env.Clone()
hue_resource_bundle_env.AppendUnique(CCFLAGS = ['-fPIC'])