From: SeokYeon Hwang Date: Wed, 16 Sep 2015 04:51:26 +0000 (+0900) Subject: build: commonize preparations for build X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.2~240 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4c59c4083338e379b572ec7f87d8f8087be26652;p=sdk%2Femulator%2Fqemu.git build: commonize preparations for build Change-Id: Ic438661885c0634029a23fbc626fc729f06fbdeb Signed-off-by: SeokYeon Hwang --- diff --git a/package/build.common b/package/build.common index 85e70076ea..6525b8ab4b 100644 --- a/package/build.common +++ b/package/build.common @@ -1,6 +1,18 @@ # build_common +prepare_common() +{ + 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_common() { + prepare_common prepare cd ${SRCDIR}/tizen @@ -11,8 +23,8 @@ build_common() PKG_CONFIG_PATH=${PKG_CONFIG_PATH} ./emulator_configure.sh x86_64 make clean - # needed for building java UI - #export SWT_PATH=${ROOTDIR}/swt_4.3 + # needed for building java UI + #export SWT_PATH=${ROOTDIR}/swt_4.3 PATH=${PATH} make all -j8 make install diff --git a/package/build.linux b/package/build.linux index d43568dbba..9f24389992 100755 --- a/package/build.linux +++ b/package/build.linux @@ -2,14 +2,6 @@ # 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 - if [ "${TARGET_OS}" = "windows-32" ] || [ "${TARGET_OS}" = "windows-64" ] then # for Windows target (cross compiling) diff --git a/package/build.macos-64 b/package/build.macos-64 index b3e72fe053..dd94e93aca 100755 --- a/package/build.macos-64 +++ b/package/build.macos-64 @@ -2,33 +2,27 @@ # 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 + echo "nothing to do" } # clean clean() { - echo "nothing to do" + echo "nothing to do" } # build build() { - . $SRCDIR/package/build.common - build_common + . $SRCDIR/package/build.common + build_common } # install install() { - . $SRCDIR/package/build.common - install_common + . $SRCDIR/package/build.common + install_common } [ "$1" = "clean" ] && clean diff --git a/package/build.windows-32 b/package/build.windows-32 index f1d742e5f5..2be533bf2d 100755 --- a/package/build.windows-32 +++ b/package/build.windows-32 @@ -1,45 +1,37 @@ #!/bin/sh -xe -#prepare +# 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 - 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!" + echo "and then set installed Python/bin path into PATH system variable on your PC!" exit 1 fi - ROOTDIR=$MSYS_ROOTDIR + ROOTDIR=$MSYS_ROOTDIR } # clean clean() { - echo "nothing to do" + echo "nothing to do" } # build build() { - . $SRCDIR/package/build.common - build_common + . $SRCDIR/package/build.common + build_common } # install install() { - . $SRCDIR/package/build.common - install_common + . $SRCDIR/package/build.common + install_common } [ "$1" = "clean" ] && clean