emulator_option: enhance scripts and error reporting

Prevent duplicated reporting.
Use default conf file if no options provided.

Change-Id: Ib9e335b6ef18c5e68c9dc9f42c4e3de755f431bf
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

diff --git a/tizen/src/emulator_options.c b/tizen/src/emulator_options.c
index a9d28cd5e26bcec310e35d25d40f7213bd4fa293..2c43aa691f7fa225c12b5be5612a54262e4f749c 100644 (file)
--- a/tizen/src/emulator_options.c
+++ b/tizen/src/emulator_options.c
@@ -175,6 +175,7 @@ static char *substitute_variables(char *src)
                         " \"--%s\" or profile default file or envirionment"
                         " variable.\n", name, name);
                 value = (char *)"";
+                set_variable(name, value, false);
             }
 
             length = start_index + strlen(value) + (strlen(str) - end_index);

diff --git a/tizen/src/scripts/emulator.sh b/tizen/src/scripts/emulator.sh
index 25f16ab13f166381db1203179773698ba93ab8bd..3c3a703877930b4b1c95f37ed98ea6d93da85007 100755 (executable)
--- a/tizen/src/scripts/emulator.sh
+++ b/tizen/src/scripts/emulator.sh
@@ -19,9 +19,23 @@ EMULATOR_INSTALLED_PATH=$(readlink -f $EMULATOR_INSTALLED_PATH)
 EMULATOR_BIN_PATH=$EMULATOR_INSTALLED_PATH/bin
 LIBRARY_PATH=$EMULATOR_BIN_PATH:$EMULATOR_INSTALLED_PATH/remote/lib:
 
-# run emulator
+# check "--with-gdb"
+WITH_GDB="no"
 if [ "$1" = "--with-gdb" ]; then
        shift
+       WITH_GDB="yes"
+fi
+
+# use default conf file if no options provided
+if [ -z $1 ]; then
+       if [ -e $HOME/.emulator_default.conf ]; then
+               set -- "--conf" "$HOME/.emulator_default.conf"
+               echo "No options provided. Use default conf file [$HOME/.emulator_default.conf]."
+       fi
+fi
+
+# run emulator
+if [ "$WITH_GDB" = "yes" ]; then
        LD_LIBRARY_PATH=$LIBRARY_PATH gdb --args $EMULATOR_BIN_PATH/emulator-x86 $@
 else
        LD_LIBRARY_PATH=$LIBRARY_PATH $EMULATOR_BIN_PATH/emulator-x86 $@