Merge branch 'tizen_2.4_develop' into tizen_3.0_develop
authorSeokYeon Hwang <syeon.hwang@samsung.com>
Wed, 9 Sep 2015 05:34:17 +0000 (14:34 +0900)
committerSeokYeon Hwang <syeon.hwang@samsung.com>
Wed, 9 Sep 2015 05:34:28 +0000 (14:34 +0900)
Change-Id: Ibf4bc4ff0d810ce2653b248a896de7fd61497a98
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
14 files changed:
1  2 
configure
package/3.0-emulator-qemu-x86.install.macos-64
package/3.0-emulator-qemu-x86.install.ubuntu-32
package/3.0-emulator-qemu-x86.install.ubuntu-64
package/3.0-emulator-qemu-x86.remove.ubuntu-32
package/3.0-emulator-qemu-x86.remove.ubuntu-64
package/changelog
package/pkginfo.manifest
tizen/emulator_configure.sh
tizen/src/Makefile
tizen/src/emul_state.c
tizen/src/emul_state.h
tizen/src/emulator.c
tizen/src/scripts/emulator.sh

diff --cc configure
Simple merge
index 702f2c0925c9d0b5fa15d2abcb9d70bb1fbec664,0000000000000000000000000000000000000000..9a7841619e19920f9f8a5ce968c8f5f093287e37
mode 100755,000000..100755
--- /dev/null
@@@ -1,177 -1,0 +1,182 @@@
- COCOASUDO_PATH="$TIZEN_SDK_INSTALL_PATH/tools/emulator/bin"
- TIZEN_BIN_PATH="$TIZEN_SDK_INSTALL_PATH/platforms/tizen-3.0/common/emulator/bin"
- TIZEN_PLATFORM_ETC_PATH="$TIZEN_SDK_INSTALL_PATH/platforms/tizen-3.0/common/emulator/etc"
- TIZEN_TOOL_ETC_PATH="$TIZEN_SDK_INSTALL_PATH/tools/emulator/etc"
- TMP_FILE="$TMP_DIR/emulator-install.sh"
 +#!/bin/sh -e
 +
 +TIZEN_SDK_INSTALL_PATH="`echo $INSTALLED_PATH`"
 +OLD_SHMMAXSIZE=`sysctl -n kern.sysv.shmmax`
 +SYSCTL_FILE=sysctl.conf
 +TMP_DIR=~/.installmanager
- if [ -z $TIZEN_SDK_INSTALL_PATH ]
++COCOASUDO_PATH=$TIZEN_SDK_INSTALL_PATH/tools/emulator/bin
++TIZEN_BIN_PATH=$TIZEN_SDK_INSTALL_PATH/platforms/tizen-3.0/common/emulator/bin
++TIZEN_PLATFORM_ETC_PATH=$TIZEN_SDK_INSTALL_PATH/platforms/tizen-3.0/common/emulator/etc
++TIZEN_TOOL_ETC_PATH=$TIZEN_SDK_INSTALL_PATH/tools/emulator/etc
++TMP_FILE=$TMP_DIR/emulator-install.sh
 +NEW_SHMMAXSIZE=83886080
-     if [ -e $TMP_FILE ]
++if [ -z "$TIZEN_SDK_INSTALL_PATH" ]
 +then
 +   echo "There is no TIZEN_SDK_PATH ENV" >> /tmp/emulator.log
 +#   exit 2;
 +fi
 +
 +function remove_tmp_file {
-         rm -f $TMP_FILE
++    if [ -e "$TMP_FILE" ]
 +    then
 +        echo "delete $TMP_FILE"
-     if [ -e $TMP_DIR/$SYSCTL_FILE ]
++        rm -f "$TMP_FILE"
 +    fi
 +}
 +
 +function remove_sysctl_file {
-         rm -f $TMP_DIR/$SYSCTL_FILE
++    if [ -e "$TMP_DIR/$SYSCTL_FILE" ]
 +    then
 +        echo "delete $TMP_DIR/$SYSCTL_FILE"
-     echo "kern.sysv.shmmax=83886080" >> $TMP_DIR/$SYSCTL_FILE
-     echo "kern.sysv.shmmin=1" >> $TMP_DIR/$SYSCTL_FILE
-     echo "kern.sysv.shmmni=128" >> $TMP_DIR/$SYSCTL_FILE
-     echo "kern.sysv.shmseg=32" >> $TMP_DIR/$SYSCTL_FILE
-     echo "kern.sysv.shmall=20480" >> $TMP_DIR/$SYSCTL_FILE
++        rm -f "$TMP_DIR/$SYSCTL_FILE"
 +    fi
 +}
 +
 +function makesysctl {
 +    echo 'make new sysctl.conf file to change'
 +
 +    remove_sysctl_file;
 +
-       echo "cp -pR ${TIZEN_PLATFORM_ETC_PATH}/emulator-ifup.sh  /etc/" >> $TMP_FILE
++    echo "kern.sysv.shmmax=83886080" >> "$TMP_DIR/$SYSCTL_FILE"
++    echo "kern.sysv.shmmin=1" >> "$TMP_DIR/$SYSCTL_FILE"
++    echo "kern.sysv.shmmni=128" >> "$TMP_DIR/$SYSCTL_FILE"
++    echo "kern.sysv.shmseg=32" >> "$TMP_DIR/$SYSCTL_FILE"
++    echo "kern.sysv.shmall=20480" >> "$TMP_DIR/$SYSCTL_FILE"
 +}
 +
 +function generate_tap_kext_cmd {
-     echo "cp -pR ${TIZEN_TOOL_ETC_PATH}/tap.kext /Library/Extensions" >> $TMP_FILE
-     echo "chown -R root:wheel /Library/Extensions/tap.kext" >> $TMP_FILE
-     echo "mkdir -p /Library/LaunchDaemons" >> $TMP_FILE
-     echo "cp /Library/Extensions/tap.kext/Contents/net.sf.tuntaposx.tap.plist /Library/LaunchDaemons" >> $TMP_FILE
-     echo "/sbin/kextload /Library/Extensions/tap.kext" >> $TMP_FILE
++    echo "cp -pR \"${TIZEN_PLATFORM_ETC_PATH}/emulator-ifup.sh\"  /etc/" >> "$TMP_FILE"
 +    echo "mkdir -p /Library/Extensions" >> $TMP_FILE
-         if [ -e /etc/$SYSCTL_FILE ]
++    echo "rm -rf \"${TIZEN_TOOL_ETC_PATH}/tap.kext\"" >> "$TMP_FILE"
++    echo "ditto -x -k \"${TIZEN_TOOL_ETC_PATH}/tap.zip\" \"${TIZEN_TOOL_ETC_PATH}\"" >> "$TMP_FILE"
++    echo "rm -f \"${TIZEN_TOOL_ETC_PATH}/tap.zip\"" >> "$TMP_FILE"
++    echo "cp -pR \"${TIZEN_TOOL_ETC_PATH}/tap.kext\" /Library/Extensions" >> "$TMP_FILE"
++    echo "chown -R root:wheel /Library/Extensions/tap.kext" >> "$TMP_FILE"
++    echo "mkdir -p /Library/LaunchDaemons" >> "$TMP_FILE"
++    echo "cp /Library/Extensions/tap.kext/Contents/net.sf.tuntaposx.tap.plist /Library/LaunchDaemons" >> "$TMP_FILE"
++    echo "kextutil -nt /Library/Extensions/tap.kext" >> "$TMP_FILE"
++    echo "/sbin/kextload /Library/Extensions/tap.kext" >> "$TMP_FILE"
 +}
 +
 +function generate_sysctl_cmd {
 +    if [ $OLD_SHMMAXSIZE -lt $NEW_SHMMAXSIZE ]
 +    then
-             echo "mv -f /etc/sysctl.conf /etc/sysctl.conf.old" >> $TMP_FILE
-             echo "cp -f $TMP_DIR/$SYSCTL_FILE /etc/." >> $TMP_FILE
-             echo "sysctl -w kern.sysv.shmmax=$NEW_SHMMAXSIZE" >> $TMP_FILE
-             echo 'echo "Changing /etc/sysctl.conf file. (The original file will be removed to sysctl.conf.old)"' >> $TMP_FILE
++        if [ -e "/etc/$SYSCTL_FILE" ]
 +        then
 +            makesysctl;
-             echo "cp -f $TMP_DIR/$SYSCTL_FILE /etc/." >> $TMP_FILE
-             echo "sysctl -w kern.sysv.shmmax=$NEW_SHMMAXSIZE" >> $TMP_FILE
-             echo 'echo "Make a new /etc/sysctl.conf file."' >> $TMP_FILE
++            echo "mv -f /etc/sysctl.conf /etc/sysctl.conf.old" >> "$TMP_FILE"
++            echo "cp -f \"$TMP_DIR/$SYSCTL_FILE\" /etc/." >> "$TMP_FILE"
++            echo "sysctl -w kern.sysv.shmmax=$NEW_SHMMAXSIZE" >> "$TMP_FILE"
++            echo 'echo "Changing /etc/sysctl.conf file. (The original file will be removed to sysctl.conf.old)"' >> "$TMP_FILE"
 +        else
 +            makesysctl;
-     if [ ! -d $TMP_DIR ]
++            echo "cp -f \"$TMP_DIR/$SYSCTL_FILE\" /etc/." >> "$TMP_FILE"
++            echo "sysctl -w kern.sysv.shmmax=$NEW_SHMMAXSIZE" >> "$TMP_FILE"
++            echo 'echo "Make a new /etc/sysctl.conf file."' >> "$TMP_FILE"
 +        fi
 +    fi
 +}
 +
 +function generate_sudoer_cmd {
 +cat << 'EOF' >> $TMP_FILE
 +FILE=/etc/sudoers
 +BACKFILE=/etc/sudoers.bak
 +TMPFILE=/etc/sudoers.tmp
 +MESSAGE="# Tizen SDK generated the following script. Do not modify."
 +LINE1="User_Alias QEMUERS="
 +LINE2="Cmnd_Alias QEMU=/etc/emulator-ifup.sh, /etc/emulator-ifdown.sh"
 +LINE3="QEMUERS ALL=(ALL) NOPASSWD: QEMU"
 +count=0
 +
 +if [[ "$USER" == "" ]]
 +then
 +    echo "user is not set. aborting..."
 +    exit 1
 +fi
 +
 +while read line
 +do
 +    echo $line
 +    count=$((count+1))
 +    if [[ $line == $LINE1* ]]
 +    then
 +        echo "find original script"
 +        NAMES=`echo $line | cut -d = -f2`
 +        if [[ "$NAMES"x == ""x ]]
 +        then
 +            cp $FILE $BACKFILE
 +            # in case of blank user
 +            eval sed -e "$count"c\"$line $USER\" $FILE > $TMPFILE
 +            exit 0
 +        fi
 +        for i in $(echo $NAMES | tr "," "\n")
 +        do
 +            if [[ "$i" == "$USER" ]]
 +            then
 +                echo "already added the same user"
 +                exit 0
 +            fi
 +        done
 +        cp $FILE $BACKFILE
 +        # new user is added with comma behind the original users.
 +        eval sed -e "$count"c\"$line, $USER\" $FILE > $TMPFILE
 +        mv $TMPFILE $FILE
 +        exit 0
 +        fi
 +done < $FILE
 +
 +cp $FILE $BACKFILE
 +echo "do not find qemu sudoer. add it"
 +echo "$MESSAGE" >> $FILE
 +echo "$LINE1$USER" >> $FILE
 +echo "$LINE2" >> $FILE
 +echo "$LINE3" >> $FILE
 +exit 0
 +EOF
 +
 +}
 +
 +function prepare {
-         mkdir $TMP_DIR
++    TAP_ZIP_FILE="$TIZEN_TOOL_ETC_PATH/tap.zip"
++    TAP_KEXT="$TIZEN_TOOL_ETC_PATH/tap.kext"
++    if [ ! -d "$TMP_DIR" ]
 +    then
 +        echo "make temp directory for emulator install : ( $TMP_DIR )"
-     echo "#!/bin/sh" > $TMP_FILE
-     echo "TIZEN_SDK_INSTALL_PATH=$TIZEN_SDK_INSTALL_PATH" >> $TMP_FILE
-     echo "USER=$USER" >> $TMP_FILE
++        mkdir "$TMP_DIR"
 +    fi
 +    USER=`id -un`
 +    echo "create $TMP_FILE"
-     /bin/chmod +x $TMP_FILE
-     $COCOASUDO_PATH/cocoasudo --prompt="Please enter your password to install Tizen Emulator." sh -x $TMP_FILE
++    echo "#!/bin/sh" > "$TMP_FILE"
++    echo "TIZEN_SDK_INSTALL_PATH=$TIZEN_SDK_INSTALL_PATH" >> "$TMP_FILE"
++    echo "USER=$USER" >> "$TMP_FILE"
 +}
 +
 +function generate {
 +    generate_sysctl_cmd;
 +    generate_tap_kext_cmd;
 +    generate_sudoer_cmd;
 +}
 +
 +function execute {
++    /bin/chmod +x "$TMP_FILE"
++    "$COCOASUDO_PATH/cocoasudo" --prompt="Please enter your password to install Tizen Emulator." sh -x "$TMP_FILE"
 +}
 +
 +function cleanup {
 +    remove_tmp_file;
 +    remove_sysctl_file;
 +}
 +
 +prepare;
 +generate;
 +execute;
 +cleanup;
 +
 +CURRENT_SHMMAXSIZE=`sysctl -n kern.sysv.shmmax`
 +
 +if [ ! $OLD_SHMMAXSIZE -eq $CURRENT_SHMMAXSIZE ]
 +then
 +    echo 'need reboot'
 +    exit 99
 +fi
 +
index e1f239bb4ad8429b1c9590f30f0abe19602910f1,0000000000000000000000000000000000000000..8710d0a4d9e5be05cf4c812ec6c2cdcceebac770
mode 100755,000000..100755
--- /dev/null
@@@ -1,123 -1,0 +1,123 @@@
- TIZEN_KVM_SCRIPT="/etc/init.d/tizen-kvm-multi"
 +#!/bin/bash -x
 +
- if [ -z ${TIZEN_SDK_INSTALL_PATH} ]
++TIZEN_KVM_SCRIPT=/etc/init.d/tizen-kvm-multi
 +if [ -f ${TIZEN_KVM_SCRIPT} ]
 +then
 +      echo "tizen-kvm-multi does exist. tizen-kvm does not need to be installed."
 +      exit 0;
 +fi
 +
 +TIZEN_SDK_INSTALL_PATH=`echo ${INSTALLED_PATH}`
 +TIZEN_PLATFORM_ETC_PATH=$TIZEN_SDK_INSTALL_PATH/platforms/tizen-3.0/common/emulator/etc
- PLATFORM_VERSION="tizen-3.0"
++if [ -z "${TIZEN_SDK_INSTALL_PATH}" ]
 +then
 +#   echo "There is no TIZEN_SDK_PATH ENV" >> /tmp/emulator.log
 +   exit 2;
 +fi
 +
- echo "cp ${TIZEN_SDK_INSTALL_PATH}/platforms/${PLATFORM_VERSION}/common/emulator/etc/tizen-kvm /etc/init.d/" >> ${TMP_FILE}
- echo "cp ${TIZEN_SDK_INSTALL_PATH}/platforms/${PLATFORM_VERSION}/common/emulator/etc/45-tizen-kvm.rules /lib/udev/rules.d/" >> ${TMP_FILE}
++PLATFORM_VERSION=tizen-3.0
 +
 +LSB_RELEASE=`which lsb_release`
 +if [ "${LSB_RELEASE}" = "" ]; then
 +      if [ -e /etc/os-release ]; then
 +              OS_NAME=`cat /etc/os-release | grep ID | head -n 1 | awk -F= '{print $2}'`
 +      fi
 +      # TODO: Detect other linux distributions.
 +else
 +      OS_NAME=`lsb_release --id --short`
 +fi
 +
 +if [ ! -z "${OS_NAME}" ]; then
 +      OS_NAME=`echo ${OS_NAME} | tr '[:upper:]' '[:lower:]'`
 +fi
 +echo "Linux Distribution: ${OS_NAME}"
 +
 +# need sudo to enable kvm module and set qemu sudoers
 +TMP_FILE=init_tizen.sh
 +USER=`id -un`
 +echo "#!/bin/bash -x" >> ${TMP_FILE}
 +echo "TIZEN_SDK_INSTALL_PATH=$TIZEN_SDK_INSTALL_PATH" >> ${TMP_FILE}
 +echo "OS_NAME=$OS_NAME" >> ${TMP_FILE}
 +echo "USER=$USER" >> ${TMP_FILE}
- echo "cp -pR ${TIZEN_PLATFORM_ETC_PATH}/emulator-ifup.sh /etc" >> $TMP_FILE
++echo "cp \"${TIZEN_SDK_INSTALL_PATH}/platforms/${PLATFORM_VERSION}/common/emulator/etc/tizen-kvm\" /etc/init.d/" >> ${TMP_FILE}
++echo "cp \"${TIZEN_SDK_INSTALL_PATH}/platforms/${PLATFORM_VERSION}/common/emulator/etc/45-tizen-kvm.rules\" /lib/udev/rules.d/" >> ${TMP_FILE}
 +echo "/etc/init.d/tizen-kvm start" >> ${TMP_FILE}
-       ${TSUDO} -m "${TSUDO_MSG}" bash -x ${TMP_PATH}
++echo "cp -pR \"${TIZEN_PLATFORM_ETC_PATH}/emulator-ifup.sh\" /etc" >> $TMP_FILE
 +cat << 'EOF' >> $TMP_FILE
 +if [ "ubuntu" = "${OS_NAME}" ] ; then
 +      update-rc.d tizen-kvm defaults
 +fi
 +
 +FILE=/etc/sudoers
 +BACKFILE=/etc/sudoers.bak
 +TMPFILE=/etc/sudoers.tmp
 +MESSAGE="# Tizen SDK generated the following script. Do not modify."
 +LINE1="User_Alias QEMUERS="
 +LINE2="Cmnd_Alias QEMU=/etc/emulator-ifup.sh, /etc/emulator-ifdown.sh, /usr/sbin/openvpn"
 +LINE3="QEMUERS ALL=(ALL) NOPASSWD: QEMU"
 +count=0
 +
 +if [[ "$USER" == "" ]]
 +then
 +    echo "user is not set. aborting..."
 +    exit 1
 +fi
 +
 +while read line
 +do
 +    echo $line
 +    count=$((count+1))
 +    if [[ $line == $LINE1* ]]
 +    then
 +        echo "find original script"
 +        NAMES=`echo $line | cut -d = -f2`
 +        if [[ "$NAMES"x == ""x ]]
 +        then
 +            cp $FILE $BACKFILE
 +            # in case of blank user
 +            eval sed -e "$count"c\"$line $USER\" $FILE > $TMPFILE
 +            exit 0
 +        fi
 +        for i in $(echo $NAMES | tr "," "\n")
 +        do
 +            if [[ "$i" == "$USER" ]]
 +            then
 +                echo "already added the same user"
 +                exit 0
 +            fi
 +        done
 +        cp $FILE $BACKFILE
 +        # new user is added with comma behind the original users.
 +        eval sed -e "$count"c\"$line, $USER\" $FILE > $TMPFILE
 +        mv $TMPFILE $FILE
 +        exit 0
 +        fi
 +done < $FILE
 +
 +cp $FILE $BACKFILE
 +echo "do not find $line"
 +echo "$MESSAGE" >> $FILE
 +echo "$LINE1$USER" >> $FILE
 +echo "$LINE2" >> $FILE
 +echo "$LINE3" >> $FILE
 +exit 0
 +EOF
 +
 +chmod +x ${TMP_FILE}
 +if [ "${TSUDO}" != "" ] # since installer v2.27
 +then
 +      TSUDO_MSG="Enter your password to install Tizen Emulator"
 +      TMP_PATH="`pwd`/${TMP_FILE}"
++      ${TSUDO} -m "${TSUDO_MSG}" bash -x "${TMP_PATH}"
 +else
 +      GKSUDO=`which gksudo`
 +      if [ "${GKSUDO}" = "" ]
 +      then
 +              echo "there is no gksudo."
 +              sudo bash -x ./${TMP_FILE}
 +      else
 +              gksudo bash -x ./${TMP_FILE}
 +      fi
 +fi
 +
 +rm ${TMP_FILE}
index e1f239bb4ad8429b1c9590f30f0abe19602910f1,0000000000000000000000000000000000000000..8710d0a4d9e5be05cf4c812ec6c2cdcceebac770
mode 100755,000000..100755
--- /dev/null
@@@ -1,123 -1,0 +1,123 @@@
- TIZEN_KVM_SCRIPT="/etc/init.d/tizen-kvm-multi"
 +#!/bin/bash -x
 +
- if [ -z ${TIZEN_SDK_INSTALL_PATH} ]
++TIZEN_KVM_SCRIPT=/etc/init.d/tizen-kvm-multi
 +if [ -f ${TIZEN_KVM_SCRIPT} ]
 +then
 +      echo "tizen-kvm-multi does exist. tizen-kvm does not need to be installed."
 +      exit 0;
 +fi
 +
 +TIZEN_SDK_INSTALL_PATH=`echo ${INSTALLED_PATH}`
 +TIZEN_PLATFORM_ETC_PATH=$TIZEN_SDK_INSTALL_PATH/platforms/tizen-3.0/common/emulator/etc
- PLATFORM_VERSION="tizen-3.0"
++if [ -z "${TIZEN_SDK_INSTALL_PATH}" ]
 +then
 +#   echo "There is no TIZEN_SDK_PATH ENV" >> /tmp/emulator.log
 +   exit 2;
 +fi
 +
- echo "cp ${TIZEN_SDK_INSTALL_PATH}/platforms/${PLATFORM_VERSION}/common/emulator/etc/tizen-kvm /etc/init.d/" >> ${TMP_FILE}
- echo "cp ${TIZEN_SDK_INSTALL_PATH}/platforms/${PLATFORM_VERSION}/common/emulator/etc/45-tizen-kvm.rules /lib/udev/rules.d/" >> ${TMP_FILE}
++PLATFORM_VERSION=tizen-3.0
 +
 +LSB_RELEASE=`which lsb_release`
 +if [ "${LSB_RELEASE}" = "" ]; then
 +      if [ -e /etc/os-release ]; then
 +              OS_NAME=`cat /etc/os-release | grep ID | head -n 1 | awk -F= '{print $2}'`
 +      fi
 +      # TODO: Detect other linux distributions.
 +else
 +      OS_NAME=`lsb_release --id --short`
 +fi
 +
 +if [ ! -z "${OS_NAME}" ]; then
 +      OS_NAME=`echo ${OS_NAME} | tr '[:upper:]' '[:lower:]'`
 +fi
 +echo "Linux Distribution: ${OS_NAME}"
 +
 +# need sudo to enable kvm module and set qemu sudoers
 +TMP_FILE=init_tizen.sh
 +USER=`id -un`
 +echo "#!/bin/bash -x" >> ${TMP_FILE}
 +echo "TIZEN_SDK_INSTALL_PATH=$TIZEN_SDK_INSTALL_PATH" >> ${TMP_FILE}
 +echo "OS_NAME=$OS_NAME" >> ${TMP_FILE}
 +echo "USER=$USER" >> ${TMP_FILE}
- echo "cp -pR ${TIZEN_PLATFORM_ETC_PATH}/emulator-ifup.sh /etc" >> $TMP_FILE
++echo "cp \"${TIZEN_SDK_INSTALL_PATH}/platforms/${PLATFORM_VERSION}/common/emulator/etc/tizen-kvm\" /etc/init.d/" >> ${TMP_FILE}
++echo "cp \"${TIZEN_SDK_INSTALL_PATH}/platforms/${PLATFORM_VERSION}/common/emulator/etc/45-tizen-kvm.rules\" /lib/udev/rules.d/" >> ${TMP_FILE}
 +echo "/etc/init.d/tizen-kvm start" >> ${TMP_FILE}
-       ${TSUDO} -m "${TSUDO_MSG}" bash -x ${TMP_PATH}
++echo "cp -pR \"${TIZEN_PLATFORM_ETC_PATH}/emulator-ifup.sh\" /etc" >> $TMP_FILE
 +cat << 'EOF' >> $TMP_FILE
 +if [ "ubuntu" = "${OS_NAME}" ] ; then
 +      update-rc.d tizen-kvm defaults
 +fi
 +
 +FILE=/etc/sudoers
 +BACKFILE=/etc/sudoers.bak
 +TMPFILE=/etc/sudoers.tmp
 +MESSAGE="# Tizen SDK generated the following script. Do not modify."
 +LINE1="User_Alias QEMUERS="
 +LINE2="Cmnd_Alias QEMU=/etc/emulator-ifup.sh, /etc/emulator-ifdown.sh, /usr/sbin/openvpn"
 +LINE3="QEMUERS ALL=(ALL) NOPASSWD: QEMU"
 +count=0
 +
 +if [[ "$USER" == "" ]]
 +then
 +    echo "user is not set. aborting..."
 +    exit 1
 +fi
 +
 +while read line
 +do
 +    echo $line
 +    count=$((count+1))
 +    if [[ $line == $LINE1* ]]
 +    then
 +        echo "find original script"
 +        NAMES=`echo $line | cut -d = -f2`
 +        if [[ "$NAMES"x == ""x ]]
 +        then
 +            cp $FILE $BACKFILE
 +            # in case of blank user
 +            eval sed -e "$count"c\"$line $USER\" $FILE > $TMPFILE
 +            exit 0
 +        fi
 +        for i in $(echo $NAMES | tr "," "\n")
 +        do
 +            if [[ "$i" == "$USER" ]]
 +            then
 +                echo "already added the same user"
 +                exit 0
 +            fi
 +        done
 +        cp $FILE $BACKFILE
 +        # new user is added with comma behind the original users.
 +        eval sed -e "$count"c\"$line, $USER\" $FILE > $TMPFILE
 +        mv $TMPFILE $FILE
 +        exit 0
 +        fi
 +done < $FILE
 +
 +cp $FILE $BACKFILE
 +echo "do not find $line"
 +echo "$MESSAGE" >> $FILE
 +echo "$LINE1$USER" >> $FILE
 +echo "$LINE2" >> $FILE
 +echo "$LINE3" >> $FILE
 +exit 0
 +EOF
 +
 +chmod +x ${TMP_FILE}
 +if [ "${TSUDO}" != "" ] # since installer v2.27
 +then
 +      TSUDO_MSG="Enter your password to install Tizen Emulator"
 +      TMP_PATH="`pwd`/${TMP_FILE}"
++      ${TSUDO} -m "${TSUDO_MSG}" bash -x "${TMP_PATH}"
 +else
 +      GKSUDO=`which gksudo`
 +      if [ "${GKSUDO}" = "" ]
 +      then
 +              echo "there is no gksudo."
 +              sudo bash -x ./${TMP_FILE}
 +      else
 +              gksudo bash -x ./${TMP_FILE}
 +      fi
 +fi
 +
 +rm ${TMP_FILE}
index ed7e7ef62ed0412b91f413f5c16710038f14d51d,0000000000000000000000000000000000000000..40699bcc694778ec6e2c8139813f0f4052115a91
mode 100755,000000..100755
--- /dev/null
@@@ -1,58 -1,0 +1,58 @@@
- if [ -z ${TIZEN_SDK_INSTALL_PATH} ]
 +#!/bin/bash -ex
 +
 +TIZEN_KVM_SCRIPT="/etc/init.d/tizen-kvm-multi"
 +if [ -f ${TIZEN_KVM_SCRIPT} ]
 +then
 +      echo "tizen-kvm-multi does exist. tizen-kvm does not need to be uninstalled."
 +      exit 0;
 +fi
 +
 +TIZEN_SDK_INSTALL_PATH=`echo ${INSTALLED_PATH}`
-       $TSUDO -m "${TSUDO_MSG}" bash ${TMP_PATH}
++if [ -z "${TIZEN_SDK_INSTALL_PATH}" ]
 +then
 +#   echo "There is no TIZEN_SDK_PATH ENV" >> /tmp/emulator.log
 +   exit 2;
 +fi
 +
 +LSB_RELEASE=`which lsb_release`
 +if [ "${LSB_RELEASE}" = "" ]; then
 +      if [ -e /etc/os-release ]; then
 +              OS_NAME=`cat /etc/os-release | grep ID | head -n 1 | awk -F= '{print $2}'`
 +      fi
 +      # TODO: Detect other linux distributions.
 +else
 +      OS_NAME=`lsb_release --id --short`
 +fi
 +
 +if [ ! -z "${OS_NAME}" ]; then
 +      OS_NAME=`echo ${OS_NAME} | tr '[:upper:]' '[:lower:]'`
 +fi
 +echo "Linux Distribution: ${OS_NAME}"
 +
 +TMP_FILE=remove_tizen-kvm.sh
 +echo "#!/bin/bash -ex" >> ${TMP_FILE}
 +if [ "ubuntu" = "${OS_NAME}" ] ; then
 +      echo "update-rc.d -f tizen-kvm remove" >> ${TMP_FILE}
 +fi
 +echo "rm -f /etc/init.d/tizen-kvm" >> ${TMP_FILE}
 +echo "rm -f /lib/udev/rules.d/45-tizen-kvm.rules" >> ${TMP_FILE}
 +
 +chmod +x ${TMP_FILE}
 +
 +if [ "${TSUDO}" != "" ] # since installer v2.27
 +then
 +      TSUDO_MSG="Enter your password to remove /etc/init.d/tizen-kvm."
 +      TMP_PATH="`pwd`/${TMP_FILE}"
++      $TSUDO -m "${TSUDO_MSG}" bash "${TMP_PATH}"
 +else
 +      GKSUDO=`which gksudo`
 +      if [ "${GKSUDO}" = "" ]
 +      then
 +              echo "there is no gksudo."
 +              sudo ./${TMP_FILE}
 +      else
 +              gksudo ./${TMP_FILE}
 +      fi
 +fi
 +
 +rm ${TMP_FILE}
index ed7e7ef62ed0412b91f413f5c16710038f14d51d,0000000000000000000000000000000000000000..40699bcc694778ec6e2c8139813f0f4052115a91
mode 100755,000000..100755
--- /dev/null
@@@ -1,58 -1,0 +1,58 @@@
- if [ -z ${TIZEN_SDK_INSTALL_PATH} ]
 +#!/bin/bash -ex
 +
 +TIZEN_KVM_SCRIPT="/etc/init.d/tizen-kvm-multi"
 +if [ -f ${TIZEN_KVM_SCRIPT} ]
 +then
 +      echo "tizen-kvm-multi does exist. tizen-kvm does not need to be uninstalled."
 +      exit 0;
 +fi
 +
 +TIZEN_SDK_INSTALL_PATH=`echo ${INSTALLED_PATH}`
-       $TSUDO -m "${TSUDO_MSG}" bash ${TMP_PATH}
++if [ -z "${TIZEN_SDK_INSTALL_PATH}" ]
 +then
 +#   echo "There is no TIZEN_SDK_PATH ENV" >> /tmp/emulator.log
 +   exit 2;
 +fi
 +
 +LSB_RELEASE=`which lsb_release`
 +if [ "${LSB_RELEASE}" = "" ]; then
 +      if [ -e /etc/os-release ]; then
 +              OS_NAME=`cat /etc/os-release | grep ID | head -n 1 | awk -F= '{print $2}'`
 +      fi
 +      # TODO: Detect other linux distributions.
 +else
 +      OS_NAME=`lsb_release --id --short`
 +fi
 +
 +if [ ! -z "${OS_NAME}" ]; then
 +      OS_NAME=`echo ${OS_NAME} | tr '[:upper:]' '[:lower:]'`
 +fi
 +echo "Linux Distribution: ${OS_NAME}"
 +
 +TMP_FILE=remove_tizen-kvm.sh
 +echo "#!/bin/bash -ex" >> ${TMP_FILE}
 +if [ "ubuntu" = "${OS_NAME}" ] ; then
 +      echo "update-rc.d -f tizen-kvm remove" >> ${TMP_FILE}
 +fi
 +echo "rm -f /etc/init.d/tizen-kvm" >> ${TMP_FILE}
 +echo "rm -f /lib/udev/rules.d/45-tizen-kvm.rules" >> ${TMP_FILE}
 +
 +chmod +x ${TMP_FILE}
 +
 +if [ "${TSUDO}" != "" ] # since installer v2.27
 +then
 +      TSUDO_MSG="Enter your password to remove /etc/init.d/tizen-kvm."
 +      TMP_PATH="`pwd`/${TMP_FILE}"
++      $TSUDO -m "${TSUDO_MSG}" bash "${TMP_PATH}"
 +else
 +      GKSUDO=`which gksudo`
 +      if [ "${GKSUDO}" = "" ]
 +      then
 +              echo "there is no gksudo."
 +              sudo ./${TMP_FILE}
 +      else
 +              gksudo ./${TMP_FILE}
 +      fi
 +fi
 +
 +rm ${TMP_FILE}
Simple merge
Simple merge
index 360a01a75669ff9af1777ddc1b1d9aa6ee4203fd,bb6244e70ac14662cc82e6e21cc9eca61c32a77a..a20d5be99428dc009990ff3c57e2ed71284e4b01
@@@ -1,11 -1,7 +1,7 @@@
  #!/bin/sh
  
- if [ -z "$TIZEN_SDK_DEV_PATH" ] ; then
-     TIZEN_SDK_DEV_PATH=${HOME}/tizen-sdk-dev
- fi
  CONFIGURE_APPEND=""
 -EMUL_TARGET_LIST="i386-softmmu"
 +EMUL_TARGET_LIST="x86_64-softmmu"
  
  usage() {
      echo "usage: build.sh [options] [target]"
@@@ -87,20 -99,16 +101,19 @@@ f
  # append common options
  CONFIGURE_APPEND="
   --target-list=$EMUL_TARGET_LIST
 + --enable-maru
   --enable-yagl
   --enable-curl
 - --disable-gtk
 - --disable-quorum
   --enable-vigs
 - --enable-maru
 + --enable-qt
   --enable-libav
   --enable-libpng
-  --disable-sdl
 - --enable-qt
 - --enable-java-ui
 + --disable-gtk
 + --disable-vnc
 + --disable-spice
 + --disable-curses
 + --disable-quorum
 + --disable-xen
   $CONFIGURE_APPEND"
  
  # append platform specific options
@@@ -110,22 -118,45 +123,35 @@@ CONFIGURE_APPEND=
   --enable-werror
   --extra-ldflags=-Wl,--export-dynamic
   --audio-drv-list=alsa
 - --disable-vnc
 - --disable-pie
 - --enable-virtfs
 - --disable-xen
+  --enable-sdl
 - --enable-java-ui
++ --enable-virtfs
+  $CONFIGURE_APPEND
+ "
+ ;;
+ CROSS_MINGW*)
+ CONFIGURE_APPEND="
+  --cross-prefix=$CROSS_PREFIX
+  --enable-werror
+  --extra-ldflags=-Wl,--large-address-aware
+  --extra-ldflags=-Wl,--export-all-symbols
+  --audio-drv-list=winwave
+  --enable-hax
 - --enable-virtfs
 - --disable-vnc
+  --enable-sdl
 - --enable-java-ui
 + --enable-virtfs
   $CONFIGURE_APPEND
  "
  ;;
  MINGW*)
  CONFIGURE_APPEND="
   --cc=gcc
 + --cxx=g++
   --enable-werror
-- --extra-cflags=-Wno-error=format
-- --extra-cflags=-Wno-error=format-extra-args
-- --extra-cflags=-Wno-error=redundant-decls
   --extra-ldflags=-Wl,--large-address-aware
   --extra-ldflags=-Wl,--export-all-symbols
   --audio-drv-list=winwave
 - --enable-hax
 - --enable-virtfs
 - --disable-vnc
+  --enable-sdl
 - --enable-java-ui
++ --enable-virtfs
 + --enable-hax
   $CONFIGURE_APPEND
  "
  ;;
@@@ -137,8 -168,13 +163,9 @@@ CONFIGURE_APPEND=
   --extra-cflags=-mmacosx-version-min=10.4
   --extra-ldflags=-lstdc++
   --audio-drv-list=coreaudio
 - --enable-shm
 - --enable-hax
++ --enable-cocoa
+  --enable-virtfs
 - --disable-vnc
 - --disable-cocoa
 - --disable-sdl
 - --enable-java-ui
 + --enable-hax
-  --disable-cocoa
   $CONFIGURE_APPEND
  "
  # FIXME: "-export_dynamic" causes error on old version clang
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge