From 77b92f4c5a0052d9e82220f0e4b940fc6308fbcd Mon Sep 17 00:00:00 2001 From: "yongsung1.kim" Date: Mon, 14 Apr 2014 14:09:44 +0900 Subject: [PATCH] [STUB] Installmanager can support JDK8 on Windows. Change-Id: I5a4330f585c81a65275c1f3f0f0e8a89a669253a Signed-off-by: yongsung1.kim --- os_stubs/windows/InstallManager-64.nsi | 6 +++--- os_stubs/windows/InstallManager.nsi | 12 +++--------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/os_stubs/windows/InstallManager-64.nsi b/os_stubs/windows/InstallManager-64.nsi index e1bfd31..9087707 100644 --- a/os_stubs/windows/InstallManager-64.nsi +++ b/os_stubs/windows/InstallManager-64.nsi @@ -1,6 +1,6 @@ outfile "inst-manager.exe" -Name "Tizen-SDK-for-Wearable" +Name "Tizen-SDK" ShowInstDetails show @@ -242,12 +242,12 @@ SetAutoClose true return NoEnv: - MessageBox MB_ICONEXCLAMATION "Cannot execute Java even if it was installed. Check environment variables or Java version(over 1.6) please." + MessageBox MB_ICONEXCLAMATION "Cannot execute Java even if it was installed. Check environment variables or Java version(1.6, 1.7, 1.8) please." SetAutoClose true return NoJava: - 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." + 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." SetAutoClose true return diff --git a/os_stubs/windows/InstallManager.nsi b/os_stubs/windows/InstallManager.nsi index e1bfd31..a18b968 100644 --- a/os_stubs/windows/InstallManager.nsi +++ b/os_stubs/windows/InstallManager.nsi @@ -1,6 +1,6 @@ outfile "inst-manager.exe" -Name "Tizen-SDK-for-Wearable" +Name "Tizen-SDK" ShowInstDetails show @@ -8,7 +8,6 @@ Icon "SDK_icon.ico" !include FileFunc.nsh !include LogicLib.nsh -!include x64.nsh !insertmacro GetParameters !insertmacro GetOptions @@ -139,7 +138,6 @@ section ${GetParameters} $R0 ${GetExePath} $R1 ${TimeStamp} $0 - SetRegView 64 StrCpy $1 "SOFTWARE\JavaSoft\Java Runtime Environment" StrCpy $2 0 @@ -169,15 +167,11 @@ done: ExpandEnvStrings $3 %COMSPEC% ${If} $3 == "%COMSPEC%" - ${DisableX64FSRedirection} ; execute cmd command for windows7 64bit nsExec::ExecToStack '"java.exe" "-version"' - ${EnableX64FSRedirection} ; execute cmd command for windows7 64bit Pop $0 Pop $6 ${Else} - ${DisableX64FSRedirection} ; execute cmd command for windows7 64bit nsExec::ExecToStack '"$3" /C ""java.exe" "-version""' - ${EnableX64FSRedirection} ; execute cmd command for windows7 64bit Pop $0 Pop $6 ${EndIf} @@ -242,12 +236,12 @@ SetAutoClose true return NoEnv: - MessageBox MB_ICONEXCLAMATION "Cannot execute Java even if it was installed. Check environment variables or Java version(over 1.6) please." + MessageBox MB_ICONEXCLAMATION "Cannot execute Java even if it was installed. Check environment variables or Java version(1.6, 1.7, 1.8) please." SetAutoClose true return NoJava: - 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." + 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." SetAutoClose true return -- 2.7.4