[Title] modify build script for dibs to support new sdk dirs.

[Type]
[Module] emulator / dibs
[Priority] normal
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]

diff --git a/.gitignore b/.gitignore
index e252d8ed03e1cbd1b24e3c252f2006b6ab706d4f..5560683115d47fde85b82b9c1bfb9cf611a0a9a3 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -76,7 +76,7 @@ cscope.*
 tags
 TAGS
 *~
-tizen/Emulator
+tizen/emulator
 tizen/src/build_info.h
 tizen/src/skin/client/src/about.properties
 tizen/src/skin/client/bin

diff --git a/package/build.linux b/package/build.linux
index 2e70c89a43e69f3075c9bb9f924328a136b5e4e9..420a84dd76f144b46f75773d791878b70dcf1fa9 100755 (executable)
--- a/package/build.linux
+++ b/package/build.linux
@@ -5,7 +5,7 @@ clean()
        cd $SRCDIR/tizen/
        if test -e "Makefile"
        then
-               ./qemu_configure.sh
+               ./emulator_configure.sh
                make clean
        fi
        rm -rf $SRCDIR/*.zip
@@ -16,21 +16,19 @@ clean()
 build() 
 {
        cd $SRCDIR/tizen/
-       ./qemu_configure.sh
+       ./emulator_configure.sh
        make
 }
 
 # install
 install() 
 {
-       BIN_DIR=$SRCDIR/package/emulator.package.linux/data
+       BIN_DIR=$SRCDIR/package/emulator-qemu-x86.package.linux/data/tools
        mkdir -p $BIN_DIR
 
     cd $SRCDIR/tizen
     make install
        mv emulator $BIN_DIR
-#      cp $SRCDIR/package/emulator.install.linux $BIN_DIR/../
-#      cp $SRCDIR/package/emulator.remove.linux $BIN_DIR/../
 }
 
 [ "$1" = "clean" ] && clean

diff --git a/package/build.windows b/package/build.windows
index 01cb7252d0a3d60f3c0267ef07a74ea61e34966e..921c5b60c865a6bbc72fbba0b64653043252b6be 100755 (executable)
--- a/package/build.windows
+++ b/package/build.windows
@@ -8,7 +8,7 @@ clean()
        cd $SRCDIR/tizen/
        if test -e "Makefile"
        then
-               ./qemu_configure.sh "$BUILD_CFLAGS $BUILD_LDFLAGS"
+               ./emulator_configure.sh "$BUILD_CFLAGS $BUILD_LDFLAGS"
                make clean
        fi
        rm -rf $SRCDIR/*.zip
@@ -47,7 +47,7 @@ build()
        prepare
 
        cd $SRCDIR/tizen/
-       ./qemu_configure.sh "$BUILD_CFLAGS $BUILD_LDFLAGS"
+       ./emulator_configure.sh "$BUILD_CFLAGS $BUILD_LDFLAGS"
        make
     if [ -f "../i386-softmmu/qemu-system-i386.exe" ]
     then
@@ -64,7 +64,7 @@ install()
 
        prepare
 
-       BIN_DIR=$SRCDIR/package/emulator.package.windows/data
+       BIN_DIR=$SRCDIR/package/emulator-qemu-x86.package.windows/data/tools
 
        mkdir -p $BIN_DIR
 

diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index 3f98ff6b594ea7e5cf1d5876bef0b2a1721c9779..23f3cf7db590e3641005a37ebbdc2ad005aa83c9 100644 (file)
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,18 +1,18 @@
-Package: emulator
-Version:1.3.0
+Package: emulator-qemu-x86
+Version: 1.3.0
 OS: linux
 Build-host-os: linux
 Maintainer: Yeong-Kyoon Lee<yeongkyoon.lee@samsung.com>
-Install-dependency: emulator-kernel [ linux ], emulator-manager [ linux ], emulator-dll [ linux ]
+Install-dependency: emulator-kernel-x86 [ linux ], vgabios [ linux ]
 Source: emulator
 Description: Tizen Emulator
 
-Package: emulator
-Version:1.3.0
+Package: emulator-qemu-x86
+Version: 1.3.0
 OS: windows
 Build-host-os: windows
 Maintainer: Yeong-Kyoon Lee<yeongkyoon.lee@samsung.com>
 Build-dependency: SDL-1.2.14 [ windows ], apache-ant-1.8.3-bin [ windows ], gtk-bundle_2.16.6 [ windows ], directx-dev [ windows ]
-Install-dependency: emulator-kernel [ windows ], emulator-manager [ windows ], emulator-dll [ windows ]
+Install-dependency: emulator-kernel-x86 [ windows ], vgabios [ windows ]
 Source: emulator
 Description: Tizen Emulator

diff --git a/tizen/emulator_configure.sh b/tizen/emulator_configure.sh
index eb246efccc4d524264d5e336580ad899aefda064..49f6e7ae5e9c795b714b1c337b25f6200ef31b2a 100755 (executable)
--- a/tizen/emulator_configure.sh
+++ b/tizen/emulator_configure.sh
@@ -36,11 +36,6 @@ echo "##### QEMU configure for emulator"
  --disable-vnc-jpeg \
  --disable-vnc-png \
  --enable-gl
-# --enable-ffmpeg
-# --enable-v4l2 \
-# --enable-debug \
-# --enable-profiler \
-# --enable-gles2 --gles2dir=/usr
 ;;
 MINGW*)
 cd distrib/libav
@@ -65,8 +60,5 @@ echo "##### QEMU configure for emulator"
  --disable-vnc-jpeg \
  --disable-vnc-png \
  --enable-gl $1
-# --enable-ffmpeg
-# --disable-vnc-jpeg \
-# --disable-jpeg
 ;;
 esac

diff --git a/tizen/src/Makefile b/tizen/src/Makefile
index c3c95c4eb28bebd6db0e1369e9a86d58dd0b3689..bc0286770f1f46e0a88f2dbbbf4765388a15b843 100755 (executable)
--- a/tizen/src/Makefile
+++ b/tizen/src/Makefile
@@ -68,10 +68,8 @@ else
        
 endif
        cp ../../qemu-img $(EMUL_DIR)/bin
-       cp -dpr skin/client/skins $(EMUL_DIR)
        cp -dpr ../license $(EMUL_DIR)
-       cp -dpr ../../pc-bios/bios.bin $(EMUL_DIR)/x86/data/pc-bios
-       cp -dpr ../../pc-bios/linuxboot.bin $(EMUL_DIR)/x86/data/pc-bios
-       cp -dpr ../../pc-bios/pxe-rtl8139.rom $(EMUL_DIR)/x86/data/pc-bios
-       cp -dpr ../../pc-bios/pxe-virtio.rom $(EMUL_DIR)/x86/data/pc-bios
-       cp -dpr ../../pc-bios/vgabios-maruvga.bin $(EMUL_DIR)/x86/data/pc-bios
+       cp -dpr ../../pc-bios/bios.bin $(EMUL_DIR)/data/bios
+       cp -dpr ../../pc-bios/linuxboot.bin $(EMUL_DIR)/data/bios
+       cp -dpr ../../pc-bios/pxe-rtl8139.rom $(EMUL_DIR)/data/bios
+       cp -dpr ../../pc-bios/pxe-virtio.rom $(EMUL_DIR)/data/bios