X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=auto_build.sh;h=99f2c3e7fde485b013e13a40709c8647538a71d2;hb=bb92eee2115ec8a5c07b527d5fe918f77dc6980d;hp=69627278bd21c89196de47277e63b624382e3e28;hpb=6a6c0ab6ccc54c404afa2db889dbd4053a5eb5c5;p=platform%2Fupstream%2Fiotivity.git

diff --git a/auto_build.sh b/auto_build.sh
index 6962727..99f2c3e 100755
--- a/auto_build.sh
+++ b/auto_build.sh
@@ -63,18 +63,27 @@ function build_android()
 	# 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.
-	echo "*********** Build Boost for android ***********"
-	# disable parallel build for android as gradle depends on scons to finish first
-	export SCONSFLAGS="-Q"
 
+    # Parallel builds for android are disabled as gradle depends on
+    # scons to finish first
+    SCONSFLAGS="-Q" build_android_x86 $1 $2
+    SCONSFLAGS="-Q" build_android_armeabi $1 $2
+}
+
+function build_android_x86()
+{
 	echo "*********** Build for android x86 *************"
 	scons TARGET_OS=android TARGET_ARCH=x86 RELEASE=$1 TARGET_TRANSPORT=IP $2
+	scons TARGET_OS=android TARGET_ARCH=x86 RELEASE=$1 TARGET_TRANSPORT=BT $2
+	scons TARGET_OS=android TARGET_ARCH=x86 RELEASE=$1 TARGET_TRANSPORT=BLE $2
+}
 
+function build_android_armeabi()
+{
 	echo "*********** Build for android armeabi *************"
 	scons TARGET_OS=android TARGET_ARCH=armeabi RELEASE=$1 TARGET_TRANSPORT=IP $2
-
-	# enable parallel build
-	export SCONSFLAGS="-Q -j 4"
+	scons TARGET_OS=android TARGET_ARCH=armeabi RELEASE=$1 TARGET_TRANSPORT=BT $2
+	scons TARGET_OS=android TARGET_ARCH=armeabi RELEASE=$1 TARGET_TRANSPORT=BLE $2
 }
 
 function build_arduino()
@@ -82,10 +91,12 @@ function build_arduino()
 	echo "*********** Build for arduino avr *************"
 	scons resource TARGET_OS=arduino UPLOAD=false BOARD=mega TARGET_ARCH=avr TARGET_TRANSPORT=IP SHIELD=ETH RELEASE=$1 $2
 	scons resource TARGET_OS=arduino UPLOAD=false BOARD=mega TARGET_ARCH=avr TARGET_TRANSPORT=IP SHIELD=WIFI RELEASE=$1 $2
+	scons resource TARGET_OS=arduino UPLOAD=false BOARD=mega TARGET_ARCH=avr TARGET_TRANSPORT=BLE SHIELD=RBL_NRF8001 RELEASE=$1 $2
 
 	echo "*********** Build for arduino arm *************"
 	scons resource TARGET_OS=arduino UPLOAD=false BOARD=arduino_due_x TARGET_ARCH=arm TARGET_TRANSPORT=IP SHIELD=ETH RELEASE=$1 $2
 	scons resource TARGET_OS=arduino UPLOAD=false BOARD=arduino_due_x TARGET_ARCH=arm TARGET_TRANSPORT=IP SHIELD=WIFI RELEASE=$1 $2
+	# BLE support for the Arduino Due is currently unavailable.
 }
 
 function build_tizen()
@@ -120,9 +131,11 @@ function build_darwin() # Mac OSx and iOS
 
 function unit_tests()
 {
+	echo "*********** Unit test Start *************"
 	scons resource RELEASE=false -c
 	scons resource LOGGING=false RELEASE=false
 	scons resource TEST=1 RELEASE=false
+	echo "*********** Unit test Stop *************"
 }
 
 function  help()
@@ -178,6 +191,14 @@ then
 	then
 		build_android true
 		build_android false
+	elif [ $1 = 'android_x86' ]
+	then
+        build_android_x86 true
+        build_android_x86 false
+	elif [ $1 = 'android_armeabi' ]
+	then
+        build_android_armeabi true
+        build_android_armeabi false
 	elif [ $1 = 'arduino' ]
 	then
 		build_arduino true
@@ -204,14 +225,7 @@ then
 	unit_tests
 else
 	help
-#This is temporarily changed to support the transition on the Jenkins Build Server so that current work is not hindered.
-#	exit -1
-####DELETE THE FOLLOWING 3 LINES!! And uncomment the line directly above this line!
-	build_all true
-	build_all false
-	unit_tests
+	exit -1
 fi
 
 echo "===================== done ====================="
-
-