Merge "Fix zeroing of OCServerResponse payload array"

[platform/upstream/iotivity.git] / extra_options.scons

diff --git a/extra_options.scons b/extra_options.scons
index e1280da..dc2e48e 100644 (file)
--- a/extra_options.scons
+++ b/extra_options.scons
@@ -11,36 +11,6 @@ target_os = env.get('TARGET_OS')
 target_arch = env.get('TARGET_ARCH')
 src_dir = env.get('SRC_DIR')
 
-# Add 'OIC_UTILS' build option for user to set oic-utilities project path
-if target_os not in ['linux', 'darwin', 'arduino']:
-       default_dir = os.environ.get('OIC_UTILS')
-       if not default_dir:
-               default_dir = os.path.abspath(src_dir + '/../oic-utilities')
-       else:
-               default_dir = os.path.abspath(default_dir)
-
-       if not os.path.exists(default_dir):
-               default_dir = None
-
-       help_vars = Variables()
-       help_vars.Add(PathVariable('OIC_UTILS', 'oic-utilities project path', default_dir))
-       help_vars.Update(env)
-       Help(help_vars.GenerateHelpText(env))
-
-       utils_path = env.get('OIC_UTILS', default_dir)
-       if utils_path:
-               utils_path = os.path.abspath(utils_path)
-
-       if not utils_path or not os.path.exists(utils_path):
-               print '''
-*********************************** Error: ************************************
-*   oic-utilities project directory isn't set properly, please set enviornment*
-* variable OIC_UTILS or set it in command line:                               *
-*     # scons  OIC_UTILS=<path to oic-utilities> ...                          *
-*******************************************************************************
-'''
-               Exit(1)
-
 if target_os == 'arduino':
        # Add 'NET' build option, let user select board network connection type
        vars = Variables()