From 4728ac97265b114d585f1edd89fb0a52eb67da91 Mon Sep 17 00:00:00 2001 From: Kitae Kim Date: Thu, 19 Jul 2012 21:22:28 +0900 Subject: [PATCH] [Title] modify build scripts. [Type] [Module] emulator / build [Priority] [CQ#] [Redmine#] [Problem] [Cause] [Solution] [TestCase] --- tizen/emulator_configure.sh | 2 +- tizen/src/Makefile | 26 ++++++++++++++++++++------ 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/tizen/emulator_configure.sh b/tizen/emulator_configure.sh index 49f6e7a..78eea9f 100755 --- a/tizen/emulator_configure.sh +++ b/tizen/emulator_configure.sh @@ -3,7 +3,7 @@ #--target-list=i386-softmmu,arm-softmmu \ targetos=`uname -s` -targetarch=`echo | gcc -E -dM | grep __x86_64` +targetarch=`echo | gcc -E -dM - | grep __x86_64` bindir="i386" if test "$targetarch" = "x86_64" diff --git a/tizen/src/Makefile b/tizen/src/Makefile index b6184fd..bdc43c4 100755 --- a/tizen/src/Makefile +++ b/tizen/src/Makefile @@ -50,12 +50,10 @@ else endif distclean: qemu_distclean ffmpeg_distclean -install_common: all +install: all mkdir -p $(EMUL_DIR)/bin mkdir -p $(EMUL_DIR)/etc - mkdir -p $(EMUL_DIR)/x86 mkdir -p $(EMUL_DIR)/data - mkdir -p $(EMUL_DIR)/arm 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 @@ -70,12 +68,28 @@ 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 + ant -buildfile skin/client/build.xml -Dclasspath.dibs=$(ROOTDIR)/tools/emulator/bin make-jar-dibs +install_dibs: all_dibs + mkdir -p $(EMUL_DIR)/bin + mkdir -p $(EMUL_DIR)/etc + mkdir -p $(EMUL_DIR)/data + 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 + cp check-hax.exe $(EMUL_DIR)/bin +else + +endif + cp ../../qemu-img $(EMUL_DIR)/bin + cp -dpr ../license $(EMUL_DIR) + cp -dpr ../../pc-bios/bios.bin $(EMUL_DIR)/data/bios + 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 -- 2.7.4