tizen/build.sh: build both x86 and ARM emulator simultaneously

This reduces overall build time and makes "make clean" work correctly. Separate
targets could be build by invoking build.sh script with a specific argument, for
example:
$ build.sh arm

Also, rename "efence" build configuration to "debug" configuration.

Signed-off-by: Igor Mitsyanko <i.mitsyanko@samsung.com>
Conflicts:

	tizen/qemu_configure_arm.sh

diff --git a/tizen/build.sh b/tizen/build.sh
index e44d22630fab574d578fae37934b1e46700b2e6c..feb78815a56657e052fc09ca45c3144fd99a615d 100755 (executable)
--- a/tizen/build.sh
+++ b/tizen/build.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 
 UNAME=`uname`
+# Build both x86 and ARM emulators by default
+CONFIGURE_SCRIPT="./qemu_configure.sh"
 
 case "$UNAME" in
 Linux)
@@ -19,4 +21,22 @@ else
     NUMCPU=1
 fi
 
-./qemu_configure.sh && make -j$NUMCPU && ./qemu_configure_arm.sh && make -j$NUMCPU && make install
+if [ ! -z "$1" ] ; then
+  case "$1" in
+  x86|i386|i486|i586|i686)
+    CONFIGURE_SCRIPT="./qemu_configure_x86.sh"
+  ;;
+  arm)
+    CONFIGURE_SCRIPT="./qemu_configure_arm.sh"
+  ;;
+  all)
+    CONFIGURE_SCRIPT="./qemu_configure.sh"
+  ;;
+  *)
+    echo "ERROR: unknown target architecture"
+    exit 1
+  ;;
+  esac
+fi
+
+$CONFIGURE_SCRIPT && make -j$NUMCPU && make install

diff --git a/tizen/build_debug.sh b/tizen/build_debug.sh
new file mode 100755 (executable)
index 0000000..c41b326
--- /dev/null
+++ b/tizen/build_debug.sh
@@ -0,0 +1,42 @@
+#!/bin/sh
+
+UNAME=`uname`
+# Build both x86 and ARM emulators by default
+CONFIGURE_SCRIPT="./qemu_configure_debug.sh"
+
+case "$UNAME" in
+Linux)
+    NUMCPU=`grep -c 'cpu cores' /proc/cpuinfo`
+    ;;
+MINGW*)
+    NUMCPU=`echo $NUMBER_OF_PROCESSORS`
+    ;;
+esac
+
+echo "Number of CPUs $NUMCPU"
+
+if [ "x$NUMCPU" != "x" ] ; then
+    NUMCPU=$(( NUMCPU + 1 ))
+else
+    NUMCPU=1
+fi
+
+if [ ! -z "$1" ] ; then
+  case "$1" in
+  x86|i386|i486|i586|i686)
+    CONFIGURE_SCRIPT="./qemu_configure_x86_debug.sh"
+  ;;
+  arm)
+    CONFIGURE_SCRIPT="./qemu_configure_arm_debug.sh"
+  ;;
+  all)
+    CONFIGURE_SCRIPT="./qemu_configure_debug.sh"
+  ;;
+  *)
+    echo "ERROR: unknown target architecture"
+    exit 1
+  ;;
+  esac
+fi
+
+$CONFIGURE_SCRIPT && make -j$NUMCPU && make install

diff --git a/tizen/build_efence.sh b/tizen/build_efence.sh
deleted file mode 100755 (executable)
index 90a5e40..0000000
--- a/tizen/build_efence.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-UNAME=`uname`
-
-case "$UNAME" in
-Linux)
-    NUMCPU=`grep -c 'cpu cores' /proc/cpuinfo`
-    ;;
-MINGW*)
-    NUMCPU=`echo $NUMBER_OF_PROCESSORS`
-    ;;
-esac
-
-echo "Number of CPUs $NUMCPU"
-
-if [ "x$NUMCPU" != "x" ] ; then
-    NUMCPU=$(( NUMCPU + 1 ))
-else
-    NUMCPU=1
-fi
-
-./qemu_configure_efence.sh && make -j$NUMCPU && ./qemu_configure_arm_efence.sh && make -j$NUMCPU && make install

diff --git a/tizen/qemu_configure.sh b/tizen/qemu_configure.sh
index 3bf2d038b517793981ced55235aaf42f9b65a411..bd95c32c83c210d9c9a24bc035db5c9715b5c5c2 100755 (executable)
--- a/tizen/qemu_configure.sh
+++ b/tizen/qemu_configure.sh
@@ -1,6 +1,5 @@
 #!/bin/sh
 # OS specific
-#--target-list=i386-softmmu,arm-softmmu \
 targetos=`uname -s`
 
 cd ..
@@ -8,7 +7,7 @@ case $targetos in
 Linux*)
 echo "checking for os... targetos $targetos"
 exec ./configure \
- --target-list=i386-softmmu \
+ --target-list="i386-softmmu arm-softmmu" \
  --disable-werror \
  --audio-drv-list=alsa \
  --enable-mixemu \
@@ -16,17 +15,13 @@ exec ./configure \
  --audio-card-list=ac97 \
  --enable-ldst-optimization \
  --enable-maru \
+ --enable-opengles \
  --enable-gl
-# --enable-ffmpeg
-# --enable-v4l2 \
-# --enable-debug \
-# --enable-profiler \
-# --enable-gles2 --gles2dir=/usr
 ;;
 MINGW*)
 echo "checking for os... targetos $targetos"
 exec ./configure \
- --target-list=i386-softmmu \
+ --target-list="i386-softmmu arm-softmmu" \
  --audio-drv-list=winwave \
  --enable-mixemu \
  --disable-vnc-tls \
@@ -34,9 +29,7 @@ exec ./configure \
  --enable-ldst-optimization \
  --enable-hax \
  --enable-maru \
- --enable-gl $1
-# --enable-ffmpeg
-# --disable-vnc-jpeg \
-# --disable-jpeg
+ --enable-opengles \
+ --enable-gl
 ;;
 esac

diff --git a/tizen/qemu_configure_arm.sh b/tizen/qemu_configure_arm.sh
index 742c5a68eebe93b729a12633d09dc6f95839089a..c8e5779395db37de91974b7f29260af2314be3fa 100755 (executable)
--- a/tizen/qemu_configure_arm.sh
+++ b/tizen/qemu_configure_arm.sh
@@ -1,6 +1,5 @@
 #!/bin/sh
 # OS specific
-#--target-list=i386-softmmu,arm-softmmu \
 targetos=`uname -s`
 
 cd ..
@@ -11,33 +10,18 @@ exec ./configure \
  --target-list=arm-softmmu \
  --disable-werror \
  --audio-drv-list=alsa \
- --disable-vnc-tls \
- --audio-card-list=ac97 \
  --enable-opengles \
- --enable-ldst-optimization \
- --enable-maru \
- --disable-pie
-# --enable-mixemu \
-# --enable-gl
-# --enable-ffmpeg
-# --enable-v4l2 \
-# --enable-debug \
-# --enable-profiler
+ --disable-gl \
+ --enable-maru
 ;;
 MINGW*)
 echo "checking for os... targetos $targetos"
 exec ./configure \
  --target-list=arm-softmmu \
+ --disable-werror \
  --audio-drv-list=winwave \
- --enable-mixemu \
- --disable-vnc-tls \
- --audio-card-list=ac97 \
- --enable-hax \
- --enable-ldst-optimization \
+ --enable-opengles \
+ --disable-gl \
  --enable-maru
-# --enable-gl
-# --enable-ffmpeg
-# --disable-vnc-jpeg \
-# --disable-jpeg
 ;;
 esac

diff --git a/tizen/qemu_configure_arm_debug.sh b/tizen/qemu_configure_arm_debug.sh
new file mode 100755 (executable)
index 0000000..7968c15
--- /dev/null
+++ b/tizen/qemu_configure_arm_debug.sh
@@ -0,0 +1,33 @@
+#!/bin/sh
+# OS specific
+targetos=`uname -s`
+
+cd ..
+case $targetos in
+Linux*)
+echo "checking for os... targetos $targetos"
+exec ./configure \
+ --target-list=arm-softmmu \
+ --disable-werror \
+ --audio-drv-list=alsa \
+ --enable-opengles \
+ --disable-gl \
+ --enable-maru \
+ --enable-efence \
+ --enable-debug \
+ --disable-pie
+;;
+MINGW*)
+echo "checking for os... targetos $targetos"
+exec ./configure \
+ --target-list=arm-softmmu \
+ --disable-werror \
+ --audio-drv-list=winwave \
+ --enable-opengles \
+ --disable-gl \
+ --enable-maru \
+ --enable-efence \
+ --enable-debug \
+ --disable-pie
+;;
+esac

diff --git a/tizen/qemu_configure_arm_efence.sh b/tizen/qemu_configure_arm_efence.sh
deleted file mode 100755 (executable)
index 68dc15c..0000000
--- a/tizen/qemu_configure_arm_efence.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/sh
-# OS specific
-#--target-list=i386-softmmu,arm-softmmu \
-targetos=`uname -s`
-
-cd ..
-case $targetos in
-Linux*)
-echo "checking for os... targetos $targetos"
-exec ./configure \
- --target-list=arm-softmmu \
- --disable-werror \
- --audio-drv-list=alsa \
- --disable-vnc-tls \
- --audio-card-list=ac97 \
- --enable-opengles \
- --enable-maru \
- --disable-pie \
- --enable-efence
-# --enable-mixemu \
-# --enable-ldst-optimization \
-# --enable-gl
-# --enable-ffmpeg
-# --enable-v4l2 \
-# --enable-debug \
-# --enable-profiler
-;;
-MINGW*)
-echo "checking for os... targetos $targetos"
-exec ./configure \
- --target-list=arm-softmmu \
- --audio-drv-list=winwave \
- --enable-mixemu \
- --disable-vnc-tls \
- --audio-card-list=ac97 \
- --enable-hax \
- --enable-maru
-# --enable-ldst-optimization \
-# --enable-gl
-# --enable-ffmpeg
-# --disable-vnc-jpeg \
-# --disable-jpeg
-;;
-esac

diff --git a/tizen/qemu_configure_debug.sh b/tizen/qemu_configure_debug.sh
new file mode 100755 (executable)
index 0000000..e4e7e81
--- /dev/null
+++ b/tizen/qemu_configure_debug.sh
@@ -0,0 +1,41 @@
+#!/bin/sh
+# OS specific
+targetos=`uname -s`
+
+cd ..
+case $targetos in
+Linux*)
+echo "checking for os... targetos $targetos"
+exec ./configure \
+ --target-list="i386-softmmu arm-softmmu" \
+ --disable-werror \
+ --audio-drv-list=alsa \
+ --enable-mixemu \
+ --disable-vnc-tls \
+ --audio-card-list=ac97 \
+ --enable-ldst-optimization \
+ --enable-maru \
+ --enable-opengles \
+ --enable-gl \
+ --enable-efence \
+ --enable-debug \
+ --disable-pie
+;;
+MINGW*)
+echo "checking for os... targetos $targetos"
+exec ./configure \
+ --target-list="i386-softmmu arm-softmmu" \
+ --audio-drv-list=winwave \
+ --enable-mixemu \
+ --disable-vnc-tls \
+ --audio-card-list=ac97 \
+ --enable-ldst-optimization \
+ --enable-hax \
+ --enable-maru \
+ --enable-opengles \
+ --enable-gl \
+ --enable-efence \
+ --enable-debug \
+ --disable-pie
+;;
+esac

diff --git a/tizen/qemu_configure_efence.sh b/tizen/qemu_configure_efence.sh
deleted file mode 100755 (executable)
index bc1aab0..0000000
--- a/tizen/qemu_configure_efence.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/sh
-# OS specific
-#--target-list=i386-softmmu,arm-softmmu \
-targetos=`uname -s`
-
-cd ..
-case $targetos in
-Linux*)
-echo "checking for os... targetos $targetos"
-exec ./configure \
- --target-list=i386-softmmu \
- --disable-werror \
- --audio-drv-list=alsa \
- --enable-mixemu \
- --disable-vnc-tls \
- --audio-card-list=ac97 \
- --enable-ldst-optimization \
- --enable-maru \
- --enable-gl \
- --enable-efence
-# --enable-ffmpeg
-# --enable-v4l2 \
-# --enable-debug \
-# --enable-profiler \
-# --enable-gles2 --gles2dir=/usr
-;;
-MINGW*)
-echo "checking for os... targetos $targetos"
-exec ./configure \
- --target-list=i386-softmmu \
- --audio-drv-list=winwave \
- --enable-mixemu \
- --disable-vnc-tls \
- --audio-card-list=ac97 \
- --enable-ldst-optimization \
- --enable-hax \
- --enable-maru \
- --enable-gl $1
-# --enable-ffmpeg
-# --disable-vnc-jpeg \
-# --disable-jpeg
-;;
-esac

diff --git a/tizen/qemu_configure_x86.sh b/tizen/qemu_configure_x86.sh
new file mode 100755 (executable)
index 0000000..47d4b4e
--- /dev/null
+++ b/tizen/qemu_configure_x86.sh
@@ -0,0 +1,33 @@
+#!/bin/sh
+# OS specific
+targetos=`uname -s`
+
+cd ..
+case $targetos in
+Linux*)
+echo "checking for os... targetos $targetos"
+exec ./configure \
+ --target-list=i386-softmmu \
+ --disable-werror \
+ --audio-drv-list=alsa \
+ --enable-mixemu \
+ --disable-vnc-tls \
+ --audio-card-list=ac97 \
+ --enable-ldst-optimization \
+ --enable-maru \
+ --enable-gl
+;;
+MINGW*)
+echo "checking for os... targetos $targetos"
+exec ./configure \
+ --target-list=i386-softmmu \
+ --audio-drv-list=winwave \
+ --enable-mixemu \
+ --disable-vnc-tls \
+ --audio-card-list=ac97 \
+ --enable-ldst-optimization \
+ --enable-hax \
+ --enable-maru \
+ --enable-gl
+;;
+esac

diff --git a/tizen/qemu_configure_x86_debug.sh b/tizen/qemu_configure_x86_debug.sh
new file mode 100755 (executable)
index 0000000..d0f8347
--- /dev/null
+++ b/tizen/qemu_configure_x86_debug.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+# OS specific
+targetos=`uname -s`
+
+cd ..
+case $targetos in
+Linux*)
+echo "checking for os... targetos $targetos"
+exec ./configure \
+ --target-list=i386-softmmu \
+ --disable-werror \
+ --audio-drv-list=alsa \
+ --enable-mixemu \
+ --disable-vnc-tls \
+ --audio-card-list=ac97 \
+ --enable-ldst-optimization \
+ --enable-maru \
+ --enable-gl \
+ --enable-efence \
+ --enable-debug \
+ --disable-pie
+;;
+MINGW*)
+echo "checking for os... targetos $targetos"
+exec ./configure \
+ --target-list=i386-softmmu \
+ --audio-drv-list=winwave \
+ --enable-mixemu \
+ --disable-vnc-tls \
+ --audio-card-list=ac97 \
+ --enable-ldst-optimization \
+ --enable-hax \
+ --enable-maru \
+ --enable-gl \
+ --enable-efence \
+ --enable-debug \
+ --disable-pie
+;;
+esac