[STUB] Installmanager can support JDK8 on Windows.

Change-Id: I5cfd12675039b03fe8bb37ff3d7fdafd1c512134
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..ad602c9 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

diff --git a/os_stubs/windows/InstallManager.nsi b/os_stubs/windows/InstallManager.nsi
index e1bfd31..a350711 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
@@ -77,6 +76,7 @@ Function StrStr
 FunctionEnd\r
 ############\r
 \r
+\r
 ### TimeStamp\r
 !ifndef TimeStamp\r
     !define TimeStamp "!insertmacro _TimeStamp" \r
@@ -139,7 +139,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
@@ -168,20 +167,14 @@ done:
        ## Check java version and java execution.\r
        ExpandEnvStrings $3 %COMSPEC%\r
 \r
-        ${If} $3 == "%COMSPEC%"\r
-                ${DisableX64FSRedirection} ; execute cmd command for windows7 64bit\r
+       ${If} $3 == "%COMSPEC%"\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
 \r
+       Pop $0\r
+       Pop $6\r
        ## check java 1.6\r
        Push $6\r
        Push "1.6"\r