X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=service%2Fresource-container%2FSConscript;h=125125202c2998aa9971190217d58df022ae7e13;hb=1ab059711996bb22d79484f57ea94e9e8dc5d661;hp=a5d80ff041d882a48801c27621b52ed9b1b504a8;hpb=fbd4a06999fd581fc2da9901e40c3f5b8569f69a;p=platform%2Fupstream%2Fiotivity.git

diff --git a/service/resource-container/SConscript b/service/resource-container/SConscript
index a5d80ff..1251252 100644
--- 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):
-    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");
 
@@ -47,11 +45,11 @@ target_os = env.get('TARGET_OS')
 
 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:
-        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
@@ -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
     *******************************************************************************
-        '''
+        ''')
         resource_container_env.Append(CPPDEFINES={'JAVA_SUPPORT':0})
 
 
@@ -80,7 +78,7 @@ if int(containerJavaSupport):
             os.environ['JAVA_HOME']+'/include/linux'
         ])
     except KeyError:
-        print ''
+        print('')
 
 
 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:
-    print ''
+    print('')
 
 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:
-        print 'Java Lib: ', os.environ['JAVA_LIB']
+        print('Java Lib: ', os.environ['JAVA_LIB'])
         resource_container_env.AppendUnique(LIBS = ['jvm'])
     except KeyError:
-        print ''
+        print('')
 
 ######################################################################
 # Source files and Targets
@@ -193,7 +191,7 @@ if target_os in ['linux', 'tizen', 'android']:
 
 conf2 = Configure(lib_env)
 if not conf2.CheckLib('curl'):
-    print '''X
+    print('''X
 *********************************** 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.
 *******************************************************************************
-    '''
+    ''')
 else:
     hue_resource_bundle_env = resource_container_env.Clone()
     hue_resource_bundle_env.AppendUnique(CCFLAGS = ['-fPIC'])