Make DTLSHandshakeCB easier to read/understand.

[platform/upstream/iotivity.git] / auto_build.py

diff --git a/auto_build.py b/auto_build.py
index 49056c2..a89fdee 100644 (file)
--- a/auto_build.py
+++ b/auto_build.py
@@ -13,7 +13,7 @@ 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, android, arduino, tizen, 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_unsecured_with_tcp\" & \"linux_unsecured_with_rd\".
+        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\".
         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:
@@ -36,7 +36,8 @@ def call_scons(build_options, extra_option_str):
     cmd_line += " " + str(extra_option_str)
 
     print ("Running : " + cmd_line)
-    exit_code = subprocess.Popen([cmd_line], shell=True).wait()
+    sys.stdout.flush()
+    exit_code = subprocess.Popen(cmd_line, shell=True).wait()
     if exit_code != 0:
         exit(exit_code)
 
@@ -51,11 +52,14 @@ def build_all(flag, extra_option_str):
         build_linux_secured_with_rd(flag, extra_option_str)
         build_linux_unsecured_with_mq(flag, extra_option_str)
         build_linux_unsecured_with_tcp(flag, extra_option_str)
+        build_linux_secured_with_tcp(flag, extra_option_str)
+        build_linux_unsecured_with_java(flag, extra_option_str)
+        build_linux_secured_with_java(flag, extra_option_str)
         build_simulator(flag, extra_option_str)
 
-    build_android(flag, extra_option_str)
-    build_arduino(flag, extra_option_str)
-    build_tizen(flag, extra_option_str)
+        build_android(flag, extra_option_str)
+        build_arduino(flag, extra_option_str)
+        build_tizen(flag, extra_option_str)
 
     if platform.system() == "Windows":
         build_windows(flag, extra_option_str)
@@ -71,6 +75,35 @@ def build_linux_unsecured(flag, extra_option_str):
     print ("*********** Build for linux ************")
     build_options = {
                         'RELEASE':flag,
+                        'SECURED':0,
+                    }
+    call_scons(build_options, extra_option_str)
+
+def build_linux_secured_with_tcp(flag, extra_option_str):
+    print ("*********** Build for linux with Secured TCP ************")
+    build_options = {
+                        'RELEASE':flag,
+                        'WITH_TCP': 1,
+                        'WITH_CLOUD':1,
+                    }
+    call_scons(build_options, extra_option_str)
+
+def build_linux_unsecured_with_java(flag, extra_option_str):
+    print ("*********** Build for linux with Java support ************")
+    build_options = {
+                        'RELEASE':flag,
+                        'BUILD_JAVA': 1,
+                        'TARGET_TRANSPORT': 'IP',
+                    }
+    call_scons(build_options, extra_option_str)
+
+def build_linux_secured_with_java(flag, extra_option_str):
+    print ("*********** Build for linux with Java support and secured ************")
+    build_options = {
+                        'RELEASE':flag,
+                        'BUILD_JAVA': 1,
+                        'TARGET_TRANSPORT': 'IP',
+                        'SECURED': 1,
                     }
     call_scons(build_options, extra_option_str)
 
@@ -80,6 +113,7 @@ def build_linux_unsecured_with_tcp(flag, extra_option_str):
                         'RELEASE':flag,
                         'WITH_TCP': 1,
                         'TARGET_TRANSPORT': 'IP',
+                        'SECURED':0,
                     }
     call_scons(build_options, extra_option_str)
 
@@ -88,6 +122,7 @@ def build_linux_unsecured_with_rm(flag, extra_option_str):
     build_options = {
                         'ROUTING':'GW',
                         'RELEASE':flag,
+                        'SECURED':0,
                     }
     call_scons(build_options, extra_option_str)
 
@@ -95,7 +130,6 @@ def build_linux_secured(flag, extra_option_str):
     print ("*********** Build for linux with Security *************")
     build_options = {
                         'RELEASE':flag,
-                        'SECURED':1,
                     }
     call_scons(build_options, extra_option_str)
 
@@ -105,6 +139,7 @@ def build_linux_unsecured_with_ra(flag, extra_option_str):
                         'RELEASE':flag,
                         'WITH_RA':1,
                         'WITH_RA_IBB':1,
+                        'SECURED':0,
                     }
     call_scons(build_options, extra_option_str)
 
@@ -114,7 +149,6 @@ def build_linux_secured_with_ra(flag, extra_option_str):
                         'RELEASE':flag,
                         'WITH_RA':1,
                         'WITH_RA_IBB':1,
-                        'SECURED':1,
                     }
     call_scons(build_options, extra_option_str)
 
@@ -122,7 +156,8 @@ def build_linux_unsecured_with_rd(flag, extra_option_str):
     print ("*********** Build for linux With Resource Directory *************")
     build_options = {
                         'RELEASE':flag,
-                        'WITH_RD':1,
+                        'RD_MODE':'all',
+                        'SECURED':0,
                     }
     call_scons(build_options, extra_option_str)
 
@@ -130,8 +165,7 @@ def build_linux_secured_with_rd(flag, extra_option_str):
     print ("*********** Build for linux With Resource Directory & Security ************")
     build_options = {
                         'RELEASE':flag,
-                        'WITH_RD':1,
-                        'SECURED':1,
+                        'RD_MODE':'all',
                     }
     call_scons(build_options, extra_option_str)
 
@@ -140,6 +174,7 @@ def build_linux_unsecured_with_mq(flag, extra_option_str):
     build_options = {
                         'RELEASE':flag,
                         'WITH_MQ':'PUB,SUB,BROKER',
+                        'SECURED':0,
                     }
     call_scons(build_options, extra_option_str)
 
@@ -148,6 +183,7 @@ def build_linux_unsecured_with_tcp(flag, extra_option_str):
     build_options = {
                         'RELEASE':flag,
                         'WITH_TCP':'1',
+                        'SECURED':0,
                     }
     call_scons(build_options, extra_option_str)
 
@@ -155,11 +191,13 @@ def build_android(flag, extra_option_str):
     # Note: for android, as oic-resource uses C++11 feature stoi and to_string,
     # it requires gcc-4.9, currently only android-ndk-r10(for linux)
     # and windows android-ndk-r10(64bit target version) support these features.
-
-    build_android_x86(flag, extra_option_str)
-    build_android_x86_with_rm(flag, extra_option_str)
-    build_android_armeabi(flag, extra_option_str)
-    build_android_armeabi_with_rm(flag, extra_option_str)
+    print ("*********** Build for android armeabi *************")
+    build_options = {
+                        'TARGET_OS':'android',
+                        'TARGET_ARCH':'armeabi',
+                        'RELEASE':flag,
+                    }
+    call_scons(build_options, extra_option_str)
 
 def build_android_x86(flag, extra_option_str):
     """ Build Android x86 Suite """
@@ -350,7 +388,7 @@ def build_tizen(flag, extra_option_str):
     print ("Running : " + cmd_line)
     subprocess.Popen([cmd_line], shell=True).wait()
 
-    print ("*********** Build for Tizen octbstack lib and sample *************")
+    print ("*********** Build for Tizen octbstack lib and sample with security *************")
     extra_option_str = "-f resource/csdk/stack/samples/tizen/build/SConscript " + extra_option_str
     build_options = {
                         'TARGET_OS':'tizen',
@@ -360,12 +398,11 @@ def build_tizen(flag, extra_option_str):
                     }
     call_scons(build_options, extra_option_str)
 
-    print ("*********** Build for Tizen octbstack lib and sample with Security*************")
-    build_options['SECURED'] = 1
+    print ("*********** Build for Tizen octbstack lib and sample *************")
+    build_options['SECURED'] = 0
     call_scons(build_options, extra_option_str)
 
     print ("*********** Build for Tizen octbstack lib and sample with Routing Manager*************")
-    del build_options['SECURED']
     build_options['ROUTING'] = 'GW'
     call_scons(build_options, extra_option_str)
 
@@ -414,12 +451,11 @@ def build_windows(flag, extra_option_str):
                         'RELEASE':flag,
                         'WITH_RA':0,
                         'TARGET_TRANSPORT':'IP',
-                        'SECURED':1,
                         'WITH_TCP':0,
                         'BUILD_SAMPLE':'ON',
                         'LOGGING':'off',
                         'TEST':1,
-                        'WITH_RD':1,
+                        'RD_MODE':'all',
                     }
     call_scons(build_options, extra_option_str)
 
@@ -433,12 +469,11 @@ def build_msys(flag, extra_option_str):
                         'RELEASE':flag,
                         'WITH_RA':0,
                         'TARGET_TRANSPORT':'IP',
-                        'SECURED':1,
                         'WITH_TCP':0,
                         'BUILD_SAMPLE':'ON',
                         'LOGGING':'off',
                         'TEST':1,
-                        'WITH_RD':1,
+                        'RD_MODE':'all',
                     }
     call_scons(build_options, extra_option_str)
 
@@ -455,21 +490,22 @@ def unit_tests():
     build_options = {
                         'RELEASE':'false',
                     }
-    extra_option_str = "resource -c"
+    extra_option_str = "-c ."
     call_scons(build_options, extra_option_str)
 
     build_options = {
-                        'LOGGING':'false',
+                        'TEST':1,
                         'RELEASE':'false',
+                        'SECURED':0,
                     }
-    extra_option_str = "resource"
+    extra_option_str = ""
     call_scons(build_options, extra_option_str)
 
     build_options = {
                         'TEST':1,
+                        'SECURED':1,
                         'RELEASE':'false',
                     }
-    extra_option_str = "resource"
     call_scons(build_options, extra_option_str)
 
     print ("*********** Unit test Stop *************")
@@ -537,6 +573,18 @@ elif arg_num == 2:
         build_linux_unsecured_with_tcp("true", "")
         build_linux_unsecured_with_tcp("false", "")
 
+    elif str(sys.argv[1]) == "linux_secured_with_tcp":
+        build_linux_secured_with_tcp("false", "")
+        build_linux_secured_with_tcp("true", "")
+
+    elif str(sys.argv[1]) == "linux_unsecured_with_java":
+        build_linux_unsecured_with_java("false", "")
+        build_linux_unsecured_with_java("true", "")
+
+    elif str(sys.argv[1]) == "linux_secured_with_java":
+        build_linux_secured_with_java("false", "")
+        build_linux_secured_with_java("true", "")
+
     elif str(sys.argv[1]) == "android":
         build_android("true", "")
         build_android("false", "")