From: Gun Kim <gune.kim@samsung.com>
Date: Fri, 24 May 2013 04:52:07 +0000 (+0900)
Subject: [Title] applied Inter's patch that is to find architecture of target.
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a6a2dc7120d3356e3f761a8ac43cd65cd48b1cc9;p=sdk%2Ftools%2Fcli.git

[Title] applied Inter's patch that is to find architecture of target.
[Type]
[Module]
[Priority]
[Jira#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]

Change-Id: I5100c11552be21dc4c616a251bb69b90c11a0234
---

diff --git a/org.tizen.cli/doc/install/native_bin/native-debug b/org.tizen.cli/doc/install/native_bin/native-debug
index b989f4e..54d75e4 100755
--- a/org.tizen.cli/doc/install/native_bin/native-debug
+++ b/org.tizen.cli/doc/install/native_bin/native-debug
@@ -120,19 +120,18 @@ parse_param() {
 }
 
 check_target_type() {
-	device="/dev/samsung_sdb"
-	sdb_cmd="$SDB_COMMAND shell \"ls $device 2> /dev/null | wc -l\""
-	result=`eval $sdb_cmd`
+	uname_cmd="$SDB_COMMAND shell \"uname -m 2> /dev/null | grep 86 | wc -l\""
+	result=`eval $uname_cmd`
 	if [ "$result" -eq "0" ]
 	then
-		TARGET_TYPE="emulator"
+		TARGET_TYPE="arm"
 	else
-		TARGET_TYPE="real"
+		TARGET_TYPE="x86"
 	fi
 }
 
 ondemand_install() {
-	if [ $TARGET_TYPE = "real" ]
+	if [ $TARGET_TYPE = "arm" ]
 	then
 		GDBSERVER_TAR="gdbserver_7.5.0_armel.tar"
 		ondemand_cmd="$SDB_COMMAND push $TOOLS_HOME/../platforms/tizen2.1/on-demand/gdbserver_7.5.0_armel.tar /home/developer/sdk_tools/gdbserver_7.5.0_armel.tar && cd /home/developer/sdk_tools/ && tar -xf gdbserver_7.5.0_armel.tar"
@@ -161,7 +160,7 @@ launch_gdbserver() {
 
 launch_gdb() {
 	`$SDB_COMMAND forward tcp:7123 tcp:26102`
-	if [ $TARGET_TYPE = "real" ]
+	if [ $TARGET_TYPE = "arm" ]
 	then
 		gdb="$TOOLS_HOME/arm-linux-gnueabi-gdb-7.5/bin/arm-linux-gnueabi-gdb"
 	else
diff --git a/org.tizen.cli/doc/install/native_bin/native-debug.bat b/org.tizen.cli/doc/install/native_bin/native-debug.bat
index 7a34490..351aca8 100755
--- a/org.tizen.cli/doc/install/native_bin/native-debug.bat
+++ b/org.tizen.cli/doc/install/native_bin/native-debug.bat
@@ -1,4 +1,4 @@
-@echo off
+#@echo off
 set SUBSTRING_START_POSITION=2
 
 set SCRIPT=%0
@@ -128,7 +128,7 @@ IF NOT %COUNT%==1 (
 
 SET COUNT=0
 IF !%BINARY%==! (
-	FOR /f "usebackq delims=" %%a IN (`%SDB_COMMAND% shell "%FIND_PKGID_COMMAND% | awk '{gsub(/[\[\]]/, "", $6); print $6}'"`) DO (
+	FOR /f "usebackq delims=" %%a IN (`%SDB_COMMAND% shell "%FIND_PKGID_COMMAND% | awk '{gsub(/[\[\]]/, \"\", $6); print $6}'"`) DO (
 		set BINARY=%%a
 	)
 )
@@ -149,7 +149,7 @@ exit /b %ERRORLEVEL%
 exit /b
 
 :ondemand_install
-	IF %TARGET_TYPE%==real (
+	IF %TARGET_TYPE%==arm (
 		set GDBSERVER_TAR=gdbserver_7.5.0_armel.tar
 	) ELSE (
 		set GDBSERVER_TAR=gdbserver_7.5.0_i386.tar
@@ -160,14 +160,14 @@ exit /b
 exit /b
 
 :check_target_type
-	FOR /f "usebackq delims=" %%a IN (`%SDB_COMMAND% shell "ls /dev/samsung_sdb 2> /dev/null | wc -l"`) DO (
+	FOR /f "usebackq delims=" %%a IN (`%SDB_COMMAND% shell "uname -m 2> /dev/null | grep 86 | wc -l"`) DO (
 		set IS_EMULATOR=%%a
 	)
 
-	IF %IS_EMULATOR%==1 (
-		set TARGET_TYPE=real
+	IF %IS_EMULATOR%==0 (
+		set TARGET_TYPE=arm
 	) ELSE (
-		set TARGET_TYPE=emulator
+		set TARGET_TYPE=x86
 	)
 exit /b
 
@@ -183,11 +183,7 @@ exit /b
 :launch_gdb
 	call %SDB_COMMAND% forward tcp:7123 tcp:26102
 
-	FOR /f "usebackq delims=" %%a IN (`%SDB_COMMAND% shell "ls /dev/samsung_sdb 2> /dev/null | wc -l"`) DO (
-		set IS_EMULATOR=%%a
-	)
-
-	IF %IS_EMULATOR%==1 (
+	IF %TARGET_TYPE%==arm (
 		call %TOOLS_HOME%\arm-linux-gnueabi-gdb-7.5\bin\arm-linux-gnueabi-gdb --eval-command="target remote:7123" --exec=%BINARY%
 	) ELSE (
 		call %TOOLS_HOME%\i386-linux-gnueabi-gdb-7.5\bin\i386-linux-gnueabi-gdb --eval-command="target remote:7123" --exec=%BINARY%