From 462c9c171871dc2a66f6fa641b64d60780d111d7 Mon Sep 17 00:00:00 2001 From: "syeon.hwang" Date: Thu, 19 Jul 2012 13:32:35 +0900 Subject: [PATCH] [Title] Modify build.xml, Makefiles, dibs build scripts to remove swt.jar [Type] [Module] [Priority] [CQ#] [Redmine#] [Problem] [Cause] [Solution] [TestCase] --- package/build.ubuntu-10.04-32 | 4 +- package/build.windows-7-32 | 25 +++++----- tizen/Makefile | 8 +++- tizen/src/Makefile | 34 ++++++++------ tizen/src/skin/client/build.xml | 83 +++++++++------------------------ 5 files changed, 64 insertions(+), 90 deletions(-) diff --git a/package/build.ubuntu-10.04-32 b/package/build.ubuntu-10.04-32 index 1bd7b2d8f2..ed9089290c 100755 --- a/package/build.ubuntu-10.04-32 +++ b/package/build.ubuntu-10.04-32 @@ -17,7 +17,7 @@ build() { cd $SRCDIR/tizen/ ./emulator_configure.sh - make + make all_dibs } # install @@ -27,7 +27,7 @@ install() mkdir -p $BIN_DIR cd $SRCDIR/tizen - make install + make install_dibs mv emulator $BIN_DIR } diff --git a/package/build.windows-7-32 b/package/build.windows-7-32 index 1312801a32..f077e55d0b 100755 --- a/package/build.windows-7-32 +++ b/package/build.windows-7-32 @@ -5,7 +5,7 @@ clean() { prepare - cd $SRCDIR/tizen/ + cd $SRCDIR/tizen if test -e "Makefile" then ./emulator_configure.sh "$BUILD_CFLAGS $BUILD_LDFLAGS" @@ -38,7 +38,7 @@ prepare() export PATH export PKG_CONFIG_PATH=$ROOTDIR/lib/pkgconfig BUILD_CFLAGS=--extra-cflags=-I$ROOTDIR/include - BUILD_LDFLAGS=--extra-ldflags=-L$ROOTDIR/lib + BUILD_LDFLAGS=--extra-ldflags=-L$ROOTDIR/lib } # build @@ -46,22 +46,21 @@ build() { prepare - cd $SRCDIR/tizen/ + cd $SRCDIR/tizen ./emulator_configure.sh "$BUILD_CFLAGS $BUILD_LDFLAGS" - make - if [ -f "../i386-softmmu/qemu-system-i386.exe" ] - then - echo "BUILD SUCCESS" - else - echo "BUILD FAIL!!!" - exit 1; - fi + make all_dibs + if [ -f "../i386-softmmu/qemu-system-i386.exe" ] + then + echo "BUILD SUCCESS" + else + echo "BUILD FAIL!!!" + exit 1; + fi } # install install() { - prepare BIN_DIR=$SRCDIR/package/emulator-qemu-x86.package.${TARGET_OS}/data/tools @@ -69,7 +68,7 @@ install() mkdir -p $BIN_DIR cd $SRCDIR/tizen - make install + make install_dibs mv emulator $BIN_DIR } diff --git a/tizen/Makefile b/tizen/Makefile index 6c94fd5d9b..09dc639e70 100644 --- a/tizen/Makefile +++ b/tizen/Makefile @@ -1,8 +1,14 @@ all: - cd src && $(MAKE) + cd src && $(MAKE) all clean: cd src && $(MAKE) clean distclean: cd src && $(MAKE) distclean install: cd src && $(MAKE) install + +# for dibs system... +all_dibs: + cd src && $(MAKE) all_dibs +install_dibs: + cd src && $(MAKE) install_dibs diff --git a/tizen/src/Makefile b/tizen/src/Makefile index bc0286770f..b6184fdc89 100755 --- a/tizen/src/Makefile +++ b/tizen/src/Makefile @@ -9,35 +9,30 @@ config-host.mak: endif all: qemu skin_client + qemu: build_info ffmpeg_install check_hax cd ../../ && $(MAKE) qemu_clean: cd ../../ && $(MAKE) clean qemu_distclean: cd ../../ && $(MAKE) distclean + check_hax: ifdef CONFIG_WIN32 $(CC) -o check-hax.exe check_hax.c else endif + skin_client: -ifdef CONFIG_WIN32 - ant -buildfile skin/client/build.xml windows-jar -else -ifdef CONFIG_LINUX - ant -buildfile skin/client/build.xml linux-jar -else -ifdef CONFIG_DARWIN - ant -buildfile skin/client/build.xml mac-jar -endif -endif -endif + ant -buildfile skin/client/build.xml make-jar + build_info: @echo "/* Automatically generated by Makefile - do not modify! */" > build_info.h @echo "const char build_version[] = \"`cat VERSION`\";" >> build_info.h @echo "const char build_date[] = \"`date +"%F %T %Z"`\";" >> build_info.h @echo "const char pkginfo_version[] = \"`sed -n '2p' ./../../package/pkginfo.manifest`\";" >> build_info.h + ffmpeg: cd ../distrib/libav/ && $(MAKE) ffmpeg_install: ffmpeg @@ -46,6 +41,7 @@ ffmpeg_clean: cd ../distrib/libav/ && $(MAKE) clean ffmpeg_distclean: cd ../distrib/libav/ && $(MAKE) clean + clean: qemu_clean ffmpeg_clean ifdef CONFIG_WIN32 rm -f check-hax.exe @@ -53,13 +49,14 @@ else endif distclean: qemu_distclean ffmpeg_distclean -install: all + +install_common: all mkdir -p $(EMUL_DIR)/bin mkdir -p $(EMUL_DIR)/etc mkdir -p $(EMUL_DIR)/x86 - mkdir -p $(EMUL_DIR)/x86/data + mkdir -p $(EMUL_DIR)/data mkdir -p $(EMUL_DIR)/arm - mkdir -p $(EMUL_DIR)/x86/data/pc-bios + mkdir -p $(EMUL_DIR)/data/bios cp ../../i386-softmmu/qemu-system-i386 $(EMUL_DIR)/bin/emulator-x86 cp skin/client/emulator-skin.jar $(EMUL_DIR)/bin ifdef CONFIG_WIN32 @@ -73,3 +70,12 @@ endif cp -dpr ../../pc-bios/linuxboot.bin $(EMUL_DIR)/data/bios cp -dpr ../../pc-bios/pxe-rtl8139.rom $(EMUL_DIR)/data/bios cp -dpr ../../pc-bios/pxe-virtio.rom $(EMUL_DIR)/data/bios +install: install_common + cp skin/client/lib/swt.jar $(EMUL_DIR)/bin/swt.jar + +# for dibs system... +all_dibs: qemu skin_client_dibs +skin_client_dibs: + ant -buildfile skin/client/build.xml -Dclasspath.dibs=$(ROOTDIR)/toos/emulator/bin make-jar-dibs +install_dibs: install_common + diff --git a/tizen/src/skin/client/build.xml b/tizen/src/skin/client/build.xml index 71b52a0294..7e4f6a69a0 100644 --- a/tizen/src/skin/client/build.xml +++ b/tizen/src/skin/client/build.xml @@ -1,19 +1,13 @@ - + - - - - - - - - + + @@ -42,34 +36,20 @@ - - - + + + - - - - + - - - + - - - - - - - - - - + @@ -79,42 +59,25 @@ - + - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - + + + + + + + + + + - \ No newline at end of file + + -- 2.34.1