Kaydet (Commit) 31221c4f authored tarafından Samuel Mehrbrodt's avatar Samuel Mehrbrodt

Adopt odk configure to new java 6 baseline

Change-Id: I015f439b04ddbc337a1c0b000fa708686d1f83bb
Reviewed-on: https://gerrit.libreoffice.org/67751Reviewed-by: 's avatarStephan Bergmann <sbergman@redhat.com>
Tested-by: Jenkins
üst 74674905
...@@ -654,7 +654,7 @@ function getJavaHome() ...@@ -654,7 +654,7 @@ function getJavaHome()
var bSkip = false; var bSkip = false;
while(true) while(true)
{ {
stdout.Write("\n Enter JAVA SDK (1.4.1_01 or higher) installation directory (optional) [" + sSuggestedHome + "]:"); stdout.Write("\n Enter JAVA SDK (1.6 or higher) installation directory (optional) [" + sSuggestedHome + "]:");
var sHome = stdin.ReadLine(); var sHome = stdin.ReadLine();
if (sHome.length == 0) if (sHome.length == 0)
{ {
......
...@@ -75,7 +75,7 @@ $main::OO_SDK_CPP_HOME_SUGGESTION = searchprog($main::cppName); ...@@ -75,7 +75,7 @@ $main::OO_SDK_CPP_HOME_SUGGESTION = searchprog($main::cppName);
$main::OO_SDK_JAVA_HOME = ""; $main::OO_SDK_JAVA_HOME = "";
$main::OO_SDK_JAVA_HOME_SUGGESTION = searchprog("javac"); $main::OO_SDK_JAVA_HOME_SUGGESTION = searchprog("javac");
$main::javaVersion = "1.5.0_01"; $main::javaVersion = "1.6";
$main::SDK_AUTO_DEPLOYMENT = ""; $main::SDK_AUTO_DEPLOYMENT = "";
$main::SDK_AUTO_DEPLOYMENT_SUGGESTION = "YES"; $main::SDK_AUTO_DEPLOYMENT_SUGGESTION = "YES";
...@@ -393,7 +393,7 @@ while ( (!$main::correctVersion) && ...@@ -393,7 +393,7 @@ while ( (!$main::correctVersion) &&
((! -d "$main::OO_SDK_JAVA_HOME" ) || ((! -d "$main::OO_SDK_JAVA_HOME" ) ||
((-d "$main::OO_SDK_JAVA_HOME") && (! -e "$main::OO_SDK_JAVA_HOME/bin/javac"))) ) ((-d "$main::OO_SDK_JAVA_HOME") && (! -e "$main::OO_SDK_JAVA_HOME/bin/javac"))) )
{ {
print " Enter Java SDK (1.5, recommendation is 1.6 or higher) installation directory (optional) [$main::OO_SDK_JAVA_HOME_SUGGESTION]: "; print " Enter Java SDK (1.6 or higher) installation directory (optional) [$main::OO_SDK_JAVA_HOME_SUGGESTION]: ";
$main::OO_SDK_JAVA_HOME = readStdIn(); $main::OO_SDK_JAVA_HOME = readStdIn();
chop($main::OO_SDK_JAVA_HOME); chop($main::OO_SDK_JAVA_HOME);
if ( $main::OO_SDK_JAVA_HOME eq "" ) if ( $main::OO_SDK_JAVA_HOME eq "" )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment