Merge lp:~bzoltan/qtcreator-plugin-ubuntu/find_arch into lp:qtcreator-plugin-ubuntu

[Zoltan Balogh]

Discover the processor type of the device and the emulator

Discover the processor type of the device and the emulator

[lp:~bzoltan/qtcreator-plugin-ubuntu/find_arch]

228. By Zoltan Balogh on 2014-07-31

discover device arch

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:228
http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-ci/372/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-utopic-amd64-ci/140
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-utopic-armhf-ci/140

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtcreator-plugin-ubuntu-ci/372/rebuild

review: Approve (continuous-integration)

[lp:~bzoltan/qtcreator-plugin-ubuntu/find_arch]

229. By Zoltan Balogh on 2014-08-01

Handle the case when the serial number is wrong

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:229
http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-ci/374/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-utopic-amd64-ci/142
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-utopic-armhf-ci/142

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtcreator-plugin-ubuntu-ci/374/rebuild

review: Approve (continuous-integration)

[Benjamin Zeller (zeller-benjamin)]

OK

review: Approve

=== modified file 'share/qtcreator/ubuntu/scripts/device_search'
--- share/qtcreator/ubuntu/scripts/device_search	2014-05-14 14:18:55 +0000
+++ share/qtcreator/ubuntu/scripts/device_search	2014-08-01 06:08:23 +0000
@@ -19,8 +19,21 @@
     adb kill-server > /dev/null
     adb start-server > /dev/null
 fi
-#adb root &> /dev/null
-#if [ $?==1 ]; then
-#  exit
-#fi
-adb devices -l | grep -Ev "List of devices attached" | grep -Ev "emulator-" | sed "/^$/d"
+
+IFS=$'\n'
+
+for DEVICES_INFO in `adb devices -l | grep -Ev "List of devices attached" | grep -Ev "emulator-" | sed "/^$/d"`
+do
+        if [[ ${DEVICES_INFO} =~ ^([a-z0-9]+)(.*)$ ]]; then
+                NAME="${BASH_REMATCH[1]}"
+                REST="${BASH_REMATCH[2]}"
+		ARCH=`adb -s ${NAME} shell uname -p 2>&1|egrep -v "device not found"`
+		if [ $? -ne 0 ]
+		then
+			continue
+		fi
+		ARCH=${ARCH/arm*/armhf}
+                ARCH=${ARCH//[[:blank:]]/}
+                echo "$NAME$REST arch:$ARCH"
+        fi
+done

=== modified file 'share/qtcreator/ubuntu/scripts/local_search_images'
--- share/qtcreator/ubuntu/scripts/local_search_images	2014-03-06 14:00:58 +0000
+++ share/qtcreator/ubuntu/scripts/local_search_images	2014-08-01 06:08:23 +0000
@@ -17,4 +17,15 @@
 
 set -e
 
-ubuntu-emulator list 2>&1|grep -v "no such file or directory"
+IFS=$'\n'
+
+for EMULATOR_INFO in `ubuntu-emulator list 2>&1|grep -v "no such file or directory"`
+do
+	if [[ ${EMULATOR_INFO} =~ ^([A-Za-z0-9._%+-]+)([^ ]*) ]]; then
+		NAME="${BASH_REMATCH[1]}"
+		REST="${BASH_REMATCH[2]}"
+		ARCH=`cat  ${HOME}/.local/share/ubuntu-emulator/${NAME}/.device`
+ 		ARCH=${ARCH//[[:blank:]]/}
+		echo "$NAME${REST},arch=$ARCH"
+	fi
+done