From e8025f7925388b867c0ca5664be62a9d533877a0 Mon Sep 17 00:00:00 2001
From: "jihye424.kim" <jihye424.kim@samsung.com>
Date: Mon, 1 Feb 2016 16:36:22 +0900
Subject: [PATCH] build: check runtime bit of java in windows

Change-Id: I1b4dcf0d4503fc3766fde2715636dd29d3ead220
Signed-off-by: jihye424.kim <jihye424.kim@samsung.com>
---
 package/build.windows               | 13 +++++++++++-
 package/pkginfo.manifest            |  9 ++++++++-
 supplement/em-wrapper-config-64.xml | 40 +++++++++++++++++++++++++++++++++++++
 supplement/em-wrapper-config.xml    | 17 ++++++++++++----
 4 files changed, 73 insertions(+), 6 deletions(-)
 create mode 100644 supplement/em-wrapper-config-64.xml

diff --git a/package/build.windows b/package/build.windows
index 611c483..4ee6fa7 100755
--- a/package/build.windows
+++ b/package/build.windows
@@ -22,6 +22,7 @@ build()
 {
 	prepare
 
+	SRCDIR=$MSYS_SRCDIR
 	. $SRCDIR/package/build.common
 	build_common
 
@@ -30,7 +31,16 @@ build()
 	LAUNCH4J_RUN=0
 	LAUNCH4J_NOT_FOUND=1
 	SKIP_EXE=2
-	supplement/genExe.sh supplement/em-wrapper-config.xml
+
+	case "${TARGET_OS}" in
+	"windows-32")
+		supplement/genExe.sh supplement/em-wrapper-config.xml
+		;;
+	"windows-64")
+		supplement/genExe.sh supplement/em-wrapper-config-64.xml
+		;;
+	esac
+
 	RET=$?
 	if [ "$RET" = "$LAUNCH4J_NOT_FOUND" ]; then
 		echo "Launch4j not found. Exit."
@@ -57,6 +67,7 @@ build()
 # install
 install()
 {
+	SRCDIR=$MSYS_SRCDIR
 	. $SRCDIR/package/build.common
 	install_common
 }
diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index 34b580d..61add7a 100644
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -10,13 +10,20 @@ Install-dependency: emulator-common-lib, emulator-supplements
 Description: Tizen Emulator Manager
 
 Package: emulator-manager
-OS: windows-32, windows-64
+OS: windows-32
 Build-host-os: windows-32
 Build-dependency: emulator-common-lib-dev, sdk-manager
 Install-dependency: emulator-common-lib, emulator-supplements
 Description: Tizen Emulator Manager
 
 Package: emulator-manager
+OS: windows-64
+Build-host-os: windows-64
+Build-dependency: emulator-common-lib-dev, sdk-manager
+Install-dependency: emulator-common-lib, emulator-supplements
+Description: Tizen Emulator Manager
+
+Package: emulator-manager
 OS: macos-64
 Build-host-os: macos-64
 Build-dependency: emulator-common-lib-dev, sdk-manager
diff --git a/supplement/em-wrapper-config-64.xml b/supplement/em-wrapper-config-64.xml
new file mode 100644
index 0000000..badbb2a
--- /dev/null
+++ b/supplement/em-wrapper-config-64.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<launch4jConfig>
+  <dontWrapJar>true</dontWrapJar>
+  <headerType>gui</headerType>
+  <jar>emulator-manager.jar</jar>
+  <outfile>..\emulator-manager.exe</outfile>
+  <errTitle>Emulator Manager</errTitle>
+  <cmdLine></cmdLine>
+  <chdir></chdir>
+  <priority>normal</priority>
+  <downloadUrl>http://www.oracle.com/technetwork/java/javase/downloads</downloadUrl>
+  <supportUrl></supportUrl>
+  <stayAlive>true</stayAlive>
+  <manifest></manifest>
+  <icon>..\resource\res\em.ico</icon>
+  <classPath>
+    <mainClass>org.tizen.emulator.manager.EmulatorManager</mainClass>
+    <cp>swt.jar</cp>
+    <cp>jsch-0.1.50.jar</cp>
+    <cp>protobuf.jar</cp>
+  </classPath>
+  <jre>
+    <path></path>
+    <bundledJre64Bit>false</bundledJre64Bit>
+    <minVersion>1.7.0</minVersion>
+    <maxVersion></maxVersion>
+    <jdkPreference>preferJre</jdkPreference>
+    <runtimeBits>64</runtimeBits>
+    <opt>-Djna.nosys=true</opt>
+  </jre>
+  <messages>
+    <startupErr>An error occurred while starting the application.</startupErr>
+    <bundledJreErr>This application was configured to use a bundled Java Runtime Environment but the runtime is missing or corrupted.</bundledJreErr>
+    <jreVersionErr>Tizen SDK requires an appropriate version of JRE (Java Runtime Environment) or JDK (Java Development Kit) and if you are using 64-bit Windows, 64-bit java is required. The version of your java may be lower than required or the bit version of java is not matched.
+
+Please update Java Runtime Environment to</jreVersionErr>
+    <launcherErr>The registry refers to a nonexistent Java Runtime Environment installation or the runtime is corrupted.</launcherErr>
+    <instanceAlreadyExistsMsg>An application instance is already running.</instanceAlreadyExistsMsg>
+  </messages>
+</launch4jConfig>
\ No newline at end of file
diff --git a/supplement/em-wrapper-config.xml b/supplement/em-wrapper-config.xml
index a02ec2c..1ea031f 100644
--- a/supplement/em-wrapper-config.xml
+++ b/supplement/em-wrapper-config.xml
@@ -4,11 +4,11 @@
   <headerType>gui</headerType>
   <jar>emulator-manager.jar</jar>
   <outfile>..\emulator-manager.exe</outfile>
-  <errTitle></errTitle>
+  <errTitle>Emulator Manager</errTitle>
   <cmdLine></cmdLine>
   <chdir></chdir>
   <priority>normal</priority>
-  <downloadUrl>http://java.com/download</downloadUrl>
+  <downloadUrl>http://www.oracle.com/technetwork/java/javase/downloads</downloadUrl>
   <supportUrl></supportUrl>
   <stayAlive>true</stayAlive>
   <manifest></manifest>
@@ -22,10 +22,19 @@
   <jre>
     <path></path>
     <bundledJre64Bit>false</bundledJre64Bit>
-    <minVersion>1.6.0</minVersion>
+    <minVersion>1.7.0</minVersion>
     <maxVersion></maxVersion>
     <jdkPreference>preferJre</jdkPreference>
-    <runtimeBits>64/32</runtimeBits>
+    <runtimeBits>32</runtimeBits>
     <opt>-Djna.nosys=true</opt>
   </jre>
+  <messages>
+    <startupErr>An error occurred while starting the application.</startupErr>
+    <bundledJreErr>This application was configured to use a bundled Java Runtime Environment but the runtime is missing or corrupted.</bundledJreErr>
+    <jreVersionErr>Tizen SDK requires an appropriate version of JRE (Java Runtime Environment) or JDK (Java Development Kit) and if you are using 64-bit Windows, 64-bit java is required. The version of your java may be lower than required or the bit version of java is not matched.
+
+Please update Java Runtime Environment to</jreVersionErr>
+    <launcherErr>The registry refers to a nonexistent Java Runtime Environment installation or the runtime is corrupted.</launcherErr>
+    <instanceAlreadyExistsMsg>An application instance is already running.</instanceAlreadyExistsMsg>
+  </messages>
 </launch4jConfig>
-- 
2.7.4