From: SeokYeon Hwang Date: Thu, 10 Sep 2015 12:19:10 +0000 (+0900) Subject: build: removed statement in Makefile only for DIBS X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.2~241 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0c71c68b7e4d6c711e706dc3ed9644b546b16130;p=sdk%2Femulator%2Fqemu.git build: removed statement in Makefile only for DIBS Makefile should be indenpendant from build system. So all tasks only for DIBS is moved to DIBS build script. Change-Id: I39f66a29fef448ec2ade1aa0664924a8eca3fd0e Signed-off-by: SeokYeon Hwang --- diff --git a/configure b/configure index 2809544c3d..a11567f6ca 100755 --- a/configure +++ b/configure @@ -2344,11 +2344,13 @@ if test "$qt" != "no"; then if $pkg_config --exists "$qtpackage >= $qtversion"; then qt_cflags=`$pkg_config --cflags $qtpackage` qt_libs=`$pkg_config --libs $qtpackage` - qt_libs="$qt_libs $x11_libs" - if test "$mingw32" = "no" ; then + qt_libs="$qt_libs" + if test "$mingw32" = "yes" ; then + libs_softmmu="$qt_libs -mwindows $libs_softmmu" + elif test "$darwin" = "yes" ; then libs_softmmu="$qt_libs $libs_softmmu" else - libs_softmmu="$qt_libs -mwindows $libs_softmmu" + libs_softmmu="$qt_libs $x11_libs $libs_softmmu" fi qt_cflags_private=`pkg-config --modversion Qt5Gui` diff --git a/package/build.common b/package/build.common index fa7846e90d..85e70076ea 100644 --- a/package/build.common +++ b/package/build.common @@ -11,8 +11,10 @@ build_common() PKG_CONFIG_PATH=${PKG_CONFIG_PATH} ./emulator_configure.sh x86_64 make clean - PATH=${PATH} make all_dibs -j8 - make install_dibs + # needed for building java UI + #export SWT_PATH=${ROOTDIR}/swt_4.3 + PATH=${PATH} make all -j8 + make install if [ $? -eq 0 ] then @@ -26,25 +28,64 @@ build_common() # install_common install_common() { - X86_BIN_DIR=$SRCDIR/package/3.0-emulator-qemu-x86.package.${TARGET_OS}/data/platforms/tizen-3.0/common - COMMON_BIN_DIR=$SRCDIR/package/3.0-emulator-qemu-common.package.${TARGET_OS}/data/platforms/tizen-3.0/common + cd $SRCDIR/tizen + + # emulator + EMULATOR_COMMON_DIR=$SRCDIR/package/3.0-emulator-qemu-common.package.${TARGET_OS}/data/platforms/tizen-3.0/common + mkdir -p $EMULATOR_COMMON_DIR + # we have nothing for common now + + EMULATOR_X86_DIR=$SRCDIR/package/3.0-emulator-qemu-x86.package.${TARGET_OS}/data/platforms/tizen-3.0/common + + mkdir -p $EMULATOR_X86_DIR + cp -pPR $SRCDIR/tizen/emulator $EMULATOR_X86_DIR/emulator + + EMULATOR_BIN_DIR=$EMULATOR_X86_DIR/emulator/bin + + # change loading path of dynamic shared libraries on MAC OS X + if [ "${TARGET_OS}" = "macos-64" ]; then + LIB_LIST="libgthread-2.0.0.dylib libglib-2.0.0.dylib libintl.8.dylib libgcc_s.1.dylib libz.1.dylib libcurl.4.dylib libgcc_s.1.dylib libcurl.4.dylib libx264.142.dylib libncurses.5.dylib libpixman-1.0.dylib libpng16.16.dylib QtOpenGL QtWidgets QtGui QtCore" + BIN_ARR=( emulator-x86_64 qt5_msgbox ) + for bin in ${BIN_ARR[@]}; do + LIB_ARR=( $(otool -L ${EMULATOR_BIN_DIR}/$bin | awk '/\opt\/local\/lib/ { split($1, lib, "/"); print lib[5]}') ) + for lib in ${LIB_ARR[@]}; do + [[ $LIB_LIST =~ $lib ]] && IS_LIB=true || IS_LIB=false + if [ "$IS_LIB" == "true" ] ; then + install_name_tool -change /opt/local/lib/$lib @loader_path/$lib ${EMULATOR_BIN_DIR}/$bin + echo "$bin: the loading path of $lib is changed." + else + echo "$bin: $lib does not exist in the loading path." + fi + done + LIB_ARR=( $(otool -L ${EMULATOR_BIN_DIR}/$bin | awk '/\opt\/local\/Library/ { split($1, lib, "/"); print lib[9]}') ) + for lib in ${LIB_ARR[@]}; do + [[ $LIB_LIST =~ $lib ]] && IS_LIB=true || IS_LIB=false + if [ "$IS_LIB" == "true" ] ; then + install_name_tool -change /opt/local/Library/Frameworks/$lib.framework/Versions/5/$lib @loader_path/$lib ${EMULATOR_BIN_DIR}/$bin + echo "$bin: the loading path of $lib is changed." + else + echo "$bin: $lib does not exist in the loading path." + fi + done + done + fi + + # profile skins MOBILE_3_0_SKIN_RESOURCE_DIR=$SRCDIR/package/mobile-3.0-emulator-qemu-skins.package.${TARGET_OS}/data/platforms/tizen-3.0/mobile/emulator-resources/skins WEARABLE_3_0_SKIN_RESOURCE_DIR=$SRCDIR/package/wearable-3.0-emulator-qemu-skins.package.${TARGET_OS}/data/platforms/tizen-3.0/wearable/emulator-resources/skins TV_3_0_SKIN_RESOURCE_DIR=$SRCDIR/package/tv-3.0-emulator-qemu-skins.package.${TARGET_OS}/data/platforms/tizen-3.0/tv/emulator-resources/skins - cd $SRCDIR/tizen - - mkdir -p $X86_BIN_DIR - mkdir -p $COMMON_BIN_DIR mkdir -p $MOBILE_3_0_SKIN_RESOURCE_DIR mkdir -p $WEARABLE_3_0_SKIN_RESOURCE_DIR mkdir -p $TV_3_0_SKIN_RESOURCE_DIR - mv x86 $X86_BIN_DIR/emulator - mv common $COMMON_BIN_DIR/emulator + # for java UI + #cp -pPR $SRCDIR/tizen/src/skin/client/skins/mobile/* $MOBILE_3_0_SKIN_RESOURCE_DIR + #cp -pPR $SRCDIR/tizen/src/skin/client/skins/wearable/* $WEARABLE_3_0_SKIN_RESOURCE_DIR + #cp -pPR $SRCDIR/tizen/src/skin/client/skins/tv/* $TV_3_0_SKIN_RESOURCE_DIR + + cp -pPR $SRCDIR/tizen/src/ui/resource/skins/mobile/* $MOBILE_3_0_SKIN_RESOURCE_DIR + cp -pPR $SRCDIR/tizen/src/ui/resource/skins/wearable/* $WEARABLE_3_0_SKIN_RESOURCE_DIR + cp -pPR $SRCDIR/tizen/src/ui/resource/skins/tv/* $TV_3_0_SKIN_RESOURCE_DIR - #profile skins - mv skins/mobile/* $MOBILE_3_0_SKIN_RESOURCE_DIR - mv skins/wearable/* $WEARABLE_3_0_SKIN_RESOURCE_DIR - mv skins/tv/* $TV_3_0_SKIN_RESOURCE_DIR } diff --git a/tizen/Makefile b/tizen/Makefile index 953b8d38b1..302d709c9e 100644 --- a/tizen/Makefile +++ b/tizen/Makefile @@ -10,11 +10,3 @@ distclean: install: cd src && $(MAKE) install cd standalone-src && $(MAKE) install - -# for dibs system... -all_dibs: - cd src && $(MAKE) all_dibs - cd standalone-src && $(MAKE) all -install_dibs: - cd src && $(MAKE) install_dibs - cd standalone-src && $(MAKE) install_dibs diff --git a/tizen/emulator_configure.sh b/tizen/emulator_configure.sh index 3c323f07aa..e90c7d36ee 100755 --- a/tizen/emulator_configure.sh +++ b/tizen/emulator_configure.sh @@ -115,6 +115,7 @@ CONFIGURE_APPEND=" --disable-bzip2 --disable-lzo --disable-snappy + --disable-gnutls --disable-gtk --disable-vnc --disable-spice diff --git a/tizen/src/Makefile b/tizen/src/Makefile index 40696b6e54..dfc9508e5d 100755 --- a/tizen/src/Makefile +++ b/tizen/src/Makefile @@ -27,9 +27,9 @@ qemu_distclean: skin_client: ifdef CONFIG_JAVA_UI ifdef CONFIG_USE_SHM - TIZEN_SDK_DEV_PATH=${TIZEN_SDK_DEV_PATH} ant -DuseSHM=true -buildfile skin/client/build.xml make-jar + TIZEN_SDK_DEV_PATH=${TIZEN_SDK_DEV_PATH} ant -DuseSHM=true -Dswt.path=${SWT_PATH} -buildfile skin/client/build.xml make-jar else - TIZEN_SDK_DEV_PATH=${TIZEN_SDK_DEV_PATH} ant -DuseSHM=false -buildfile skin/client/build.xml make-jar + TIZEN_SDK_DEV_PATH=${TIZEN_SDK_DEV_PATH} ant -DuseSHM=false -Dswt.path=${SWT_PATH} -buildfile skin/client/build.xml make-jar endif endif @@ -55,27 +55,15 @@ install: all mkdir -p $(EMUL_DIR)/icons mkdir -p $(EMUL_DIR)/images - @for target in $(TARGET_DIRS); do \ - arch=$$(echo $$target | cut -f1 -d"-") ;\ - src_bin="../../$${arch}-softmmu/qemu-system-$${arch}$(EXESUF)" ;\ - dest_bin="$(EMUL_DIR)/bin/emulator-$${arch}$(EXESUF)" ;\ - \ - echo "Copying $${src_bin} to $${dest_bin}" ;\ - cp -pP $${src_bin} $${dest_bin} ;\ - \ - case $${arch} in \ - i386|x86_64) \ - echo "Copying bioses to $(EMUL_DIR)/data/bios" ;\ - mkdir -p $(EMUL_DIR)/data/bios ;\ - cp -pP ../../pc-bios/bios-256k.bin $(EMUL_DIR)/data/bios ;\ - cp -pP ../../pc-bios/linuxboot.bin $(EMUL_DIR)/data/bios ;\ - cp -pP ../../pc-bios/efi-virtio.rom $(EMUL_DIR)/data/bios ;\ - cp -pP ../../pc-bios/acpi-dsdt.aml $(EMUL_DIR)/data/bios ;\ - ;;\ - arm) \ - ;;\ - esac ;\ - done + @echo "Copying emulator binary" + cp -pP $(SRC_PATH)/x86_64-softmmu/qemu-system-x86_64$(EXESUF) $(EMUL_DIR)/bin/emulator-x86_64$(EXESUF) + + @echo "Copying bioses to $(EMUL_DIR)/data/bios" + mkdir -p $(EMUL_DIR)/data/bios + cp -pP ../../pc-bios/bios-256k.bin $(EMUL_DIR)/data/bios + cp -pP ../../pc-bios/linuxboot.bin $(EMUL_DIR)/data/bios + cp -pP ../../pc-bios/efi-virtio.rom $(EMUL_DIR)/data/bios + cp -pP ../../pc-bios/acpi-dsdt.aml $(EMUL_DIR)/data/bios cp -pP scripts/emulator.sh $(EMUL_DIR)/bin ifdef CONFIG_WIN32 @@ -138,159 +126,6 @@ ifdef CONFIG_LINUX cp -pP skin/client/native_src/clipboard.py $(EMUL_DIR)/bin endif -####### for dibs system... -DIBS_X86_DIR=../x86 -DIBS_ARM_DIR=../arm -DIBS_COMMON_DIR=../common -DIBS_SKINS_DIR=../skins - -# DIBS classpath for emulator-skin.jar -DIBS_SWT_DIR=-Dclasspath.dibs=${ROOTDIR}/swt_4.3 - -all_dibs: qemu skin_client_dibs -skin_client_dibs: -ifdef CONFIG_JAVA_UI -ifdef CONFIG_USE_SHM - TIZEN_SDK_DEV_PATH=${TIZEN_SDK_DEV_PATH} ant -DuseSHM=true ${DIBS_SWT_DIR} -buildfile skin/client/build.xml make-jar -else - TIZEN_SDK_DEV_PATH=${TIZEN_SDK_DEV_PATH} ant -DuseSHM=false ${DIBS_SWT_DIR} -buildfile skin/client/build.xml make-jar -endif -endif - -install_dibs: all_dibs -# we care about only x86_64 in DIBS now - mkdir -p $(DIBS_COMMON_DIR)/bin - mkdir -p $(DIBS_COMMON_DIR)/etc - mkdir -p $(DIBS_COMMON_DIR)/icons - mkdir -p $(DIBS_COMMON_DIR)/images - mkdir -p $(DIBS_X86_DIR)/bin - mkdir -p $(DIBS_X86_DIR)/data - mkdir -p $(DIBS_X86_DIR)/etc - mkdir -p $(DIBS_SKINS_DIR)/mobile - mkdir -p $(DIBS_SKINS_DIR)/wearable - mkdir -p $(DIBS_SKINS_DIR)/tv - @for target in $(TARGET_DIRS); do \ - arch=$$(echo $$target | cut -f1 -d"-") ;\ - src_bin="../../$${arch}-softmmu/qemu-system-$${arch}$(EXESUF)" ;\ - dest_bin="$(DIBS_X86_DIR)/bin/emulator-$${arch}$(EXESUF)" ;\ - case $${arch} in \ - x86_64) \ - echo "Copying $${src_bin} to $${dest_bin}" ;\ - cp -pP $${src_bin} $${dest_bin} ;\ - mkdir -p $(DIBS_X86_DIR)/data/bios ;\ - echo "Copying bioses to $(DIBS_X86_DIR)/data/bios" ;\ - cp -pP ../../pc-bios/bios-256k.bin $(DIBS_X86_DIR)/data/bios ;\ - cp -pP ../../pc-bios/linuxboot.bin $(DIBS_X86_DIR)/data/bios ;\ - cp -pP ../../pc-bios/efi-virtio.rom $(DIBS_X86_DIR)/data/bios ;\ - cp -pP ../../pc-bios/acpi-dsdt.aml $(DIBS_X86_DIR)/data/bios ;\ - ;; \ - esac; \ - done - - cp -pP scripts/emulator.sh $(DIBS_COMMON_DIR)/bin -ifdef CONFIG_WIN32 - cp -pP scripts/emulator.cmd $(DIBS_COMMON_DIR)/bin -endif - -# resources and jar for skin -ifdef CONFIG_JAVA_UI - cp -pP skin/client/emulator-skin.jar $(DIBS_COMMON_DIR)/bin - - #temporary support - cp -pPR skin/client/skins/mobile $(DIBS_SKINS_DIR) - cp -pPR skin/client/skins/wearable $(DIBS_SKINS_DIR) - cp -pPR skin/client/skins/tv $(DIBS_SKINS_DIR) -endif - -ifdef CONFIG_QT - cp -pP ui/resource/images/display_off_guide.png $(DIBS_COMMON_DIR)/images - cp -pP ui/resource/images/tizen_sdk.png $(DIBS_COMMON_DIR)/images -ifdef CONFIG_DARWIN - cp -pP ui/resource/icons/emulator_icon.ico $(DIBS_COMMON_DIR)/icons -endif - - cp -pPR ui/resource/skins/mobile $(DIBS_SKINS_DIR) - cp -pPR ui/resource/skins/wearable $(DIBS_SKINS_DIR) - cp -pPR ui/resource/skins/tv $(DIBS_SKINS_DIR) -endif - -# Enable HW Virtualization on Linux -ifdef CONFIG_LINUX - cp -pP ../supplements/SDK/tizen-kvm $(DIBS_X86_DIR)/etc - cp -pP ../supplements/SDK/45-tizen-kvm.rules $(DIBS_X86_DIR)/etc -endif - -# Enable USB pass-through on Linux -ifeq ($(CONFIG_LINUX)$(CONFIG_TIZENUSB),yy) - cp -pP ../supplements/SDK/tizen-usb $(DIBS_X86_DIR)/etc - cp -pP ../supplements/SDK/45-tizen-usb.rules $(DIBS_X86_DIR)/etc -endif - -# give a title name for sdb terminal. -ifdef CONFIG_DARWIN - cp -pP scripts/sdbscript $(DIBS_COMMON_DIR)/bin -endif - -# for bridged network -ifdef CONFIG_LINUX - cp -pP scripts/emulator-ifup-linux.sh $(DIBS_X86_DIR)/etc/emulator-ifup.sh -endif -ifdef CONFIG_DARWIN - cp -pP scripts/emulator-ifup-darwin.sh $(DIBS_X86_DIR)/etc/emulator-ifup.sh -endif -ifdef CONFIG_WIN32 - cp -pP scripts/tap-uninstall.bat $(DIBS_COMMON_DIR)/bin -endif - -# use shared memory for display framebuffer -ifdef CONFIG_USE_SHM -ifdef CONFIG_LINUX - cp -pP skin/client/native_src/libshared.so $(DIBS_COMMON_DIR)/bin -endif -ifdef CONFIG_DARWIN - cp -pP skin/client/native_src/libshared.dylib $(DIBS_COMMON_DIR)/bin -endif -endif - -# use GTK for CopyToClipboard on Ubuntu 12.04 64bit -ifdef CONFIG_LINUX - cp -pP skin/client/native_src/clipboard.py $(DIBS_COMMON_DIR)/bin -endif - -# change loading path of dynamic shared libraries on MAC OS X -ifdef CONFIG_DARWIN - @LIB_LIST="libgthread-2.0.0.dylib libglib-2.0.0.dylib libintl.8.dylib libgcc_s.1.dylib libz.1.dylib libcurl.4.dylib libgcc_s.1.dylib libcurl.4.dylib libx264.142.dylib libncurses.5.dylib libpixman-1.0.dylib libpng16.16.dylib QtOpenGL QtWidgets QtGui QtCore"; \ - for target in $(TARGET_DIRS); do \ - case "$$target" in \ - x86_64-softmmu) \ - BIN_ARR=( emulator-x86_64 ); \ - for bin in $${BIN_ARR[@]}; do \ - LIB_ARR=( $$(otool -L $(DIBS_X86_DIR)/bin/$$bin | awk '/\opt\/local\/lib/ { split($$1, lib, "/"); print lib[5]}') ); \ - for lib in $${LIB_ARR[@]}; do \ - [[ $$LIB_LIST =~ $$lib ]] && IS_LIB=true || IS_LIB=false; \ - if [ "$$IS_LIB" == "true" ] ; then \ - install_name_tool -change /opt/local/lib/$$lib @loader_path/$$lib $(DIBS_X86_DIR)/bin/$$bin; \ - echo "$$bin: the loading path of $$lib is changed."; \ - else \ - echo "$$bin: $$lib does not exist in the loading path."; \ - fi; \ - done ; \ - LIB_ARR=( $$(otool -L $(DIBS_X86_DIR)/bin/$$bin | awk '/\opt\/local\/Library/ { split($$1, lib, "/"); print lib[9]}') ); \ - for lib in $${LIB_ARR[@]}; do \ - [[ $$LIB_LIST =~ $$lib ]] && IS_LIB=true || IS_LIB=false; \ - if [ "$$IS_LIB" == "true" ] ; then \ - install_name_tool -change /opt/local/Library/Frameworks/$$lib.framework/Versions/5/$$lib @loader_path/$$lib $(DIBS_X86_DIR)/bin/$$bin ; \ - echo "$$bin: the loading path of $$lib is changed."; \ - else \ - echo "$$bin: $$lib does not exist in the loading path."; \ - fi; \ - done \ - done \ - ;; \ - esac; \ - done -endif - else all: @echo "Please call configure before running make!" diff --git a/tizen/src/skin/client/build.xml b/tizen/src/skin/client/build.xml index c1834e3b6f..8be8e7d5dd 100644 --- a/tizen/src/skin/client/build.xml +++ b/tizen/src/skin/client/build.xml @@ -24,10 +24,10 @@ - + - + diff --git a/tizen/standalone-src/Makefile b/tizen/standalone-src/Makefile index a7f798bf28..924aeb7488 100644 --- a/tizen/standalone-src/Makefile +++ b/tizen/standalone-src/Makefile @@ -22,61 +22,8 @@ clean: rm -f $(TARGET_EXE) install: all -# change loading path of dynamic shared libraries on MAC OS X -ifdef CONFIG_DARWIN - @LIB_LIST="QtWidgets QtGui QtCore"; \ - for target in $(TARGET_DIRS); do \ - case "$$target" in \ - i386-softmmu) \ - BIN_ARR=( qt5_msgbox ); \ - for bin in $${BIN_ARR[@]}; do \ - LIB_ARR=( $$(otool -L $$bin | awk '/\opt\/local\/Library/ { split($$1, lib, "/"); print lib[9]}') ); \ - for lib in $${LIB_ARR[@]}; do \ - [[ $$LIB_LIST =~ $$lib ]] && IS_LIB=true || IS_LIB=false; \ - if [ "$$IS_LIB" == "true" ] ; then \ - install_name_tool -change /opt/local/Library/Frameworks/$$lib.framework/Versions/5/$$lib @loader_path/$$lib $$bin ; \ - echo "$$bin: the loading path of $$lib is changed."; \ - else \ - echo "$$bin: $$lib does not exist in the loading path."; \ - fi; \ - done \ - done \ - ;; \ - arm-softmmu) \ - ;; \ - esac; \ - done -endif cp -pP $(TARGET_EXE) $(EMUL_DIR)/bin -####### for dibs system... -install_dibs: all -# change loading path of dynamic shared libraries on MAC OS X -ifdef CONFIG_DARWIN - @LIB_LIST="QtWidgets QtGui QtCore"; \ - for target in $(TARGET_DIRS); do \ - case "$$target" in \ - i386-softmmu) \ - BIN_ARR=( qt5_msgbox ); \ - for bin in $${BIN_ARR[@]}; do \ - LIB_ARR=( $$(otool -L $$bin | awk '/\opt\/local\/Library/ { split($$1, lib, "/"); print lib[9]}') ); \ - for lib in $${LIB_ARR[@]}; do \ - [[ $$LIB_LIST =~ $$lib ]] && IS_LIB=true || IS_LIB=false; \ - if [ "$$IS_LIB" == "true" ] ; then \ - install_name_tool -change /opt/local/Library/Frameworks/$$lib.framework/Versions/5/$$lib @loader_path/$$lib $$bin ; \ - echo "$$bin: the loading path of $$lib is changed."; \ - else \ - echo "$$bin: $$lib does not exist in the loading path."; \ - fi; \ - done \ - done \ - ;; \ - arm-softmmu) \ - ;; \ - esac; \ - done -endif - cp -pP $(TARGET_EXE) $(DIBS_COMMON_DIR)/bin else all: #nothing to do