[STUB] Installmanager can check JDK8 on Windows.

Change-Id: I8e781b5f318c24d7ad9e91164e005c1e5f70ae3d
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 2399ea4..e1bfd31 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 "Samsung-gear-SDK"\r
+Name "Tizen-SDK-for-Wearable"\r
 \r
 ShowInstDetails show\r
 \r
@@ -193,29 +193,44 @@ done:
                Call StrStr\r
                Pop $1\r
                ${If} $1 == "" ; if not java version 1.7, it will check java version using java home.\r
-                       ## Execute java.exe in java home\r
-                       nsExec::ExecToStack '"$3" /C ""$5\bin\java.exe" "-version""'\r
-                       Pop $0\r
-                       Pop $6\r
-\r
-                       Push $6\r
-                       Push "1.6"\r
-                       Call StrStr\r
-                       Pop $1\r
-                       ${If} $1 == "" ; if not java version 1.6, it will check java version 1.7.\r
-                               Push $6\r
-                               Push "1.7"\r
-                               Call StrStr\r
-                               Pop $1\r
-                               ${If} $1 == "" ; if not java version 1.7, system does not support java.\r
-                                       goto NoEnv\r
+                       Push $6\r
+                       Push "1.8"\r
+                       Call StrStr\r
+                       Pop $1\r
+                       ${If} $1 == "" ; if not java version 1.8, it will check java version using java home.\r
+                               ## Execute java.exe in java home\r
+                               nsExec::ExecToStack '"$3" /C ""$5\bin\java.exe" "-version""'\r
+                               Pop $0\r
+                                       Pop $6\r
+\r
+                                ## check java 1.6\r
+                                Push $6\r
+                                Push "1.6"\r
+                                Call StrStr\r
+                                Pop $1\r
+                                ${If} $1 == "" ; if not java version 1.6, it will check java version 1.7.\r
+                                       Push $6\r
+                                       Push "1.7"\r
+                                       Call StrStr\r
+                                       Pop $1\r
+                                       ${If} $1 == "" ; if not java version 1.7, it will check java version 1.8.\r
+                                                       Push $6\r
+                                                Push "1.7"\r
+                                                Call StrStr\r
+                                                Pop $1\r
+                                                ${If} $1 == "" ; if not java version 1.8, system does not support java.\r
+                                                      goto NoEnv\r
+                                                ${EndIf}\r
+                                        ${EndIf}\r
                                ${EndIf}\r
                        ${EndIf}\r
                ${EndIf}\r
        ${EndIf}\r
 \r
        ${If} $R0 == ""\r
+               DetailPrint "Installmanager needs initialization time for executing itself."\r
                ExecDos::Exec /NOUNLOAD /ASYNC /DISABLEFSR "java -jar $INSTDIR\InstallManager.jar $2"\r
+               sleep 5000\r
                pop $4\r
        ${Else}\r
                StrCpy $3 "$2 $R0"\r

diff --git a/os_stubs/windows/InstallManager.nsi b/os_stubs/windows/InstallManager.nsi
index beed2a3..e1bfd31 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 "Samsung-gear-SDK"\r
+Name "Tizen-SDK-for-Wearable"\r
 \r
 ShowInstDetails show\r
 \r
@@ -8,6 +8,7 @@ Icon "SDK_icon.ico"
 \r
 !include FileFunc.nsh\r
 !include LogicLib.nsh\r
+!include x64.nsh\r
 !insertmacro GetParameters\r
 !insertmacro GetOptions\r
 \r
@@ -76,7 +77,6 @@ Function StrStr
 FunctionEnd\r
 ############\r
 \r
-\r
 ### TimeStamp\r
 !ifndef TimeStamp\r
     !define TimeStamp "!insertmacro _TimeStamp" \r
@@ -139,6 +139,7 @@ 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
@@ -167,14 +168,20 @@ done:
        ## Check java version and java execution.\r
        ExpandEnvStrings $3 %COMSPEC%\r
 \r
-       ${If} $3 == "%COMSPEC%"\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
 \r
-       Pop $0\r
-       Pop $6\r
        ## check java 1.6\r
        Push $6\r
        Push "1.6"\r
@@ -186,31 +193,45 @@ done:
                Call StrStr\r
                Pop $1\r
                ${If} $1 == "" ; if not java version 1.7, it will check java version using java home.\r
-                       ## Execute java.exe in java home\r
-                       nsExec::ExecToStack '"$3" /C ""$5\bin\java.exe" "-version""'\r
-                       Pop $0\r
-                       Pop $6\r
-\r
-                       ## check java 1.6\r
-                       Push $6\r
-                       Push "1.6"\r
-                       Call StrStr\r
-                       Pop $1\r
-                       ${If} $1 == "" ; if not java version 1.6, it will check java version 1.7.\r
-                               Push $6\r
-                               Push "1.7"\r
-                               Call StrStr\r
-                               Pop $1\r
-                               ${If} $1 == "" ; if not java version 1.7, system does not support java.\r
-                                       goto NoEnv\r
+                       Push $6\r
+                       Push "1.8"\r
+                       Call StrStr\r
+                       Pop $1\r
+                       ${If} $1 == "" ; if not java version 1.8, it will check java version using java home.\r
+                               ## Execute java.exe in java home\r
+                               nsExec::ExecToStack '"$3" /C ""$5\bin\java.exe" "-version""'\r
+                               Pop $0\r
+                                       Pop $6\r
+\r
+                                ## check java 1.6\r
+                                Push $6\r
+                                Push "1.6"\r
+                                Call StrStr\r
+                                Pop $1\r
+                                ${If} $1 == "" ; if not java version 1.6, it will check java version 1.7.\r
+                                       Push $6\r
+                                       Push "1.7"\r
+                                       Call StrStr\r
+                                       Pop $1\r
+                                       ${If} $1 == "" ; if not java version 1.7, it will check java version 1.8.\r
+                                                       Push $6\r
+                                                Push "1.7"\r
+                                                Call StrStr\r
+                                                Pop $1\r
+                                                ${If} $1 == "" ; if not java version 1.8, system does not support java.\r
+                                                      goto NoEnv\r
+                                                ${EndIf}\r
+                                        ${EndIf}\r
                                ${EndIf}\r
                        ${EndIf}\r
                ${EndIf}\r
        ${EndIf}\r
 \r
        ${If} $R0 == ""\r
-               ExecDos::Exec /NOUNLOAD /ASYNC "java.exe -jar $INSTDIR\InstallManager.jar $2"\r
-               Pop $4\r
+               DetailPrint "Installmanager needs initialization time for executing itself."\r
+               ExecDos::Exec /NOUNLOAD /ASYNC /DISABLEFSR "java -jar $INSTDIR\InstallManager.jar $2"\r
+               sleep 5000\r
+               pop $4\r
        ${Else}\r
                StrCpy $3 "$2 $R0"\r
                System::Call 'kernel32::GetStdHandle(i -11)i.r0' ;try to get stdout\r