[STUB] Installmanager can support JDK8 on Windows.

Change-Id: I5a4330f585c81a65275c1f3f0f0e8a89a669253a
Signed-off-by: yongsung1.kim <yongsung1.kim@samsung.com>

diff --git a/os_stubs/windows/InstallManager-64.nsi b/os_stubs/windows/InstallManager-64.nsi
index e1bfd31..9087707 100644 (file)
--- a/os_stubs/windows/InstallManager-64.nsi
+++ b/os_stubs/windows/InstallManager-64.nsi
@@ -1,6 +1,6 @@
 outfile "inst-manager.exe"\r
 \r
-Name "Tizen-SDK-for-Wearable"\r
+Name "Tizen-SDK"\r
 \r
 ShowInstDetails show\r
 \r
@@ -242,12 +242,12 @@ SetAutoClose true
 return\r
 \r
 NoEnv:\r
-       MessageBox MB_ICONEXCLAMATION "Cannot execute Java even if it was installed. Check environment variables or Java version(over 1.6) please."  \r
+       MessageBox MB_ICONEXCLAMATION "Cannot execute Java even if it was installed. Check environment variables or Java version(1.6, 1.7, 1.8) please."  \r
 SetAutoClose true\r
 return\r
 \r
 NoJava:\r
-       MessageBox MB_ICONEXCLAMATION "You must have either a Java Runtime Environment (JRE) or a Java Development Kit (JDK) in version 6 installed on your computer."\r
+       MessageBox MB_ICONEXCLAMATION "You must have either a Java Runtime Environment (JRE) or a Java Development Kit (JDK) in version 6, 7, 8 installed on your computer."\r
 SetAutoClose true\r
 return\r
 \r

diff --git a/os_stubs/windows/InstallManager.nsi b/os_stubs/windows/InstallManager.nsi
index e1bfd31..a18b968 100644 (file)
--- a/os_stubs/windows/InstallManager.nsi
+++ b/os_stubs/windows/InstallManager.nsi
@@ -1,6 +1,6 @@
 outfile "inst-manager.exe"\r
 \r
-Name "Tizen-SDK-for-Wearable"\r
+Name "Tizen-SDK"\r
 \r
 ShowInstDetails show\r
 \r
@@ -8,7 +8,6 @@ Icon "SDK_icon.ico"
 \r
 !include FileFunc.nsh\r
 !include LogicLib.nsh\r
-!include x64.nsh\r
 !insertmacro GetParameters\r
 !insertmacro GetOptions\r
 \r
@@ -139,7 +138,6 @@ section
        ${GetParameters} $R0\r
        ${GetExePath} $R1\r
        ${TimeStamp} $0\r
-       SetRegView 64\r
 \r
        StrCpy $1 "SOFTWARE\JavaSoft\Java Runtime Environment"\r
        StrCpy $2 0\r
@@ -169,15 +167,11 @@ done:
        ExpandEnvStrings $3 %COMSPEC%\r
 \r
         ${If} $3 == "%COMSPEC%"\r
-                ${DisableX64FSRedirection} ; execute cmd command for windows7 64bit\r
                 nsExec::ExecToStack '"java.exe" "-version"'\r
-                       ${EnableX64FSRedirection} ; execute cmd command for windows7 64bit\r
                 Pop $0\r
                 Pop $6\r
         ${Else}\r
-               ${DisableX64FSRedirection} ; execute cmd command for windows7 64bit\r
                 nsExec::ExecToStack '"$3" /C ""java.exe" "-version""'\r
-                       ${EnableX64FSRedirection} ; execute cmd command for windows7 64bit\r
                 Pop $0\r
                 Pop $6\r
         ${EndIf}\r
@@ -242,12 +236,12 @@ SetAutoClose true
 return\r
 \r
 NoEnv:\r
-       MessageBox MB_ICONEXCLAMATION "Cannot execute Java even if it was installed. Check environment variables or Java version(over 1.6) please."  \r
+       MessageBox MB_ICONEXCLAMATION "Cannot execute Java even if it was installed. Check environment variables or Java version(1.6, 1.7, 1.8) please."  \r
 SetAutoClose true\r
 return\r
 \r
 NoJava:\r
-       MessageBox MB_ICONEXCLAMATION "You must have either a Java Runtime Environment (JRE) or a Java Development Kit (JDK) in version 6 installed on your computer."\r
+       MessageBox MB_ICONEXCLAMATION "You must have either a Java Runtime Environment (JRE) or a Java Development Kit (JDK) in version 6, 7, 8 installed on your computer."\r
 SetAutoClose true\r
 return\r
 \r