From: uzchoi Date: Wed, 21 Sep 2016 06:03:21 +0000 (+0900) Subject: Create build_linux_secure_with_tcp and cleanup build_android job X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=86ecb7bab277746a76e88a26fabc51c0357ab150;p=contrib%2Fiotivity.git Create build_linux_secure_with_tcp and cleanup build_android job - build_linux_secure_with_tcp flag: SECURED=1, WITH_TCP=1, WITH_CLOUD=1 - clean up build_android place the android armeabi build job only TRANSPORT=All is applied which will verify all transports. This will not affect currently running Jenkins build trigger. So related yaml file should be modified for this change effective Change-Id: Id77f4fb23d45316b876356ba9b1e062c9f1e7f79 Reviewed-on: https://gerrit.iotivity.org/gerrit/12019 Tested-by: jenkins-iotivity Reviewed-by: Ziran Sun Reviewed-by: Uze Choi --- diff --git a/auto_build.py b/auto_build.py index 7ef2c28..d5c49ae 100644 --- a/auto_build.py +++ b/auto_build.py @@ -13,7 +13,7 @@ Usage: build: python %s Allowed values for : 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: @@ -52,6 +52,7 @@ 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_simulator(flag, extra_option_str) build_android(flag, extra_option_str) @@ -75,6 +76,16 @@ def build_linux_unsecured(flag, extra_option_str): } 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, + 'SECURED':1, + } + call_scons(build_options, extra_option_str) + def build_linux_unsecured_with_tcp(flag, extra_option_str): print ("*********** Build for linux with TCP ************") build_options = { @@ -156,11 +167,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 """ @@ -538,6 +551,10 @@ 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]) == "android": build_android("true", "") build_android("false", "")