Kaydet (Commit) 0c22641b authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Fix oo_sdk_ure_home calculation in SDK's cfgWin.js

This appears to be broken at least since
bde5b815 "INTEGRATION: CWS jsc21 (1.11.2); FILE
MERGED: 2008/05/27 16:59:34 jsc 1.11.2.1: #i88797# adapt for new structure"?

Change-Id: I6385ca10cdded13e6d1aaf08d353f5029843d38d
üst f5a8fa8b
...@@ -53,7 +53,7 @@ var oo_user_sdk_dir=WshSysEnv("APPDATA") + "\\" + oo_sdk_name; ...@@ -53,7 +53,7 @@ var oo_user_sdk_dir=WshSysEnv("APPDATA") + "\\" + oo_sdk_name;
var oo_user_sdk_env_script=oo_user_sdk_dir + "\\setsdkenv_windows.bat"; var oo_user_sdk_env_script=oo_user_sdk_dir + "\\setsdkenv_windows.bat";
var office_home=getOfficeHome(); var office_home=getOfficeHome();
var oo_sdk_ure_home=getUreHome(); var oo_sdk_ure_home=office_home + "\\URE";
var oo_sdk_make_home=getMakeHome(); var oo_sdk_make_home=getMakeHome();
var oo_sdk_zip_home=getZipHome(); var oo_sdk_zip_home=getZipHome();
...@@ -140,23 +140,6 @@ function getSdkHome() ...@@ -140,23 +140,6 @@ function getSdkHome()
} }
} }
function getOfficeOrUre()
{
var suggestion = "Office";
var choice;
while (choice != "office" && choice != "ure") {
stdout.Write(
"\n Use an installed Office or an installed UNO Runtime"
+ " Environment (Office/URE) [" + suggestion + "]:");
choice = stdin.ReadLine();
if (choice == "") {
choice = suggestion;
}
choice = choice.toLowerCase();
}
return choice;
}
function getOfficeHome() function getOfficeHome()
{ {
var sSuggestedHome = WshSysEnv("OFFICE_HOME"); var sSuggestedHome = WshSysEnv("OFFICE_HOME");
...@@ -239,37 +222,6 @@ function searchOffice() ...@@ -239,37 +222,6 @@ function searchOffice()
return ""; return "";
} }
function getUreHome()
{
var tmpure = oo_sdk_home;
var ure = "";
if (aFileSystemObject.FileExists(tmpure + "\\URE\\bin\\uno.exe")) {
ure = tmpure + "\URE";
}
return ure;
/*
var suggestion = WshSysEnv("OO_SDK_URE_HOME");
var choice;
for (;;) {
stdout.Write(
"\n Enter the URE installation directory [" + suggestion + "]:");
choice = stdin.ReadLine();
if (choice == "") {
choice = suggestion;
}
if (aFileSystemObject.FileExists(choice + "\\bin\\uno.exe")) {
break;
}
stdout.WriteLine("\n Error: A valid URE installation is required.");
}
return choice;
*/
}
function getMakeHome() function getMakeHome()
{ {
var sSuggestedHome = WshSysEnv("OO_SDK_MAKE_HOME"); var sSuggestedHome = WshSysEnv("OO_SDK_MAKE_HOME");
......
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