[IOT-2680] Remove WITH_RA option from code script 93/22393/5
authorkoushik.girijala <g.koushik@samsung.com>
Fri, 8 Sep 2017 12:23:20 +0000 (17:53 +0530)
committerAshok Babu Channa <ashok.channa@samsung.com>
Wed, 4 Oct 2017 05:40:08 +0000 (05:40 +0000)
as RA related build option is not valid anymore

Change-Id: I9b197b258c575e0f00c443bee5d28c09e1876bb4
Signed-off-by: koushik.girijala <g.koushik@samsung.com>
Readme.scons.txt
auto_build.py
build_common/SConscript
run.bat
service/easy-setup/sampleapp/enrollee/tizen-sdb/EnrolleeSample/SConscript

index 5ea8725..5d92938 100644 (file)
@@ -281,7 +281,6 @@ See run.bat for more example usage parameters
  * BUILD_SAMPLE=ON or OFF (Build with sample)
  * ROUTING=GW or EP (Enable routing)
  * WITH_TCP=true or false (Enable CoAP over TCP Transport, arduino is not supported)
- * WITH_RA=true or false (Build with Remote Access module)
  * RD_MODE=CLIENT or SERVER (Build including Resource Directory)
  * SIMULATOR=true or false (Build with simulator module)
  * Possible values for <WITH_MQ> are: PUB,SUB,BROKER (Build including Message Queue)
index 27c86aa..66d15a5 100755 (executable)
@@ -12,9 +12,9 @@ def helpmsg(script):
 Usage:
     build:
         python %s <targetbuild>
-        Allowed values for <target_build>: all, linux_unsecured, linux_secured, linux_unsecured_with_ra, linux_secured_with_ra, linux_unsecured_with_rd, linux_secured_with_rd,
+        Allowed values for <target_build>: all, linux_unsecured, linux_secured, linux_unsecured_with_rd, linux_secured_with_rd,
         android, android_unsecured, android_secured, arduino, tizen, tizen_unsecured, tizen_secured, simulator, darwin, windows, msys
-        Note: \"linux\" will build \"linux_unsecured\", \"linux_secured\", \"linux_unsecured_with_ra\", \"linux_secured_with_ra\", \"linux_secured_with_rd\", \"linux_unsecured_with_mq\", \"linux_secured_with_tcp\" & \"linux_unsecured_with_tcp\" & \"linux_unsecured_with_rd\".
+        Note: \"linux\" will build \"linux_unsecured\", \"linux_secured\", \"linux_secured_with_rd\", \"linux_unsecured_with_mq\", \"linux_secured_with_tcp\" & \"linux_unsecured_with_tcp\" & \"linux_unsecured_with_rd\".
         Any selection will build both debug and release versions of all available targets in the scope you've selected.
         To choose any specific command, please use the SCons commandline directly. Please refer to [IOTIVITY_REPO]/Readme.scons.txt.
     clean:
@@ -49,8 +49,6 @@ def build_all(flag, extra_option_str):
     if platform.system() == "Linux":
         build_linux_unsecured(flag, extra_option_str)
         build_linux_secured(flag, extra_option_str)
-        build_linux_unsecured_with_ra(flag, extra_option_str)
-        build_linux_secured_with_ra(flag, extra_option_str)
         build_linux_unsecured_with_rm(flag, extra_option_str)
         build_linux_unsecured_with_rd(flag, extra_option_str)
         build_linux_secured_with_rd(flag, extra_option_str)
@@ -138,25 +136,6 @@ def build_linux_secured(flag, extra_option_str):
                     }
     call_scons(build_options, extra_option_str)
 
-def build_linux_unsecured_with_ra(flag, extra_option_str):
-    print ("*********** Build for linux With Remote Access *************")
-    build_options = {
-                        'RELEASE':flag,
-                        'WITH_RA':1,
-                        'WITH_RA_IBB':1,
-                        'SECURED':0,
-                    }
-    call_scons(build_options, extra_option_str)
-
-def build_linux_secured_with_ra(flag, extra_option_str):
-    print ("*********** Build for linux With Remote Access & Security ************")
-    build_options = {
-                        'RELEASE':flag,
-                        'WITH_RA':1,
-                        'WITH_RA_IBB':1,
-                    }
-    call_scons(build_options, extra_option_str)
-
 def build_linux_unsecured_with_rd(flag, extra_option_str):
     print ("*********** Build for linux With Resource Directory *************")
     build_options = {
@@ -474,7 +453,6 @@ def build_windows(flag, extra_option_str):
                         'TARGET_OS':'windows',
                         'TARGET_ARCH':'amd64',
                         'RELEASE':flag,
-                        'WITH_RA':0,
                         'TARGET_TRANSPORT':'IP',
                         'WITH_TCP':0,
                         'BUILD_SAMPLE':'ON',
@@ -492,7 +470,6 @@ def build_msys(flag, extra_option_str):
                         'TARGET_OS':'msys_nt',
                         'TARGET_ARCH':'x86_64',
                         'RELEASE':flag,
-                        'WITH_RA':0,
                         'TARGET_TRANSPORT':'IP',
                         'WITH_TCP':0,
                         'BUILD_SAMPLE':'ON',
@@ -579,14 +556,6 @@ elif arg_num == 2:
         build_linux_secured("true", "")
         build_linux_secured("false", "")
 
-    elif str(sys.argv[1]) == "linux_unsecured_with_ra":
-        build_linux_unsecured_with_ra("true", "")
-        build_linux_unsecured_with_ra("false", "")
-
-    elif str(sys.argv[1]) == "linux_secured_with_ra":
-        build_linux_secured_with_ra("true", "")
-        build_linux_secured_with_ra("false", "")
-
     elif str(sys.argv[1]) == "linux_unsecured_with_rd":
         build_linux_unsecured_with_rd("true", "")
         build_linux_unsecured_with_rd("false", "")
index 3123236..0cf3f0e 100755 (executable)
@@ -124,9 +124,6 @@ help_vars.AddVariables(
                  'Target platform',
                  default=host,
                  allowed_values=targetlist),
-    BoolVariable('WITH_RA',
-                 'Build with Remote Access module',
-                 default=False),
     BoolVariable('WITH_TCP',
                  'Build with TCP adapter',
                  default=False),
@@ -147,9 +144,6 @@ help_vars.AddVariables(
     BoolVariable('SIMULATOR',
                  'Build with simulator module',
                  default=False),
-    BoolVariable('WITH_RA_IBB',
-                 'Build with Remote Access module(workssys)',
-                 default=False),
     EnumVariable('TARGET_ARCH',
                  'Target architecture',
                  default=default_arch,
diff --git a/run.bat b/run.bat
index 19cfa18..9826600 100644 (file)
--- a/run.bat
+++ b/run.bat
@@ -144,7 +144,7 @@ IF "%BUILD_MSYS%" == "" (
   set PATH=!PATH!;!BUILD_DIR!;C:\msys64\mingw64\bin
 )
 
-set BUILD_OPTIONS= TARGET_OS=%TARGET_OS% TARGET_ARCH=%TARGET_ARCH% MSVC_UWP_APP=%MSVC_UWP_APP% RELEASE=%RELEASE% WITH_RA=0 TARGET_TRANSPORT=IP SECURED=%SECURED% WITH_TCP=%WITH_TCP% BUILD_SAMPLE=ON LOGGING=%LOGGING% LOG_LEVEL=%LOG_LEVEL% RD_MODE=%RD_MODE% ROUTING=%ROUTING% WITH_UPSTREAM_LIBCOAP=%WITH_UPSTREAM_LIBCOAP% MULTIPLE_OWNER=%MULTIPLE_OWNER% AUTOMATIC_UPDATE=%AUTOMATIC_UPDATE% BUILD_JAVA=%BUILD_JAVA%
+set BUILD_OPTIONS= TARGET_OS=%TARGET_OS% TARGET_ARCH=%TARGET_ARCH% MSVC_UWP_APP=%MSVC_UWP_APP% RELEASE=%RELEASE% TARGET_TRANSPORT=IP SECURED=%SECURED% WITH_TCP=%WITH_TCP% BUILD_SAMPLE=ON LOGGING=%LOGGING% LOG_LEVEL=%LOG_LEVEL% RD_MODE=%RD_MODE% ROUTING=%ROUTING% WITH_UPSTREAM_LIBCOAP=%WITH_UPSTREAM_LIBCOAP% MULTIPLE_OWNER=%MULTIPLE_OWNER% AUTOMATIC_UPDATE=%AUTOMATIC_UPDATE% BUILD_JAVA=%BUILD_JAVA%
 
 REM Use MSVC_VERSION=12.0 for VS2013, or MSVC_VERSION=14.0 for VS2015.
 REM If MSVC_VERSION has not been defined here, SCons chooses automatically a VS version.
index 6958af5..3a82be1 100644 (file)
@@ -135,8 +135,6 @@ help_vars.Add(BoolVariable('RELEASE', 'Build for release?',
 help_vars.Add(
     EnumVariable('TARGET_OS', 'Target platform', host, host_target_map[host]))
 
-help_vars.Add(
-    BoolVariable('WITH_RA', 'Build with Remote Access module', False))
 help_vars.Add(BoolVariable('WITH_TCP', 'Build with TCP adapter', False))
 help_vars.Add(BoolVariable('WITH_PROXY', 'Build with CoAP-HTTP Proxy', False))
 help_vars.Add(
@@ -152,10 +150,6 @@ help_vars.Add(
 
 help_vars.Add(BoolVariable('SIMULATOR', 'Build with simulator module', False))
 
-help_vars.Add(
-    BoolVariable('WITH_RA_IBB', 'Build with Remote Access module(workssys)',
-                 False))
-
 if target_os in targets_disallow_multitransport:
     help_vars.Add(
         ListVariable('TARGET_TRANSPORT', 'Target transport', 'IP',