package: apply tizen_2.3.1_multi

modify the pkginfo.manifest file and build scripts to change the packages'
name and install pathes.

Change-Id: I2eaafd9fe4d719a08546ee0eb74435a21bc7c642
Signed-off-by: Sooyoung Ha <yoosah.ha@samsung.com>

diff --git a/package/build.macos-64 b/package/build.macos-64
index 15eae4eb28848cc683d272ddaa6a438b6dfdd36b..99066cf5c322d9513c1acdf1664d7f3faed13aa6 100755 (executable)
--- a/package/build.macos-64
+++ b/package/build.macos-64
@@ -8,7 +8,7 @@ clean()
     if test -e "Makefile"
     then
         ./emulator_configure.sh x86 -e "$BUILD_CFLAGS $BUILD_LDFLAGS"
-        make distclean
+        make clean
     fi
     rm -rf $SRCDIR/*.zip
     rm -rf $SRCDIR/*.tar.gz
@@ -78,7 +78,6 @@ build()
 
     cd $SRCDIR/tizen/
 
-    ./emulator_configure.sh x86 -e "$BUILD_CFLAGS $BUILD_LDFLAGS"
     make all_dibs
     if [ $? -eq 0 ]
     then
@@ -106,10 +105,10 @@ build()
 # install
 install()
 {
-    X86_BIN_DIR=$SRCDIR/package/emulator-qemu-x86.package.${TARGET_OS}/data/tools
-    COMMON_BIN_DIR=$SRCDIR/package/emulator-qemu-common.package.${TARGET_OS}/data/tools
-    MOBILE_2_3_SKIN_RESOURCE_DIR=$SRCDIR/package/mobile-2.3.1-emulator-qemu-skins.package.${TARGET_OS}/data/platforms/mobile-2.3.1/emulator-resources/skins
-    WEARABLE_2_3_SKIN_RESOURCE_DIR=$SRCDIR/package/wearable-2.3.1-emulator-qemu-skins.package.${TARGET_OS}/data/platforms/wearable-2.3.1/emulator-resources/skins
+    X86_BIN_DIR=$SRCDIR/package/2.3.1-emulator-qemu-x86.package.${TARGET_OS}/data/platforms/tizen-2.3.1/common
+    COMMON_BIN_DIR=$SRCDIR/package/2.3.1-emulator-qemu-common.package.${TARGET_OS}/data/platforms/tizen-2.3.1/common
+    MOBILE_2_3_SKIN_RESOURCE_DIR=$SRCDIR/package/mobile-2.3.1-emulator-qemu-skins.package.${TARGET_OS}/data/platforms/tizen-2.3.1/mobile/emulator-resources/skins
+    WEARABLE_2_3_SKIN_RESOURCE_DIR=$SRCDIR/package/wearable-2.3.1-emulator-qemu-skins.package.${TARGET_OS}/data/platforms/tizen-2.3.1/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 07ac1ce976a917a43c5eb9831aca82b608761ba2..fc97f1416e6afc5b5239ae4d6ed544fa6fc5b286 100755 (executable)
--- a/package/build.ubuntu-32
+++ b/package/build.ubuntu-32
@@ -10,7 +10,7 @@ clean()
        if test -e "Makefile"
        then
                ./emulator_configure.sh x86
-               make distclean
+               make clean
        fi
        rm -rf $SRCDIR/*.zip
        rm -rf $SRCDIR/*.tar.gz
@@ -52,7 +52,6 @@ build()
        export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${ROOTDIR}/remote/lib
 
        cd $SRCDIR/tizen/
-       ./emulator_configure.sh x86
        make all_dibs
        if [ $? -eq 0 ]
        then
@@ -66,10 +65,10 @@ build()
 # install
 install()
 {
-       X86_BIN_DIR=$SRCDIR/package/emulator-qemu-x86.package.${TARGET_OS}/data/tools
-       COMMON_BIN_DIR=$SRCDIR/package/emulator-qemu-common.package.${TARGET_OS}/data/tools
-       MOBILE_2_3_SKIN_RESOURCE_DIR=$SRCDIR/package/mobile-2.3.1-emulator-qemu-skins.package.${TARGET_OS}/data/platforms/mobile-2.3.1/emulator-resources/skins
-       WEARABLE_2_3_SKIN_RESOURCE_DIR=$SRCDIR/package/wearable-2.3.1-emulator-qemu-skins.package.${TARGET_OS}/data/platforms/wearable-2.3.1/emulator-resources/skins
+       X86_BIN_DIR=$SRCDIR/package/2.3.1-emulator-qemu-x86.package.${TARGET_OS}/data/platforms/tizen-2.3.1/common
+       COMMON_BIN_DIR=$SRCDIR/package/2.3.1-emulator-qemu-common.package.${TARGET_OS}/data/platforms/tizen-2.3.1/common
+       MOBILE_2_3_SKIN_RESOURCE_DIR=$SRCDIR/package/mobile-2.3.1-emulator-qemu-skins.package.${TARGET_OS}/data/platforms/tizen-2.3.1/mobile/emulator-resources/skins
+       WEARABLE_2_3_SKIN_RESOURCE_DIR=$SRCDIR/package/wearable-2.3.1-emulator-qemu-skins.package.${TARGET_OS}/data/platforms/tizen-2.3.1/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 07ac1ce976a917a43c5eb9831aca82b608761ba2..fc97f1416e6afc5b5239ae4d6ed544fa6fc5b286 100755 (executable)
--- a/package/build.ubuntu-64
+++ b/package/build.ubuntu-64
@@ -10,7 +10,7 @@ clean()
        if test -e "Makefile"
        then
                ./emulator_configure.sh x86
-               make distclean
+               make clean
        fi
        rm -rf $SRCDIR/*.zip
        rm -rf $SRCDIR/*.tar.gz
@@ -52,7 +52,6 @@ build()
        export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${ROOTDIR}/remote/lib
 
        cd $SRCDIR/tizen/
-       ./emulator_configure.sh x86
        make all_dibs
        if [ $? -eq 0 ]
        then
@@ -66,10 +65,10 @@ build()
 # install
 install()
 {
-       X86_BIN_DIR=$SRCDIR/package/emulator-qemu-x86.package.${TARGET_OS}/data/tools
-       COMMON_BIN_DIR=$SRCDIR/package/emulator-qemu-common.package.${TARGET_OS}/data/tools
-       MOBILE_2_3_SKIN_RESOURCE_DIR=$SRCDIR/package/mobile-2.3.1-emulator-qemu-skins.package.${TARGET_OS}/data/platforms/mobile-2.3.1/emulator-resources/skins
-       WEARABLE_2_3_SKIN_RESOURCE_DIR=$SRCDIR/package/wearable-2.3.1-emulator-qemu-skins.package.${TARGET_OS}/data/platforms/wearable-2.3.1/emulator-resources/skins
+       X86_BIN_DIR=$SRCDIR/package/2.3.1-emulator-qemu-x86.package.${TARGET_OS}/data/platforms/tizen-2.3.1/common
+       COMMON_BIN_DIR=$SRCDIR/package/2.3.1-emulator-qemu-common.package.${TARGET_OS}/data/platforms/tizen-2.3.1/common
+       MOBILE_2_3_SKIN_RESOURCE_DIR=$SRCDIR/package/mobile-2.3.1-emulator-qemu-skins.package.${TARGET_OS}/data/platforms/tizen-2.3.1/mobile/emulator-resources/skins
+       WEARABLE_2_3_SKIN_RESOURCE_DIR=$SRCDIR/package/wearable-2.3.1-emulator-qemu-skins.package.${TARGET_OS}/data/platforms/tizen-2.3.1/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 0a3ca52c5de8baad56adf27ea3d44b8be9f8a2e8..1ff1c335d4555a93f488e8561659e5d8004483fe 100755 (executable)
--- a/package/build.windows-32
+++ b/package/build.windows-32
@@ -8,7 +8,7 @@ clean()
        if test -e "Makefile"
        then
                ./emulator_configure.sh x86 -e "$BUILD_CFLAGS $BUILD_LDFLAGS"
-               make distclean
+               make clean
        fi
        rm -rf $SRCDIR/*.zip
        rm -rf $SRCDIR/*.tar.gz
@@ -57,7 +57,6 @@ build()
        prepare
 
        cd $SRCDIR/tizen
-       ./emulator_configure.sh x86 -e "$BUILD_CFLAGS $BUILD_LDFLAGS"
        make all_dibs
        if [ $? -eq 0 ]
        then
@@ -73,10 +72,10 @@ install()
 {
        prepare
 
-       X86_BIN_DIR=$SRCDIR/package/emulator-qemu-x86.package.${TARGET_OS}/data/tools
-       COMMON_BIN_DIR=$SRCDIR/package/emulator-qemu-common.package.${TARGET_OS}/data/tools
-       MOBILE_2_3_SKIN_RESOURCE_DIR=$SRCDIR/package/mobile-2.3.1-emulator-qemu-skins.package.${TARGET_OS}/data/platforms/mobile-2.3.1/emulator-resources/skins
-       WEARABLE_2_3_SKIN_RESOURCE_DIR=$SRCDIR/package/wearable-2.3.1-emulator-qemu-skins.package.${TARGET_OS}/data/platforms/wearable-2.3.1/emulator-resources/skins
+       X86_BIN_DIR=$SRCDIR/package/2.3.1-emulator-qemu-x86.package.${TARGET_OS}/data/platforms/tizen-2.3.1/common
+       COMMON_BIN_DIR=$SRCDIR/package/2.3.1-emulator-qemu-common.package.${TARGET_OS}/data/platforms/tizen-2.3.1/common
+       MOBILE_2_3_SKIN_RESOURCE_DIR=$SRCDIR/package/mobile-2.3.1-emulator-qemu-skins.package.${TARGET_OS}/data/platforms/tizen-2.3.1/mobile/emulator-resources/skins
+       WEARABLE_2_3_SKIN_RESOURCE_DIR=$SRCDIR/package/wearable-2.3.1-emulator-qemu-skins.package.${TARGET_OS}/data/platforms/tizen-2.3.1/wearable/emulator-resources/skins
 
        mkdir -p $X86_BIN_DIR
        mkdir -p $COMMON_BIN_DIR

diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index 50a3ac0df1878b31f04c7e2fe20b32cf33a73650..4d0ecfe806b8446d2c0884745283920b4298e139 100644 (file)
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -2,86 +2,79 @@ Version: 2.1.29
 Maintainer: Sangho Park <sangho1206.park@samsung.com>
 Source: emulator
 
-Package: emulator-qemu-common
+Package: 2.3.1-emulator-qemu-common
 OS: ubuntu-32
 Build-host-os: ubuntu-32
-Build-dependency: emulator-lib
 Description: Common binaries for Tizen Emulator
 C-Prerequisites : libsdl1.2debian
 
-Package: emulator-qemu-common
+Package: 2.3.1-emulator-qemu-common
 OS: ubuntu-64
 Build-host-os: ubuntu-64
-Build-dependency: emulator-lib
 Description: Common binaries for Tizen Emulator
 C-Prerequisites : libsdl1.2debian
 
-Package: emulator-qemu-common
+Package: 2.3.1-emulator-qemu-common
 OS: windows-32, windows-64
 Build-host-os: windows-32
-Build-dependency: emulator-lib
 Description: Common binaries for Tizen Emulator
 
-Package: emulator-qemu-common
+Package: 2.3.1-emulator-qemu-common
 OS: macos-64
 Build-host-os: macos-64
-Build-dependency: emulator-lib
 Description: Common binaries for Tizen Emulator
 
-Package: emulator-qemu-x86
+Package: 2.3.1-emulator-qemu-x86
 OS: ubuntu-32
 Build-host-os: ubuntu-32
-Build-dependency: emulator-lib-dev, emulator-lib, libav-dev
-Install-dependency: emulator-kernel-x86, libav
+Build-dependency: 2.3.1-emulator-lib-dev, 2.3.1-libav-dev
+Install-dependency: 2.3.1-emulator-kernel-x86, 2.3.1-libav
 Description: Tizen x86 Emulator
 
-#Package: emulator-qemu-arm
+#Package: 2.3.1-emulator-qemu-arm
 #OS: ubuntu-32
 #Build-host-os: ubuntu-32
-#Build-dependency: emulator-lib
-#Install-dependency: emulator-kernel-arm
+#Install-dependency: 2.3.1-emulator-kernel-arm
 #Description: Tizen ARM Emulator
 
-Package: emulator-qemu-x86
+Package: 2.3.1-emulator-qemu-x86
 OS: ubuntu-64
 Build-host-os: ubuntu-64
-Build-dependency: emulator-lib-dev, emulator-lib, libav-dev
-Install-dependency: emulator-kernel-x86, libav
+Build-dependency: 2.3.1-emulator-lib-dev, 2.3.1-libav-dev
+Install-dependency: 2.3.1-emulator-kernel-x86, 2.3.1-libav
 Description: Tizen x86 Emulator
 
-#Package: emulator-qemu-arm
+#Package: 2.3.1-emulator-qemu-arm
 #OS: ubuntu-64
 #Build-host-os: ubuntu-64
-#Build-dependency: emulator-lib
-#Install-dependency: emulator-kernel-arm
+#Install-dependency: 2.3.1-emulator-kernel-arm
 #Description: Tizen ARM Emulator
 
-Package: emulator-qemu-x86
+Package: 2.3.1-emulator-qemu-x86
 OS: windows-32, windows-64
 Build-host-os: windows-32
-Build-dependency: emulator-lib-dev, emulator-lib, libav-dev
-Install-dependency: emulator-kernel-x86, libav
+Build-dependency: 2.3.1-emulator-lib-dev, 2.3.1-libav-dev
+Install-dependency: 2.3.1-emulator-kernel-x86, 2.3.1-libav
 Description: Tizen x86 Emulator
 
-#Package: emulator-qemu-arm
+#Package: 2.3.1-emulator-qemu-arm
 #OS: windows-32, windows-64
 #Build-host-os: windows-32
-#Build-dependency: emulator-lib-dev, emulator-lib
-#Install-dependency: emulator-kernel-arm
+#Build-dependency: 2.3.1-emulator-lib-dev
+#Install-dependency: 2.3.1-emulator-kernel-arm
 #Description: Tizen ARM Emulator
 
-Package: emulator-qemu-x86
+Package: 2.3.1-emulator-qemu-x86
 OS: macos-64
 Build-host-os: macos-64
-Build-dependency: emulator-lib, emulator-lib-dev, libav-dev
-Install-dependency: emulator-kernel-x86, libav
+Build-dependency: 2.3.1-emulator-lib-dev, 2.3.1-libav-dev
+Install-dependency: 2.3.1-emulator-kernel-x86, 2.3.1-libav
 Description: Tizen x86 Emulator
 
-#Package: emulator-qemu-arm
+#Package: 2.3.1-emulator-qemu-arm
 #OS: macos-64
 #Build-host-os: macos-64
-#Build-dependency: emulator-lib
-#Install-dependency: emulator-kernel-arm
+#Install-dependency: 2.3.1-emulator-kernel-arm
 #Description: Tizen ARM Emulator
 
 Package: mobile-2.3.1-emulator-qemu-skins

diff --git a/tizen/src/Makefile b/tizen/src/Makefile
index 15694b439b76e0f97414f71f7e4b0aa02266b339..08f75e957102854388d05e058513d4d4f7a99d1d 100644 (file)
--- a/tizen/src/Makefile
+++ b/tizen/src/Makefile
@@ -33,9 +33,9 @@ qemu_distclean:
 
 # DIBS classpath for emulator-skin.jar
 ifdef CONFIG_WIN32
-DIBS_SWT_DIR=-Dclasspath.dibs=$(MSYS_ROOTDIR)/tools/emulator/bin
+DIBS_SWT_DIR=-Dclasspath.dibs=$(MSYS_ROOTDIR)/swt/4.332
 else
-DIBS_SWT_DIR=-Dclasspath.dibs=$(ROOTDIR)/tools/emulator/bin
+DIBS_SWT_DIR=-Dclasspath.dibs=$(ROOTDIR)/swt/4.332
 endif
 
 # Building check-gl