[Title] modify dibs build script and configure for x86_64

[Type] enhancement
[Module] emulator / dibs
[Priority] normal
[CQ#]
[Redmine#]
[Problem] JAVA_HOME env variable has to be set before building package.
[Cause]
[Solution]
[TestCase]

diff --git a/package/build.ubuntu-32 b/package/build.ubuntu-32
index a47b51e85a69e2d230f725db7981ac08ce38383f..741a3fc61aa5d1471780f2713639da15712b2313 100755 (executable)
--- a/package/build.ubuntu-32
+++ b/package/build.ubuntu-32
@@ -2,6 +2,8 @@
 # clean
 clean()
 {
+       prepare
+       
        cd $SRCDIR/tizen/
        if test -e "Makefile"
        then
@@ -12,6 +14,18 @@ clean()
        rm -rf $SRCDIR/*.tar.gz
 }
 
+# check build environment
+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
+}
+
 # build
 build()
 {

diff --git a/package/build.ubuntu-64 b/package/build.ubuntu-64
index a47b51e85a69e2d230f725db7981ac08ce38383f..40856e033437f0d1cf74ca4779c884d6b55d4c66 100755 (executable)
--- a/package/build.ubuntu-64
+++ b/package/build.ubuntu-64
@@ -2,6 +2,8 @@
 # clean
 clean()
 {
+       prepare
+
        cd $SRCDIR/tizen/
        if test -e "Makefile"
        then
@@ -12,6 +14,18 @@ clean()
        rm -rf $SRCDIR/*.tar.gz
 }
 
+# check build environment
+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
+}
+
 # build
 build()
 {

diff --git a/tizen/emulator_configure.sh b/tizen/emulator_configure.sh
index f5238674f269cadb90b32291b07566df7ef94197..da085fcb64b00d82df35b39bf6258cac3046a00a 100755 (executable)
--- a/tizen/emulator_configure.sh
+++ b/tizen/emulator_configure.sh
@@ -5,10 +5,11 @@
 targetos=`uname -s`
 targetarch=`echo | gcc -E -dM - | grep __x86_64`
 bindir="i386"
-
-if test "$targetarch" = "x86_64"
+ffmpegarc="x86"
+if test "$targetarch" != ""
 then
        bindir="x86_64"
+       ffmpegarc="x86_64"
 fi
 
 echo "##### checking for os... targetos $targetos"
@@ -18,7 +19,7 @@ cd distrib/libav
 echo ""
 echo "##### FFMPEG configure for emulator"
 ./configure \
- --prefix=./$bindir --arch=x86 --enable-static --enable-pic --enable-optimizations --disable-doc --disable-gpl --disable-yasm --disable-postproc --disable-swscale --disable-ffmpeg --disable-ffprobe --disable-ffserver --disable-ffplay --disable-decoders --disable-encoders --disable-muxers --disable-demuxers --disable-parsers --disable-protocols --disable-network --disable-bsfs --disable-devices --disable-filters --enable-encoder=h263 --enable-encoder=h263p --enable-encoder=mpeg4 --enable-encoder=msmpeg4v2 --enable-encoder=msmpeg4v3 --enable-decoder=aac --enable-decoder=h263 --enable-decoder=h264 --enable-decoder=mp3 --enable-decoder=mp3adu --enable-decoder=mpeg4 --enable-decoder=mpegvideo --enable-decoder=msmpeg4v1 --enable-decoder=msmpeg4v2 --enable-decoder=msmpeg4v3 --enable-decoder=wmav1 --enable-decoder=wmav2 --enable-decoder=wmv3 --enable-decoder=vc1
+ --prefix=./$bindir --arch=${ffmpegarc} --enable-static --enable-pic --enable-optimizations --disable-doc --disable-gpl --disable-yasm --disable-postproc --disable-swscale --disable-ffmpeg --disable-ffprobe --disable-ffserver --disable-ffplay --disable-decoders --disable-encoders --disable-muxers --disable-demuxers --disable-parsers --disable-protocols --disable-network --disable-bsfs --disable-devices --disable-filters --enable-encoder=h263 --enable-encoder=h263p --enable-encoder=mpeg4 --enable-encoder=msmpeg4v2 --enable-encoder=msmpeg4v3 --enable-decoder=aac --enable-decoder=h263 --enable-decoder=h264 --enable-decoder=mp3 --enable-decoder=mp3adu --enable-decoder=mpeg4 --enable-decoder=mpegvideo --enable-decoder=msmpeg4v1 --enable-decoder=msmpeg4v2 --enable-decoder=msmpeg4v3 --enable-decoder=wmav1 --enable-decoder=wmav2 --enable-decoder=wmv3 --enable-decoder=vc1
 cd ../.. 
 
 cd ..