Undo basis/brand split: Move SDK and ure-link, remove OOO_BASE_DIR and BaseInstallation.

4 files changed, 30 insertions, 107 deletions

diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index a55af98b371e..01d0cecc5c77 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -49,8 +49,7 @@ Module gid_Module_Root_Brand
             gid_Brand_Dir_Share_Uno_Packages_Cache,
             gid_Brand_Dir_Share_Registry,
             gid_Brand_Dir_Share_Xdg);
-    Files = (gid_Brand_File_BasisLink,
-             gid_Brand_File_Bin_Crashreport,
+    Files = (gid_Brand_File_Bin_Crashreport,
              gid_Brand_File_Bin_Crashreport_Script,
              gid_Brand_File_Bin_Crashreport_Com,
              gid_Brand_File_Bin_Python,
@@ -103,8 +102,7 @@ Module gid_Module_Root_Brand
 	     gid_License_Txt,
 	     git_License_Odt,
 	     gid_Credits_Odt);
-    Unixlinks = (gid_Brand_Unixlink_BasisLink,
-                 gid_Brand_Unixlink_Program,
+    Unixlinks = (gid_Brand_Unixlink_Program,
                  gid_Brand_Unixlink_Unopkg,
                  gid_Brand_Unixlink_Urelibs);
 End
@@ -152,7 +150,7 @@ End
 
 Directory gid_Brand_Dir_Readme
 #if defined MACOSX
-    ParentID = gid_Brand_Dir_BasisLink;
+    ParentID = gid_Dir_Bundle_Contents;
 #else
     ParentID = gid_Dir_Brand_Root;
 #endif
@@ -428,38 +426,13 @@ Directory gid_Brand_Dir_Share_Xdg
 End
 #endif
 
-// Link to basis
-
-#if defined WNT
-File gid_Brand_File_BasisLink
-   TXT_FILE_BODY;
-   Dir = gid_Dir_Brand_Root;
-   Name = "basis-link";
-   Styles = (PACKED);
-End
-#elif defined MACOSX
-Directory gid_Brand_Dir_BasisLink
-    ParentID = gid_Dir_Bundle_Contents;
-    DosName = "basis-link";
-End
-#else
-Unixlink gid_Brand_Unixlink_BasisLink
-    BIN_FILE_BODY;
-    Styles = ();
-    // Styles = (LAYERLINK);
-    Name = "basis-link";
-    Dir = gid_Dir_Brand_Root;
-    Target = "basis${OOOBASEVERSION}";
-End
-#endif
-
 // UnixLinks
 
 #if defined MACOSX
 Unixlink gid_Brand_Unixlink_Urelibs
     Dir = gid_Brand_Dir_Program;
     Name = "urelibs";
-    Target = "../basis-link/ure-link/lib";
+    Target = "../ure-link/lib";
 End
 #endif
 
@@ -478,7 +451,7 @@ End
 File gid_Brand_File_Html_Thirdpartylicensereadme
     Name = "THIRDPARTYLICENSEREADME.html";
 #ifdef MACOSX
-    Dir = gid_Brand_Dir_BasisLink;
+    Dir = gid_Dir_Bundle_Contents;
 #else
     Dir = gid_Dir_Brand_Root;
 #endif
@@ -827,15 +800,6 @@ End
 
 // ProfileItems
 
-ProfileItem gid_Brand_Profileitem_Bootstrap_Baseinstall
-    ProfileID = gid_Brand_Profile_Bootstrap_Ini;
-    ModuleID = gid_Module_Root_Brand;
-    Section = "Bootstrap";
-    Order = 2;
-    Key = "BaseInstallation";
-    Value = "${OOO_BASE_DIR}";
-End
-
 ProfileItem gid_Brand_Profileitem_Bootstrap_Productkey
     ProfileID = gid_Brand_Profile_Bootstrap_Ini;
     ModuleID = gid_Module_Root_Brand;
@@ -1143,18 +1107,6 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Brand_Base_Dir
     Value = "${ORIGIN}/..";
 End
 
-ProfileItem gid_Brand_Profileitem_Fundamental_Ooo_Base_Dir
-    ModuleID = gid_Module_Root_Brand;
-    ProfileID = gid_Brand_Profile_Fundamental_Ini;
-    Section = "Bootstrap";
-    Key = "OOO_BASE_DIR";
-#if defined WNT
-    Value = "${.link:${BRAND_BASE_DIR}/basis-link}";
-#else
-    Value = "${BRAND_BASE_DIR}/basis-link";
-#endif
-End
-
 ProfileItem gid_Brand_Profileitem_Fundamental_Uno_Bundled_Extensions
     ModuleID = gid_Module_Root_Brand;
     ProfileID = gid_Brand_Profile_Fundamental_Ini;
@@ -1274,9 +1226,9 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Ure_Bin_Dir
     Section = "Bootstrap";
     Key = "URE_BIN_DIR";
 #if defined WNT
-    Value = "${.link:${OOO_BASE_DIR}/ure-link}/bin";
+    Value = "${.link:${BRAND_BASE_DIR}/ure-link}/bin";
 #else
-    Value = "${OOO_BASE_DIR}/ure-link/bin";
+    Value = "${BRAND_BASE_DIR}/ure-link/bin";
 #endif
 End
 
@@ -1286,9 +1238,9 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Ure_Lib_Dir
     Section = "Bootstrap";
     Key = "URE_LIB_DIR";
 #if defined WNT
-    Value = "${.link:${OOO_BASE_DIR}/ure-link}/bin";
+    Value = "${.link:${BRAND_BASE_DIR}/ure-link}/bin";
 #else
-    Value = "${OOO_BASE_DIR}/ure-link/lib";
+    Value = "${BRAND_BASE_DIR}/ure-link/lib";
 #endif
 End
 
@@ -1439,7 +1391,7 @@ End
 File gid_License_Txt
   TXT_FILE_BODY;
 #if defined MACOSX
-    Dir = gid_Brand_Dir_BasisLink;
+    Dir = gid_Dir_Bundle_Contents;
 #else
     Dir = gid_Dir_Brand_Root;
 #endif
@@ -1455,7 +1407,7 @@ End
 File gid_License_Odt
     BIN_FILE_BODY;
 #if defined MACOSX
-    Dir = gid_Brand_Dir_BasisLink;
+    Dir = gid_Dir_Bundle_Contents;
 #else
     Dir = gid_Dir_Brand_Root;
 #endif
@@ -1466,7 +1418,7 @@ End
 File gid_Credits_Odt
     BIN_FILE_BODY;
 #if defined MACOSX
-    Dir = gid_Brand_Dir_BasisLink;
+    Dir = gid_Dir_Bundle_Contents;
 #else
     Dir = gid_Dir_Brand_Root;
 #endif
diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp
index 5739b2adb428..9ee91e989f20 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -1153,15 +1153,6 @@ Directory gid_Dir_Share_Fingerprint
     DosName = "fingerprint";
 End
 
-Directory gid_Dir_Basis_Sdk
-#if defined MACOSX
-    ParentID = gid_Brand_Dir_BasisLink;
-#else
-    ParentID = gid_Dir_Ooo_Basis;
-#endif
-    DosName = "sdk";
-End
-
 Directory gid_Dir_Help
 #if defined MACOSX
     ParentID = gid_Dir_Bundle_Contents;
diff --git a/scp2/source/ooo/ure_into_ooo.scp b/scp2/source/ooo/ure_into_ooo.scp
index 397d8fd8f2da..a67a50807001 100644
--- a/scp2/source/ooo/ure_into_ooo.scp
+++ b/scp2/source/ooo/ure_into_ooo.scp
@@ -46,13 +46,13 @@ End
 #if defined WNT
 File gid_File_UreLink
     TXT_FILE_BODY;
-    Dir = gid_Dir_Ooo_Basis;
+    Dir = gid_Dir_Brand_Root;
     Name = "ure-link";
     Styles = (PACKED);
 End
 #elif defined MACOSX
 Directory gid_Dir_UreLink
-    ParentID = gid_Brand_Dir_BasisLink;
+    ParentID = gid_Dir_Bundle_Contents;
     DosName = "ure-link";
 End
 #else
@@ -61,7 +61,7 @@ Unixlink gid_Unixlink_UreLink
     Styles = ();
     // Styles = (LAYERLINK);
     Name = "ure-link";
-    Dir = gid_Dir_Ooo_Basis;
-    Target = "../ure";
+    Dir = gid_Dir_Brand_Root;
+    Target = "ure";
 End
 #endif
diff --git a/scp2/source/sdkoo/sdkoo.scp b/scp2/source/sdkoo/sdkoo.scp
index a15e4c399811..4b1f56999eb2 100644
--- a/scp2/source/sdkoo/sdkoo.scp
+++ b/scp2/source/sdkoo/sdkoo.scp
@@ -39,55 +39,35 @@ Installation gid_Installation_Sdk
 #endif
 End
 
-#ifndef MACOSX
+#if defined MACOSX
 
-#ifdef WNT
-Directory gid_Dir_Sdkoo_Root
+Directory gid_Dir_Basis_Sdk
     ParentID = PREDEFINED_PROGDIR;
-    HostName = "${PRODUCTNAME}_${PRODUCTVERSION}_${POSTVERSIONEXTENSION}";
-    Styles = (OFFICEDIRECTORY, ISINSTALLLOCATION);
+    DosName = "LibreOffice${OOOBASEVERSION}_SDK";
 End
-#endif
 
-#ifndef WNT
-Directory gid_Dir_Ooo_Openofficeorg_Sdk
+#elif defined WNT
+
+Directory gid_Dir_Sdkoo_Root
     ParentID = PREDEFINED_PROGDIR;
-  #ifdef WNT
-    HostName = "${BASISROOTNAME}";
-  #else
-    HostName = ".";
-  #endif
+    HostName = "${PRODUCTNAME}_${PRODUCTVERSION}_${POSTVERSIONEXTENSION}";
+    Styles = (OFFICEDIRECTORY, ISINSTALLLOCATION);
 End
-#endif
 
-#ifndef WNT
-Directory gid_Dir_Ooo_Basis_Sdk
-    ParentID = gid_Dir_Ooo_Openofficeorg_Sdk;
-  #ifdef WNT
-    HostName = "Basis ${OOOBASEVERSION}";
-  #else
-    HostName = "basis${OOOBASEVERSION}";
-  #endif
-    Styles = (BASISDIRECTORY);
+Directory gid_Dir_Basis_Sdk
+    ParentID = gid_Dir_Sdkoo_Root;
+    DosName = "sdk";
 End
-#endif
 
-#endif
+#else
 
 Directory gid_Dir_Basis_Sdk
-#if defined MACOSX
     ParentID = PREDEFINED_PROGDIR;
-    DosName = "LibreOffice${OOOBASEVERSION}_SDK";
-#else
-  #if defined WNT
-    ParentID = gid_Dir_Sdkoo_Root;
-  #else
-    ParentID = gid_Dir_Ooo_Basis_Sdk;
-  #endif
     DosName = "sdk";
-#endif
 End
 
+#endif
+
 Directory gid_Dir_Share_Sdk
     ParentID = gid_Dir_Basis_Sdk;
     DosName = "share";