[PATCH] Change in core[libreoffice-4-0]: Fix oo_sdk_ure_home calculation in SDK's cfgWin.js

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/1620

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/20/1620/1

Fix oo_sdk_ure_home calculation in SDK's cfgWin.js

This appears to be broken at least since
bde5b815873450dc9520c4dd300829eb5bd72daa "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
(cherry picked from commit 0c22641b4c44938924187ddfb945f494a183ba47)
---
M odk/cfgWin.js
1 file changed, 1 insertion(+), 49 deletions(-)



diff --git a/odk/cfgWin.js b/odk/cfgWin.js
index b6dd4e7..fa1c081 100644
--- a/odk/cfgWin.js
+++ b/odk/cfgWin.js
@@ -53,7 +53,7 @@
 var oo_user_sdk_env_script=oo_user_sdk_dir + "\\setsdkenv_windows.bat";
 
 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_zip_home=getZipHome();
@@ -140,23 +140,6 @@
     }   
 }
 
-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()
 {
     var sSuggestedHome = WshSysEnv("OFFICE_HOME");
@@ -237,37 +220,6 @@
        }
   
        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()

-- 
To view, visit https://gerrit.libreoffice.org/1620
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6385ca10cdded13e6d1aaf08d353f5029843d38d
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Stephan Bergmann <sbergman@redhat.com>