From: Kitae Kim Date: Mon, 19 Mar 2012 06:36:09 +0000 (+0900) Subject: [Title] Remove unnecessary install and remove script files X-Git-Tag: TizenStudio_2.0_p2.3~1641^2~35^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d92c8f784c3d392ad00875ff7dc5ab22f160d623;p=sdk%2Femulator%2Fqemu.git [Title] Remove unnecessary install and remove script files [Type] [Module] emulator / packaging [Priority] [CQ#] [Redmine#] [Problem] [Cause] [Solution] [TestCase] --- diff --git a/package/emulator.install.linux b/package/emulator.install.linux deleted file mode 100755 index ecd3c1e..0000000 --- a/package/emulator.install.linux +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh - -## User Define for desktop menu -currentPath=`pwd` -desktoppath=~/.local/share/applications - -## Do not modify the followings (Make desktop menu) -TIZEN_SDK_INSTALL_PATH=`echo $INSTALLED_PATH` -if [ -z $TIZEN_SDK_INSTALL_PATH ] -then -# echo "There is no TIZEN_SDK_PATH ENV" >> /tmp/emulator.log - exit 2; -fi - -iconpath=~/.local/share/icons - -## vtm shortcut -vtm_desktopfile=$desktoppath/tizen-sdk-vtm.desktop -vtm_iconfile=vtm.ico -vtm_iconpath=Emulator/skins/icons -vtm_exefile=Emulator/bin/emulator-manager -vtm_exepath=$TIZEN_SDK_INSTALL_PATH/$vtm_exefile -vtm_comment="Emulator manager is a tool which can make a cloned emulator image" -vtm_name="Emulator Manager" -mkdir -p $iconpath - -if test -e $TIZEN_SDK_INSTALL_PATH/$vtm_iconpath/$vtm_iconfile -then - cp -f $TIZEN_SDK_INSTALL_PATH/$vtm_iconpath/$vtm_iconfile $iconpath/$vtm_iconfile -else - echo "$vtm_iconfile does not exist!!" - exit 1 -fi - -${MAKESHORTCUT_PATH} \ - -f "$vtm_desktopfile" \ - -e "$vtm_exepath" \ - -i "$iconpath/$vtm_iconfile" \ - -n "$vtm_name" \ - -c "$vtm_comment" diff --git a/package/emulator.install.windows b/package/emulator.install.windows deleted file mode 100755 index e664abd..0000000 --- a/package/emulator.install.windows +++ /dev/null @@ -1,17 +0,0 @@ -@ECHO OFF -set vtm_shortcut_name=Emulator Manager -set execute_path=Emulator\bin -set vtm_execute_file=emulator-manager.bat -set icon_path=Emulator\skins\icons -set vtm_icon_file=vtm.ico - -set program_path=%INSTALLED_PATH%\%execute_path% -set desktop_menu_icon_path=%INSTALLED_PATH%\%icon_path% - -echo Program path : %program_path% -echo Desktop menu icon path : %desktop_menu_icon_path% -echo Setting shortcut... -wscript.exe %MAKESHORTCUT_PATH% /shortcut:"%vtm_shortcut_name%" /target:"%program_path%\%vtm_execute_file%" /icon:"%desktop_menu_icon_path%\%vtm_icon_file%" -echo Setting registry -reg add "hklm\SOFTWARE\Microsoft\Windows NT\CurrentVersion\AppCompatFlags\Layers" /f /v %program_path%\%vtm_execute_file% /t REG_SZ /d RUNASADMIN -echo COMPLETE diff --git a/package/emulator.remove.linux b/package/emulator.remove.linux deleted file mode 100755 index 95533e7..0000000 --- a/package/emulator.remove.linux +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -desktoppath=~/.local/share/applications -## Register .desktop file -${REMOVE_SHORTCUT} $desktoppath/tizen-sdk-vtm.desktop -### END Register Menu ### - -## Remove icon file ## -rm -f ~/.local/share/icons/vtm.ico -## End remove icon file ## diff --git a/package/emulator.remove.windows b/package/emulator.remove.windows deleted file mode 100755 index beb30bf..0000000 --- a/package/emulator.remove.windows +++ /dev/null @@ -1,9 +0,0 @@ -set vtm_shortcut_name=Emulator Manager -set execute_path=Emulator\bin -set vtm_execute_file=emulator-manager.bat -set program_path=%INSTALLED_PATH%\%execute_path% -ECHO Start menu path=%start_menu_programs_path% -echo delete from registry -reg delete "hklm\SOFTWARE\Microsoft\Windows NT\CurrentVersion\AppCompatFlags\Layers" /f /v %program_path%\%vtm_execute_file% -wscript.exe %REMOVE_SHORTCUT% /shortcut:%vtm_shortcut_name% - diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest index 7a11c81..b3d2d9b 100644 --- a/package/pkginfo.manifest +++ b/package/pkginfo.manifest @@ -1,5 +1,5 @@ Package: emulator -Version: 1.2.44 +Version: 1.2.45 OS: linux Build-host-os: linux Maintainer: Yeong-Kyoon Lee @@ -8,7 +8,7 @@ Source: emulator Description: Tizen Emulator Package: emulator -Version: 1.2.44 +Version: 1.2.45 OS: windows Build-host-os: windows Maintainer: Yeong-Kyoon Lee diff --git a/tizen/src/Makefile b/tizen/src/Makefile index 59091e8..fdbb7b4 100644 --- a/tizen/src/Makefile +++ b/tizen/src/Makefile @@ -33,16 +33,16 @@ install: all mkdir -p $(EMUL_DIR)/x86 mkdir -p $(EMUL_DIR)/arm mkdir -p $(EMUL_DIR)/icons + mkdir -p $(EMUL_DIR)/x86/data/pc-bios cp ../../i386-softmmu/qemu-system-i386 $(EMUL_DIR)/bin/emulator-x86 cp skin/client/emulator-skin.jar $(EMUL_DIR)/bin cp ../../qemu-img $(EMUL_DIR)/bin cp -dpr skin/client/skins $(EMUL_DIR) + cp -dpr ../license $(EMUL_DIR) + cp -dpr icons $(EMUL_DIR) cp -dpr ../data $(EMUL_DIR)/x86 - mkdir -p $(EMUL_DIR)/x86/data/pc-bios cp -dpr ../../pc-bios/bios.bin $(EMUL_DIR)/x86/data/pc-bios cp -dpr ../../pc-bios/linuxboot.bin $(EMUL_DIR)/x86/data/pc-bios cp -dpr ../../pc-bios/pxe-rtl8139.rom $(EMUL_DIR)/x86/data/pc-bios cp -dpr ../../pc-bios/pxe-virtio.rom $(EMUL_DIR)/x86/data/pc-bios cp -dpr ../../pc-bios/vgabios-maruvga.bin $(EMUL_DIR)/x86/data/pc-bios - cp -dpr ../license $(EMUL_DIR) - cp -dpr icons $(EMUL_DIR)