From 827430c8c0417396b3c1d2a049ccddb818c89646 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Tue, 2 Dec 2014 18:12:54 +0100
Subject: Fold URE: Windows

...assuming the delayLoadHook in cli_ure/source/native/native_bootstrap.cxx is
no longer necessary and loading of cppuhelper from the program dir cannot fail
regardless in whatever scenario the cli_cppuhelper library itself is loaded.

Change-Id: I13f32b327bca4cce9780864f5e57cdad3860afe5
---
 scp2/inc/macros.inc              | 17 +++------------
 scp2/source/ooo/common_brand.scp |  4 ----
 scp2/source/ooo/ure.scp          | 46 +++-------------------------------------
 3 files changed, 6 insertions(+), 61 deletions(-)

(limited to 'scp2')

diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index cccf0d495be5..6f8e6ab086de 100644
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -65,19 +65,10 @@
 #ifdef MACOSX
     #define GID_BRAND_DIR_ETC gid_Brand_Dir_Share
     #define GID_DIR_PY gid_Brand_Dir_Share
-    #define GID_DIR_URE_BIN gid_Brand_Dir_Program
-    #define GID_DIR_URE_JAVA gid_Dir_Classes
     #define GID_DIR_URE_LIB gid_Dir_Frameworks
 #else
     #define GID_BRAND_DIR_ETC gid_Brand_Dir_Program
     #define GID_DIR_PY gid_Brand_Dir_Program
-#if defined UNX
-    #define GID_DIR_URE_BIN gid_Brand_Dir_Program
-    #define GID_DIR_URE_JAVA gid_Dir_Classes
-#else
-    #define GID_DIR_URE_BIN gid_Dir_Ure_Bin
-    #define GID_DIR_URE_JAVA gid_Dir_Ure_Java
-#endif
     #define GID_DIR_URE_LIB gid_Brand_Dir_Program
 #endif
 
@@ -246,7 +237,7 @@ End
     File id \
         TXT_FILE_BODY; \
         Name = name; \
-        Dir = GID_DIR_URE_JAVA; \
+        Dir = gid_Dir_Classes; \
         Styles = (PACKED); \
     End
 
@@ -463,9 +454,8 @@ End
 #endif
 
 
-
+#define SCP2_URE_DL_DIR GID_DIR_URE_LIB
 #if defined WNT
-#define SCP2_URE_DL_DIR gid_Dir_Ure_Bin
 #define SCP2_URE_DL_NORMAL(n) n ".dll"
 #define SCP2_URE_DL_BARE(n) n ".dll"
 #define SCP2_URE_DL_VER(n, v) n v ".dll"
@@ -474,7 +464,6 @@ End
 #define SCP2_URE_DL_UNO_VER(n, v) n v ".dll"
 #define SCP2_URE_DL_UNO_COMID_VER(n, v) n v STRING(COMID) ".dll"
 #else
-#define SCP2_URE_DL_DIR GID_DIR_URE_LIB
 #define SCP2_URE_DL_NORMAL(n) "lib" n STRING(UNXSUFFIX)
 #define SCP2_URE_DL_BARE(n) n STRING(UNXSUFFIX)
 #define SCP2_URE_DL_VER(n, v) "lib" n STRING(UNXSUFFIX) "." v
@@ -536,7 +525,7 @@ End
 #define URE_EXECUTABLE(id,name) \
     File id \
         BIN_FILE_BODY; \
-        Dir = GID_DIR_URE_BIN; \
+        Dir = gid_Brand_Dir_Program; \
         Name = name; \
         Styles = (PACKED); \
     End
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index a6075e739082..88d8166ba889 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -1126,11 +1126,7 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Ure_Bin_Dir
     ProfileID = gid_Brand_Profile_Fundamental_Ini;
     Section = "Bootstrap";
     Key = "URE_BIN_DIR";
-#if defined WNT
-    Value = "${.link:${BRAND_BASE_DIR}/ure-link}/bin";
-#else
     Value = "${BRAND_BASE_DIR}/" LIBO_URE_BIN_FOLDER;
-#endif
 End
 
 ProfileItem gid_Brand_Profileitem_Fundamental_Configuration_Layers
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 9bb8ebea2b2c..61af96a79ead 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -20,32 +20,6 @@
 
 #include "AutoInstall/ure"
 
-#if !defined MACOSX
-
-#if defined WNT
-Directory gid_Dir_Common_Ure
-    ParentID = gid_Dir_Brand_Root;
-    HostName = "URE";
-    Styles = (UREDIRECTORY);
-End
-#endif
-
-#if defined WNT
-Directory gid_Dir_Ure_Bin
-    ParentID = gid_Dir_Common_Ure;
-    DosName = "bin";
-End
-#endif
-
-#if defined WNT && defined ENABLE_JAVA
-Directory gid_Dir_Ure_Java
-    ParentID = gid_Dir_Common_Ure;
-    DosName = "java";
-End
-#endif
-
-#endif // !MACOSX
-
 #if defined MACOSX
 Directory gid_Dir_Ure_Share_Misc
     ParentID = gid_Brand_Dir_Share_Ure_Share;
@@ -53,13 +27,6 @@ Directory gid_Dir_Ure_Share_Misc
 End
 #endif
 
-#ifdef WNT
-Directory gid_Dir_Ure_Misc
-    ParentID = gid_Dir_Common_Ure;
-    DosName = "misc";
-End
-#endif
-
 // Public Dynamic Libraries:
 
 #ifdef AIX
@@ -293,9 +260,7 @@ End
 
 File gid_File_Misc_TypesRdb
     TXT_FILE_BODY;
-#ifdef WNT
-    Dir = gid_Dir_Ure_Misc;
-#elif defined MACOSX
+#if defined MACOSX
     Dir = gid_Dir_Ure_Share_Misc;
 #else
     Dir = gid_Brand_Dir_Program;
@@ -306,9 +271,7 @@ End
 
 File gid_File_Misc_ServicesRdb
     TXT_FILE_BODY;
-#ifdef WNT
-    Dir = gid_Dir_Ure_Misc;
-#elif defined MACOSX
+#if defined MACOSX
     Dir = gid_Dir_Ure_Share_Misc;
 #else
     Dir = gid_Brand_Dir_Program;
@@ -328,10 +291,7 @@ Module gid_Module_Root_Ure_Hidden
 	Sortkey = "2200";
 	Default = YES;
 	Styles = (HIDDEN_ROOT);
-    Dirs = (gid_Dir_Ure_Bin,
-            gid_Dir_Ure_Misc,
-            gid_Dir_Ure_Java,
-            gid_Dir_Ure_Share_Misc);
+    Dirs = (gid_Dir_Ure_Share_Misc);
     Files = (auto_ure_ALL,
             gid_File_ThirdpartylicensereadmeHtml_Ure,
             gid_File_Readme_Ure,
-- 
cgit