From c1a2e70a57b193315da02f065e2f6a130d3b89d4 Mon Sep 17 00:00:00 2001 From: GiWoong Kim Date: Fri, 10 Jan 2014 17:32:37 +0900 Subject: [PATCH] skin: move General skin to mobile-specific path tools/emulator/skins -> platforms/mobile-3.0/emulator-resources/skins Change-Id: If28d1499ca23c67cb9c1851ff56902fc934668c4 Signed-off-by: GiWoong Kim --- package/build.macos-64 | 1 + package/build.ubuntu-32 | 1 + package/build.ubuntu-64 | 1 + package/build.windows-32 | 1 + package/changelog | 3 +++ package/pkginfo.manifest | 2 +- tizen/src/Makefile | 6 +++--- .../{emul-general-3btn => mobile-general-3btn}/default.dbi | 0 .../{emul-general-3btn => mobile-general-3btn}/info.ini | 2 +- .../src/org/tizen/emulator/skin/EmulatorSkinMain.java | 2 +- 10 files changed, 13 insertions(+), 6 deletions(-) rename tizen/src/skin/client/skins/{emul-general-3btn => mobile-general-3btn}/default.dbi (100%) rename tizen/src/skin/client/skins/{emul-general-3btn => mobile-general-3btn}/info.ini (65%) diff --git a/package/build.macos-64 b/package/build.macos-64 index 6c494cc365..dcddca7a44 100755 --- a/package/build.macos-64 +++ b/package/build.macos-64 @@ -143,6 +143,7 @@ install() mv common $COMMON_BIN_DIR/emulator #profile skins + cp -pPR src/skin/client/skins/mobile-general-3btn $MOBILE_3_0_SKIN_RESOURCE_DIR/ cp -pPR src/skin/client/skins/mobile-480x800-3btn $MOBILE_3_0_SKIN_RESOURCE_DIR/ cp -pPR src/skin/client/skins/mobile-720x1280-3btn $MOBILE_3_0_SKIN_RESOURCE_DIR/ } diff --git a/package/build.ubuntu-32 b/package/build.ubuntu-32 index c820c86c55..3c29dc97d7 100755 --- a/package/build.ubuntu-32 +++ b/package/build.ubuntu-32 @@ -96,6 +96,7 @@ install() mv common $COMMON_BIN_DIR/emulator #profile skins + cp -pPR src/skin/client/skins/mobile-general-3btn $MOBILE_3_0_SKIN_RESOURCE_DIR/ cp -pPR src/skin/client/skins/mobile-480x800-3btn $MOBILE_3_0_SKIN_RESOURCE_DIR/ cp -pPR src/skin/client/skins/mobile-720x1280-3btn $MOBILE_3_0_SKIN_RESOURCE_DIR/ } diff --git a/package/build.ubuntu-64 b/package/build.ubuntu-64 index 3b9c1a071a..624303ad9c 100755 --- a/package/build.ubuntu-64 +++ b/package/build.ubuntu-64 @@ -96,6 +96,7 @@ install() mv common $COMMON_BIN_DIR/emulator #profile skins + cp -pPR src/skin/client/skins/mobile-general-3btn $MOBILE_3_0_SKIN_RESOURCE_DIR/ cp -pPR src/skin/client/skins/mobile-480x800-3btn $MOBILE_3_0_SKIN_RESOURCE_DIR/ cp -pPR src/skin/client/skins/mobile-720x1280-3btn $MOBILE_3_0_SKIN_RESOURCE_DIR/ } diff --git a/package/build.windows-32 b/package/build.windows-32 index 90b381f28d..92b25a312f 100755 --- a/package/build.windows-32 +++ b/package/build.windows-32 @@ -106,6 +106,7 @@ install() mv common $COMMON_BIN_DIR/emulator #profile skins + cp -pPR src/skin/client/skins/mobile-general-3btn $MOBILE_3_0_SKIN_RESOURCE_DIR/ cp -pPR src/skin/client/skins/mobile-480x800-3btn $MOBILE_3_0_SKIN_RESOURCE_DIR/ cp -pPR src/skin/client/skins/mobile-720x1280-3btn $MOBILE_3_0_SKIN_RESOURCE_DIR/ } diff --git a/package/changelog b/package/changelog index cd78a0f121..c41aec0e2e 100644 --- a/package/changelog +++ b/package/changelog @@ -1,3 +1,6 @@ +* 1.7.15 +- move General skin to mobile-specific path +== GiWoong Kim 2014-01-13 * 1.7.14 - disabled unstable spice because runtime library dependency == Sungmin Ha 2013-01-07 diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest index 885458b8af..0aaa81dbb1 100644 --- a/package/pkginfo.manifest +++ b/package/pkginfo.manifest @@ -1,4 +1,4 @@ -Version: 1.7.14 +Version: 1.7.15 Maintainer: Yeong-Kyoon Lee Source: emulator diff --git a/tizen/src/Makefile b/tizen/src/Makefile index 0a256f7646..fc9fb19d46 100644 --- a/tizen/src/Makefile +++ b/tizen/src/Makefile @@ -212,9 +212,9 @@ endif # resources and jar for skin cp -pP skin/client/emulator-skin.jar $(DIBS_COMMON_DIR)/bin - cp -pPR skin/client/skins $(DIBS_COMMON_DIR) - rm -rf $(DIBS_COMMON_DIR)/skins/mobile-480x800-3btn/ - rm -rf $(DIBS_COMMON_DIR)/skins/mobile-720x1280-3btn/ + #cp -pPR skin/client/skins $(DIBS_COMMON_DIR) + #rm -rf $(DIBS_COMMON_DIR)/skins/mobile-480x800-3btn/ + #rm -rf $(DIBS_COMMON_DIR)/skins/mobile-720x1280-3btn/ ifndef CONFIG_USE_SHM cp -pP skin/client/resource/images/blank-guide.png $(DIBS_COMMON_DIR)/images endif diff --git a/tizen/src/skin/client/skins/emul-general-3btn/default.dbi b/tizen/src/skin/client/skins/mobile-general-3btn/default.dbi similarity index 100% rename from tizen/src/skin/client/skins/emul-general-3btn/default.dbi rename to tizen/src/skin/client/skins/mobile-general-3btn/default.dbi diff --git a/tizen/src/skin/client/skins/emul-general-3btn/info.ini b/tizen/src/skin/client/skins/mobile-general-3btn/info.ini similarity index 65% rename from tizen/src/skin/client/skins/emul-general-3btn/info.ini rename to tizen/src/skin/client/skins/mobile-general-3btn/info.ini index 8adeb019b4..59ea685969 100644 --- a/tizen/src/skin/client/skins/emul-general-3btn/info.ini +++ b/tizen/src/skin/client/skins/mobile-general-3btn/info.ini @@ -1,4 +1,4 @@ -skin.name=General purpose +skin.name=General purpose mobile resolution.width=all resolution.height=all manager.priority=2 diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkinMain.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkinMain.java index 1062e353aa..ff11a55b18 100644 --- a/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkinMain.java +++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkinMain.java @@ -72,7 +72,7 @@ import org.tizen.emulator.skin.util.SwtUtil; */ public class EmulatorSkinMain { public static final String SKINS_FOLDER = "skins"; - public static final String DEFAULT_SKIN_FOLDER = "emul-general-3btn"; + public static final String DEFAULT_SKIN_FOLDER = "mobile-general-3btn"; public static final String SKIN_INFO_FILE_NAME = "info.ini"; public static final String SKIN_PROPERTIES_FILE_NAME = ".skin.properties"; -- 2.34.1