From 785348ab9f643031881bd83d688a5ed3a8728419 Mon Sep 17 00:00:00 2001 From: Kitae Kim Date: Thu, 15 Mar 2012 17:18:47 +0900 Subject: [PATCH] [Title] Modify dibs scripts files. [Type] [Module] emulator / dibs [Priority] Major [CQ#] [Redmine#] [Problem] [Cause] [Solution] [TestCase] --- package/build.linux | 4 ++-- package/build.windows | 8 ++++---- package/emulator.install.linux | 40 ---------------------------------------- package/emulator.install.windows | 17 ----------------- package/emulator.remove.linux | 10 ---------- package/emulator.remove.windows | 9 --------- package/pkginfo.manifest | 4 ++-- 7 files changed, 8 insertions(+), 84 deletions(-) delete mode 100755 package/emulator.install.linux delete mode 100755 package/emulator.install.windows delete mode 100755 package/emulator.remove.linux delete mode 100755 package/emulator.remove.windows diff --git a/package/build.linux b/package/build.linux index ea33e22..f16f616 100755 --- a/package/build.linux +++ b/package/build.linux @@ -28,8 +28,8 @@ install() cd $SRCDIR/tizen make install mv Emulator $BIN_DIR - cp $SRCDIR/package/emulator.install.linux $BIN_DIR/../ - cp $SRCDIR/package/emulator.remove.linux $BIN_DIR/../ +# cp $SRCDIR/package/emulator.install.linux $BIN_DIR/../ +# cp $SRCDIR/package/emulator.remove.linux $BIN_DIR/../ } [ "$1" = "clean" ] && clean diff --git a/package/build.windows b/package/build.windows index 8292cb5..c1d5c0f 100755 --- a/package/build.windows +++ b/package/build.windows @@ -23,7 +23,7 @@ build() install() { BIN_DIR=$SRCDIR/package/emulator.package.windows/data - VTM_DIR=$BIN_DIR/Emulator/bin/emulator-manager.exe +# VTM_DIR=$BIN_DIR/Emulator/bin/emulator-manager.exe EMUL_DIR=$BIN_DIR/Emulator/bin/emulator-x86.exe mkdir -p $BIN_DIR @@ -31,10 +31,10 @@ install() cd $SRCDIR/tizen make install mv Emulator $BIN_DIR - editbin.exe /SUBSYSTEM:WINDOWS $VTM_DIR +# editbin.exe /SUBSYSTEM:WINDOWS $VTM_DIR editbin.exe /SUBSYSTEM:WINDOWS $EMUL_DIR - cp $SRCDIR/package/emulator.install.windows $BIN_DIR/../ - cp $SRCDIR/package/emulator.remove.windows $BIN_DIR/../ +# cp $SRCDIR/package/emulator.install.windows $BIN_DIR/../ +# cp $SRCDIR/package/emulator.remove.windows $BIN_DIR/../ } [ "$1" = "clean" ] && clean 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 37693ca..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.exe -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 1a75966..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.exe -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 4ff8977..b7b3408 100644 --- a/package/pkginfo.manifest +++ b/package/pkginfo.manifest @@ -3,7 +3,7 @@ Version: 1.2.34 OS: linux Build-host-os: linux Maintainer: Yeong-Kyoon Lee -Install-dependency: emulator-kernel [ linux ] +Install-dependency: emulator-kernel [ linux ], emulator-manager [ linux ] Source: emulator Description: Tizen Emulator @@ -12,6 +12,6 @@ Version: 1.2.34 OS: windows Build-host-os: windows Maintainer: Yeong-Kyoon Lee -Install-dependency: emulator-kernel [ windows ],emulator-dll [ windows ] +Install-dependency: emulator-kernel [ windows ], emulator-manager [ windows ], emulator-dll [ windows ] Source: emulator Description: Tizen Emulator -- 2.7.4