[Libreoffice-commits] core.git: configure.ac scp2/source ure/source

[Tor Lillqvist]

 configure.ac            |   10 +++++-----
 scp2/source/ooo/ure.scp |    6 ++++++
 ure/source/uno.ini      |    5 ++++-
 3 files changed, 15 insertions(+), 6 deletions(-)

New commits:
commit 88960707cc891a5bfc260ce7568a75c1c8419f73
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Aug 19 00:32:39 2013 +0300

    Use correct paths to URE stuff on Windows
    
    For some historical reason, URE has no "share" subfolder on Windows.
    
    Change-Id: I530e673cc7a5cb5fe5d82a5e952ac50e4c2270b2

diff --git a/configure.ac b/configure.ac
index 0e3892c..f995a98 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2908,11 +2908,11 @@ elif test $_os = WINNT; then
     LIBO_SHARE_PRESETS_FOLDER=presets
     LIBO_SHARE_RESOURCE_FOLDER=program/resource
     LIBO_SHARE_SHELL_FOLDER=program/shell
-    LIBO_URE_BIN_FOLDER=ure-link/bin
-    LIBO_URE_ETC_FOLDER=ure-link/bin
-    LIBO_URE_LIB_FOLDER=ure-link/bin
-    LIBO_URE_SHARE_FOLDER=ure-link/share
-    LIBO_URE_SHARE_JAVA_FOLDER=ure-link/java
+    LIBO_URE_BIN_FOLDER=URE/bin
+    LIBO_URE_ETC_FOLDER=URE/bin
+    LIBO_URE_LIB_FOLDER=URE/bin
+    LIBO_URE_SHARE_FOLDER=URE
+    LIBO_URE_SHARE_JAVA_FOLDER=URE/java
 else
     LIBO_BIN_FOLDER=program
     LIBO_ETC_FOLDER=program
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 08b60f6..0086d6c 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -220,6 +220,8 @@ ProfileItem gid_Profileitem_Dl_Uno_Ure_Internal_Java_Dir
     Key = "URE_INTERNAL_JAVA_DIR";
 #if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
     Value = "${ORIGIN}/../java";
+#elif defined WNT
+    Value = "${ORIGIN}/../java";
 #else
     Value = "${ORIGIN}/../share/java";
 #endif
@@ -240,6 +242,8 @@ ProfileItem gid_Profileitem_Dl_Uno_Uno_Types
     Key = "UNO_TYPES";
 #if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
     Value = "${ORIGIN}/types.rdb ${URE_MORE_TYPES}";
+#elif defined WNT
+    Value = "${ORIGIN}/../misc/types.rdb ${URE_MORE_TYPES}";
 #else
     Value = "${ORIGIN}/../share/misc/types.rdb ${URE_MORE_TYPES}";
 #endif
@@ -252,6 +256,8 @@ ProfileItem gid_Profileitem_Dl_Uno_Uno_Services
     Key = "UNO_SERVICES";
 #if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
     Value = "${ORIGIN}/services.rdb ${URE_MORE_SERVICES}";
+#elif defined WNT
+    Value = "${ORIGIN}/../misc/services.rdb ${URE_MORE_SERVICES}";
 #else
     Value = "${ORIGIN}/../share/misc/services.rdb ${URE_MORE_SERVICES}";
 #endif
diff --git a/ure/source/uno.ini b/ure/source/uno.ini
index 33138e4..913a80c 100644
--- a/ure/source/uno.ini
+++ b/ure/source/uno.ini
@@ -15,7 +15,10 @@
 #   except in compliance with the License. You may obtain a copy of
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
-# This is the uno.ini file from ure/source
+# This is the uno.ini file from ure/source. Note that this file is
+# copied into solver, but no longer copied into the installset, but
+# used in solver only during build. The URE uno.ini in the installset is
+# constructed from scp stanzas in scp2/source/ooo/ure.scp.
 #
 [Bootstrap]
 URE_INTERNAL_LIB_DIR=${ORIGIN}