From 792d363051ed999b7eb89ac0f1f2b7acd9696564 Mon Sep 17 00:00:00 2001 From: "giwoong.kim" Date: Wed, 2 May 2012 14:10:48 +0900 Subject: [PATCH] [Title] sync with release-1.0 [Type] [Module] Emulator [Priority] [Jira#] [Redmine#] [Problem] [Cause] [Solution] [TestCase] --- package/pkginfo.manifest | 4 ++-- tizen/src/VERSION | 2 +- .../client/src/org/tizen/emulator/skin/dialog/AboutDialog.java | 2 +- tizen/src/skin/maruskin_client.c | 10 ++++++---- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest index ed1539d..bdf7b41 100644 --- a/package/pkginfo.manifest +++ b/package/pkginfo.manifest @@ -1,5 +1,5 @@ Package: emulator -Version: 1.2.62 +Version: 1.2.90 OS: linux Build-host-os: linux Maintainer: Yeong-Kyoon Lee @@ -8,7 +8,7 @@ Source: emulator Description: Tizen Emulator Package: emulator -Version: 1.2.62 +Version: 1.2.90 OS: windows Build-host-os: windows Maintainer: Yeong-Kyoon Lee diff --git a/tizen/src/VERSION b/tizen/src/VERSION index 9f8e9b6..c5f46e8 100644 --- a/tizen/src/VERSION +++ b/tizen/src/VERSION @@ -1 +1 @@ -1.0 \ No newline at end of file +1.0 Larkspur diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/dialog/AboutDialog.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/dialog/AboutDialog.java index f835d47..bc765ba 100644 --- a/tizen/src/skin/client/src/org/tizen/emulator/skin/dialog/AboutDialog.java +++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/dialog/AboutDialog.java @@ -96,7 +96,7 @@ public class AboutDialog extends SkinDialog { Text versionText = new Text( composite, SWT.NONE ); String version = getValue( properties, PROP_KEY_VERSION ); - versionText.setText( "Version" + " : Tizen SDK " + version ); + versionText.setText( "Version" + " : " + version ); versionText.setEditable( false ); versionText.setBackground( shell.getDisplay().getSystemColor( SWT.COLOR_WIDGET_BACKGROUND ) ); diff --git a/tizen/src/skin/maruskin_client.c b/tizen/src/skin/maruskin_client.c index 9c49e47..b45ddce 100644 --- a/tizen/src/skin/maruskin_client.c +++ b/tizen/src/skin/maruskin_client.c @@ -76,11 +76,11 @@ static void* run_skin_client(void* arg) int skin_server_port = get_skin_server_port(); srand( time( NULL ) ); - int uid = rand(); - INFO( "generated skin uid:%d\n", uid ); + int uid = 0; //rand(); + //INFO( "generated skin uid:%d\n", uid ); char* vm_path = tizen_target_path; - INFO( "vm_path:%s\n", vm_path ); + //INFO( "vm_path:%s\n", vm_path ); sprintf( cmd, "%s %s %s %s=\"%d\" %s=\"%d\" %s=\"%s\" %s=\"%d\" %s", JAVA_EXEFILE_PATH, JAVA_EXEOPTION, JAR_SKINFILE_PATH, OPT_SVR_PORT, skin_server_port, @@ -88,6 +88,7 @@ static void* run_skin_client(void* arg) OPT_VM_PATH, vm_path, OPT_NET_BASE_PORT, tizen_base_port, argv ); + INFO( "command for swt : %s\n", cmd ); #ifdef _WIN32 #if 0 @@ -143,8 +144,9 @@ static void* run_skin_client(void* arg) ERR("failed to close child thread handle, error %u\n", GetLastError()); } } + #endif -#else +#else //ifndef _WIN32 int ret = system(cmd); if (ret == 127) { -- 2.7.4