[Title] sync with release-1.0

[Type]
[Module] Emulator
[Priority]
[Jira#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]

diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index ed1539d8a093a6c4b63590e8d515c28092f0ac04..bdf7b415e4613df5e7e3f02df3d6a17d1b1af7a1 100644 (file)
--- 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<yeongkyoon.lee@samsung.com>
@@ -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<yeongkyoon.lee@samsung.com>

diff --git a/tizen/src/VERSION b/tizen/src/VERSION
index 9f8e9b69a33f4e8067d5b21661a35d8856758aba..c5f46e8dd3c20f38c95dfa01c7671c67c8756257 100644 (file)
--- 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 f835d47929b7c90ad2dd0d80b8b17d5fbd006d9d..bc765ba99b64897130b475729da2a417ff5ee46a 100644 (file)
--- 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 9c49e477ec38a3f58fb0ae8a00dafb3801e25f8c..b45ddce9af98ae6cfa3b9a90aba2c4cecc0194e9 100644 (file)
--- 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) {