[Title]

 Modify dibs for windows to prevent this build script
 from installing extra libraries and headers for qemu in the mingw directory.
[Type]
[Module] emulator / dibs
[Priority] Major
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]

diff --git a/package/build.linux b/package/build.linux
index f16f616e35aa9c0d16d953eb748f0664412384d7..995b355dd7530023891b4865973630024e07e36a 100755 (executable)
--- a/package/build.linux
+++ b/package/build.linux
@@ -5,6 +5,7 @@ clean()
        cd $SRCDIR/tizen/
        if test -e "Makefile"
        then
+               ./qemu_configure.sh
                make clean
        fi
        rm -rf $SRCDIR/*.zip

diff --git a/package/build.windows b/package/build.windows
index c1d5c0f4bf5a85bbd6047bb33133ce9ebf19251e..2256768b285749304c7af3c0f9e79488e3e6581c 100755 (executable)
--- a/package/build.windows
+++ b/package/build.windows
@@ -1,21 +1,50 @@
-#!/bin/sh -xe
+#!/bin/sh -x
 # clean
+
 clean()
 {
+       prepare
+
        cd $SRCDIR/tizen/
        if test -e "Makefile"
        then
+               ./qemu_configure.sh "$BUILD_CFLAGS $BUILD_LDFLAGS"
                make clean
        fi
        rm -rf $SRCDIR/*.zip
        rm -rf $SRCDIR/*.tar.gz
 }
 
+#prepare
+prepare()
+{
+       if [ "$JAVA_HOME" = "" ]
+       then
+               echo "Make sure that you have installed JDK"
+        echo "and then set installed JDK/bin path into JAVA_HOME"
+        echo "as a system environment variable on your PC!!"
+               exit 1
+       fi
+
+       PYTHON_DIR=`env | grep PATH | grep Python`
+       if [ "$PYTHON_DIR" = "" ]
+       then
+               echo "Make sure that you have installed Python 2.x version"
+        echo "and then set installed Python/bin path into PATH system variable on your PC!"
+               exit 1
+       fi
+
+       PATH=$PATH:$ROOTDIR/bin:$ROOTDIR/apache-ant-1.8.3/bin
+       export PATH
+       BUILD_CFLAGS=--extra-cflags=-I$ROOTDIR/include
+    BUILD_LDFLAGS=--extra-ldflags=-L$ROOTDIR/lib
+}
+
 # build
 build() 
 {
        cd $SRCDIR/tizen/
-       ./qemu_configure.sh
+       ./qemu_configure.sh "$BUILD_CFLAGS $BUILD_LDFLAGS"
        make
 }
 
@@ -23,18 +52,14 @@ build()
 install() 
 {
        BIN_DIR=$SRCDIR/package/emulator.package.windows/data
-#      VTM_DIR=$BIN_DIR/Emulator/bin/emulator-manager.exe
        EMUL_DIR=$BIN_DIR/Emulator/bin/emulator-x86.exe
 
        mkdir -p $BIN_DIR
 
-    cd $SRCDIR/tizen
-    make install
+       cd $SRCDIR/tizen
+       make install
        mv Emulator $BIN_DIR
-#      editbin.exe /SUBSYSTEM:WINDOWS $VTM_DIR
        editbin.exe /SUBSYSTEM:WINDOWS $EMUL_DIR
-#      cp $SRCDIR/package/emulator.install.windows $BIN_DIR/../
-#      cp $SRCDIR/package/emulator.remove.windows $BIN_DIR/../
 }
 
 [ "$1" = "clean" ] && clean

diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index b7b3408cd7c0e8281aba2c51b22efb1146c2fbca..c06f236d5b7b4181248f363eeb91bd2b290064c9 100644 (file)
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,17 +1,18 @@
 Package: emulator
-Version: 1.2.34
+Version: 1.2.43
 OS: linux
 Build-host-os: linux
 Maintainer: Yeong-Kyoon Lee<yeongkyoon.lee@samsung.com>
-Install-dependency: emulator-kernel [ linux ], emulator-manager [ linux ]
+Install-dependency: emulator-kernel [ linux ], emulator-manager [ linux ], emulator-dll [ linux ]
 Source: emulator
 Description: Tizen Emulator
 
 Package: emulator
-Version: 1.2.34
+Version: 1.2.43
 OS: windows
 Build-host-os: windows
 Maintainer: Yeong-Kyoon Lee<yeongkyoon.lee@samsung.com>
+Build-dependency: SDL-1.2.14 [ windows ], SDL_gfx-2.0.22 [ windows ], SDL_image-1.2.10 [ windows ], jpeg-8b [ windows ], libpng-1.4.5 [ windows ], libxml2-2.7.8 [ windows ], apache-ant-1.8.3-bin [ windows ]
 Install-dependency: emulator-kernel [ windows ], emulator-manager [ windows ], emulator-dll [ windows ]
 Source: emulator
 Description: Tizen Emulator

diff --git a/tizen/qemu_configure.sh b/tizen/qemu_configure.sh
index 42894e3f48f82a515b371f29d5855323cc683ee7..9d969b21d160f8e3a2696202297badd34d42d50f 100755 (executable)
--- a/tizen/qemu_configure.sh
+++ b/tizen/qemu_configure.sh
@@ -17,7 +17,6 @@ exec ./configure \
  --enable-ldst-optimization \
  --enable-maru \
  --enable-gl
-# --enable-ffmpeg
 # --enable-v4l2 \
 # --enable-debug \
 # --enable-profiler \
@@ -32,8 +31,7 @@ exec ./configure \
  --disable-vnc-tls \
  --enable-ldst-optimization \
  --enable-maru \
- --enable-gl
-# --enable-ffmpeg
+ --enable-gl $1
 # --disable-vnc-jpeg \
 # --disable-jpeg
 ;;