package: restructure directories

change installed directories

Change-Id: I869489e8b2abfc4199f81a11f939fdfc15e8fba4
Signed-off-by: Munkyu Im <munkyu.im@samsung.com>

diff --git a/package/2.4-emulator-qemu-common.install.macos-64 b/package/2.4-emulator-qemu-common.install.macos-64
index dea8b06..dc2358c 100755 (executable)
--- a/package/2.4-emulator-qemu-common.install.macos-64
+++ b/package/2.4-emulator-qemu-common.install.macos-64
@@ -4,7 +4,7 @@ TIZEN_SDK_INSTALL_PATH=`echo $INSTALLED_PATH`
 OLD_SHMMAXSIZE=`sysctl -n kern.sysv.shmmax`
 SYSCTL_FILE=sysctl.conf
 TMP_DIR=~/.installmanager
-TIZEN_BIN_PATH=$TIZEN_SDK_INSTALL_PATH/tools/emulator/bin
+TIZEN_BIN_PATH=$TIZEN_SDK_INSTALL_PATH/platforms/tizen-2.4/common/emulator/bin
 TMP_FILE=$TMP_DIR/setshmmax.sh
 TMP_INSTALL_TAP_FILE=$TMP_DIR/install-tap.sh
 NEW_SHMMAXSIZE=83886080

diff --git a/package/2.4-emulator-qemu-x86.install.ubuntu-32 b/package/2.4-emulator-qemu-x86.install.ubuntu-32
index 15eb412..4d51dbb 100755 (executable)
--- a/package/2.4-emulator-qemu-x86.install.ubuntu-32
+++ b/package/2.4-emulator-qemu-x86.install.ubuntu-32
@@ -14,6 +14,8 @@ then
    exit 2;
 fi
 
+PLATFORM_VERSION="tizen-2.4"
+
 LSB_RELEASE=`which lsb_release`
 if [ "${LSB_RELEASE}" = "" ]; then
        if [ -e /etc/os-release ]; then
@@ -31,8 +33,8 @@ echo "Linux Distribution: ${OS_NAME}"
 
 TMP_FILE=init_tizen-kvm.sh
 echo "#!/bin/bash -ex" >> ${TMP_FILE}
-echo "cp ${TIZEN_SDK_INSTALL_PATH}/tools/emulator/etc/tizen-kvm /etc/init.d/" >> ${TMP_FILE}
-echo "cp ${TIZEN_SDK_INSTALL_PATH}/tools/emulator/etc/45-tizen-kvm.rules /lib/udev/rules.d/" >> ${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}
 if [ "ubuntu" = "${OS_NAME}" ] ; then
        echo "update-rc.d tizen-kvm defaults" >> ${TMP_FILE}
@@ -59,7 +61,7 @@ fi
 rm ${TMP_FILE}
 
 # run check-gl and show pop-up if using gallium driver.
-CHECK_GL_CMD=${TIZEN_SDK_INSTALL_PATH}/tools/emulator/bin/check-gl
+CHECK_GL_CMD=${TIZEN_SDK_INSTALL_PATH}/platforms/${PLATFORM_VERSION}/emulator/bin/check-gl
 
 GL_WARNING_MSG="You are using invalid graphic card driver for the emulator.
 You have to use the lastest vendor-provided graphic card driver.

diff --git a/package/2.4-emulator-qemu-x86.install.ubuntu-64 b/package/2.4-emulator-qemu-x86.install.ubuntu-64
index 15eb412..c6b0fbf 100755 (executable)
--- a/package/2.4-emulator-qemu-x86.install.ubuntu-64
+++ b/package/2.4-emulator-qemu-x86.install.ubuntu-64
@@ -14,6 +14,8 @@ then
    exit 2;
 fi
 
+PLATFORM_VERSION="tizen-2.4"
+
 LSB_RELEASE=`which lsb_release`
 if [ "${LSB_RELEASE}" = "" ]; then
        if [ -e /etc/os-release ]; then
@@ -31,8 +33,8 @@ echo "Linux Distribution: ${OS_NAME}"
 
 TMP_FILE=init_tizen-kvm.sh
 echo "#!/bin/bash -ex" >> ${TMP_FILE}
-echo "cp ${TIZEN_SDK_INSTALL_PATH}/tools/emulator/etc/tizen-kvm /etc/init.d/" >> ${TMP_FILE}
-echo "cp ${TIZEN_SDK_INSTALL_PATH}/tools/emulator/etc/45-tizen-kvm.rules /lib/udev/rules.d/" >> ${TMP_FILE}
+echo "cp ${TIZEN_SDK_INSTALL_PATH}/${PLATFORM_VERSION}/common/emulator/etc/tizen-kvm /etc/init.d/" >> ${TMP_FILE}
+echo "cp ${TIZEN_SDK_INSTALL_PATH}/${PLATFORM_VERSION}/common/emulator/etc/45-tizen-kvm.rules /lib/udev/rules.d/" >> ${TMP_FILE}
 echo "/etc/init.d/tizen-kvm start" >> ${TMP_FILE}
 if [ "ubuntu" = "${OS_NAME}" ] ; then
        echo "update-rc.d tizen-kvm defaults" >> ${TMP_FILE}
@@ -59,7 +61,7 @@ fi
 rm ${TMP_FILE}
 
 # run check-gl and show pop-up if using gallium driver.
-CHECK_GL_CMD=${TIZEN_SDK_INSTALL_PATH}/tools/emulator/bin/check-gl
+CHECK_GL_CMD=${TIZEN_SDK_INSTALL_PATH}/${PLATFORM_VERSION}/emulator/bin/check-gl
 
 GL_WARNING_MSG="You are using invalid graphic card driver for the emulator.
 You have to use the lastest vendor-provided graphic card driver.

diff --git a/package/build.macos-64 b/package/build.macos-64
index a4395e3..71df146 100755 (executable)
--- a/package/build.macos-64
+++ b/package/build.macos-64
@@ -109,10 +109,10 @@ build()
 # install
 install()
 {
-    X86_BIN_DIR=$SRCDIR/package/2.4-emulator-qemu-x86.package.${TARGET_OS}/data/tools
-    COMMON_BIN_DIR=$SRCDIR/package/2.4-emulator-qemu-common.package.${TARGET_OS}/data/tools
-    MOBILE_2_4_SKIN_RESOURCE_DIR=$SRCDIR/package/mobile-2.4-emulator-qemu-skins.package.${TARGET_OS}/data/platforms/mobile-2.4/emulator-resources/skins
-    WEARABLE_2_4_SKIN_RESOURCE_DIR=$SRCDIR/package/wearable-2.4-emulator-qemu-skins.package.${TARGET_OS}/data/platforms/wearable-2.4/emulator-resources/skins
+    X86_BIN_DIR=$SRCDIR/package/2.4-emulator-qemu-x86.package.${TARGET_OS}/data/platforms/tizen-2.4/common
+    COMMON_BIN_DIR=$SRCDIR/package/2.4-emulator-qemu-common.package.${TARGET_OS}/data/platforms/tizen-2.4/common
+    MOBILE_2_4_SKIN_RESOURCE_DIR=$SRCDIR/package/mobile-2.4-emulator-qemu-skins.package.${TARGET_OS}/data/platforms/tizen-2.4/mobile/emulator-resources/skins
+    WEARABLE_2_4_SKIN_RESOURCE_DIR=$SRCDIR/package/wearable-2.4-emulator-qemu-skins.package.${TARGET_OS}/data/platforms/tizen-2.4/wearable/emulator-resources/skins
 
     mkdir -p $X86_BIN_DIR
     mkdir -p $COMMON_BIN_DIR

diff --git a/package/build.ubuntu-32 b/package/build.ubuntu-32
index 2918c7b..6a6d540 100755 (executable)
--- a/package/build.ubuntu-32
+++ b/package/build.ubuntu-32
@@ -66,10 +66,10 @@ build()
 # install
 install()
 {
-       X86_BIN_DIR=$SRCDIR/package/2.4-emulator-qemu-x86.package.${TARGET_OS}/data/tools
-       COMMON_BIN_DIR=$SRCDIR/package/2.4-emulator-qemu-common.package.${TARGET_OS}/data/tools
-       MOBILE_2_4_SKIN_RESOURCE_DIR=$SRCDIR/package/mobile-2.4-emulator-qemu-skins.package.${TARGET_OS}/data/platforms/mobile-2.4/emulator-resources/skins
-       WEARABLE_2_4_SKIN_RESOURCE_DIR=$SRCDIR/package/wearable-2.4-emulator-qemu-skins.package.${TARGET_OS}/data/platforms/wearable-2.4/emulator-resources/skins
+       X86_BIN_DIR=$SRCDIR/package/2.4-emulator-qemu-x86.package.${TARGET_OS}/data/platforms/tizen-2.4/common
+       COMMON_BIN_DIR=$SRCDIR/package/2.4-emulator-qemu-common.package.${TARGET_OS}/data/platforms/tizen-2.4/common
+       MOBILE_2_4_SKIN_RESOURCE_DIR=$SRCDIR/package/mobile-2.4-emulator-qemu-skins.package.${TARGET_OS}/data/platforms/tizen-2.4/mobile/emulator-resources/skins
+       WEARABLE_2_4_SKIN_RESOURCE_DIR=$SRCDIR/package/wearable-2.4-emulator-qemu-skins.package.${TARGET_OS}/data/platforms/tizen-2.4/wearable/emulator-resources/skins
 
        mkdir -p $X86_BIN_DIR
        mkdir -p $COMMON_BIN_DIR

diff --git a/package/build.ubuntu-64 b/package/build.ubuntu-64
index 2918c7b..d832153 100755 (executable)
--- a/package/build.ubuntu-64
+++ b/package/build.ubuntu-64
@@ -66,10 +66,10 @@ build()
 # install
 install()
 {
-       X86_BIN_DIR=$SRCDIR/package/2.4-emulator-qemu-x86.package.${TARGET_OS}/data/tools
-       COMMON_BIN_DIR=$SRCDIR/package/2.4-emulator-qemu-common.package.${TARGET_OS}/data/tools
-       MOBILE_2_4_SKIN_RESOURCE_DIR=$SRCDIR/package/mobile-2.4-emulator-qemu-skins.package.${TARGET_OS}/data/platforms/mobile-2.4/emulator-resources/skins
-       WEARABLE_2_4_SKIN_RESOURCE_DIR=$SRCDIR/package/wearable-2.4-emulator-qemu-skins.package.${TARGET_OS}/data/platforms/wearable-2.4/emulator-resources/skins
+    X86_BIN_DIR=$SRCDIR/package/2.4-emulator-qemu-x86.package.${TARGET_OS}/data/platforms/tizen-2.4/common
+       COMMON_BIN_DIR=$SRCDIR/package/2.4-emulator-qemu-common.package.${TARGET_OS}/data/platforms/tizen-2.4/common
+       MOBILE_2_4_SKIN_RESOURCE_DIR=$SRCDIR/package/mobile-2.4-emulator-qemu-skins.package.${TARGET_OS}/data/platforms/tizen-2.4/mobile/emulator-resources/skins
+       WEARABLE_2_4_SKIN_RESOURCE_DIR=$SRCDIR/package/wearable-2.4-emulator-qemu-skins.package.${TARGET_OS}/data/platforms/tizen-2.4/wearable/emulator-resources/skins
 
        mkdir -p $X86_BIN_DIR
        mkdir -p $COMMON_BIN_DIR

diff --git a/package/build.windows-32 b/package/build.windows-32
index 63f54fd..f92fe2e 100755 (executable)
--- a/package/build.windows-32
+++ b/package/build.windows-32
@@ -72,11 +72,11 @@ build()
 install()
 {
        prepare
-
-       X86_BIN_DIR=$SRCDIR/package/2.4-emulator-qemu-x86.package.${TARGET_OS}/data/tools
-       COMMON_BIN_DIR=$SRCDIR/package/2.4-emulator-qemu-common.package.${TARGET_OS}/data/tools
-       MOBILE_2_4_SKIN_RESOURCE_DIR=$SRCDIR/package/mobile-2.4-emulator-qemu-skins.package.${TARGET_OS}/data/platforms/mobile-2.4/emulator-resources/skins
-       WEARABLE_2_4_SKIN_RESOURCE_DIR=$SRCDIR/package/wearable-2.4-emulator-qemu-skins.package.${TARGET_OS}/data/platforms/wearable-2.4/emulator-resources/skins
+    
+    X86_BIN_DIR=$SRCDIR/package/2.4-emulator-qemu-x86.package.${TARGET_OS}/data/platforms/tizen-2.4/common
+       COMMON_BIN_DIR=$SRCDIR/package/2.4-emulator-qemu-common.package.${TARGET_OS}/data/platforms/tizen-2.4/common
+       MOBILE_2_4_SKIN_RESOURCE_DIR=$SRCDIR/package/mobile-2.4-emulator-qemu-skins.package.${TARGET_OS}/data/platforms/tizen-2.4/mobile/emulator-resources/skins
+       WEARABLE_2_4_SKIN_RESOURCE_DIR=$SRCDIR/package/wearable-2.4-emulator-qemu-skins.package.${TARGET_OS}/data/platforms/tizen-2.4/wearable/emulator-resources/skins
 
        mkdir -p $X86_BIN_DIR
        mkdir -p $COMMON_BIN_DIR