summaryrefslogtreecommitdiff
path: root/scp2
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2023-01-23 11:28:21 +0100
committerStephan Bergmann <sbergman@redhat.com>2023-01-27 07:28:16 +0000
commit70bcf9e8bea1fee9cca44437730324ba7805b633 (patch)
treed8d97927d773fd753ab569d1f0ace95917d14849 /scp2
parent12a5e9bd92c0969051e035a4f2b7c18f0e3e79b5 (diff)
Remove support for AIX
As discussed in the mailing list thread starting at <https://lists.freedesktop.org/archives/libreoffice/2023-January/089808.html> "Plan to remove dead C++ UNO bridge implementations (bridges/source/cpp_uno/*)", the bridge implementation at bridges/source/cpp_uno/gcc3_aix_powerpc is apparently dead and should thus be removed. However, that was the only bridge implementation for AIX, which implies that support for the AIX platform as a whole is dead and should thus be removed. Change-Id: I96de3f7f97d4fd770ff78256f0ea435383688be9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146057 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'scp2')
-rw-r--r--scp2/source/ooo/module_hidden_ooo.scp53
-rw-r--r--scp2/source/ooo/module_ooo.scp12
-rw-r--r--scp2/source/ooo/ure.scp73
-rw-r--r--scp2/source/python/file_python_librelogo.scp2
-rw-r--r--scp2/source/python/module_python_librelogo.scp2
5 files changed, 0 insertions, 142 deletions
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 904cea2420bd..cb8093987a17 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -22,59 +22,6 @@
#include "AutoInstall/ooo_images"
#include "AutoInstall/ooobinarytable"
-#ifdef AIX
-#ifndef SYSTEM_CURL
-Unixlink gid_Unixlink_File_Lib_Curl
- BIN_FILE_BODY;
- Dir = SCP2_OOO_BIN_DIR;
- Name = STRING(CONCAT2(libcurl,UNXSUFFIX));
- Styles = (PACKED);
- Target = STRING(CONCAT3(libcurl,UNXSUFFIX,.3));
-End
-#endif
-#ifndef SYSTEM_REDLAND
-Unixlink gid_Unixlink_File_Lib_Raptor
- BIN_FILE_BODY;
- Dir = SCP2_OOO_BIN_DIR;
- Name = STRING(CONCAT2(libraptor,UNXSUFFIX));
- Styles = (PACKED);
- Target = STRING(CONCAT3(libraptor,UNXSUFFIX,.1));
-End
-
-Unixlink gid_Unixlink_File_Lib_Rasqal
- BIN_FILE_BODY;
- Dir = SCP2_OOO_BIN_DIR;
- Name = STRING(CONCAT2(librasqal,UNXSUFFIX));
- Styles = (PACKED);
- Target = STRING(CONCAT3(librasqal,UNXSUFFIX,.1));
-End
-
-Unixlink gid_Unixlink_File_Lib_Rdf
- BIN_FILE_BODY;
- Dir = SCP2_OOO_BIN_DIR;
- Name = STRING(CONCAT2(librdf,UNXSUFFIX));
- Styles = (PACKED);
- Target = STRING(CONCAT3(librdf,UNXSUFFIX,.0));
-End
-#endif
-#ifndef SYSTEM_LIBXSLT
-Unixlink gid_Unixlink_File_Lib_Xslt
- BIN_FILE_BODY;
- Dir = SCP2_OOO_BIN_DIR;
- Name = STRING(CONCAT2(libxslt,UNXSUFFIX));
- Styles = (PACKED);
- Target = STRING(CONCAT3(libxslt,UNXSUFFIX,.1));
-End
-Unixlink gid_Unixlink_File_Lib_eXslt
- BIN_FILE_BODY;
- Dir = SCP2_OOO_BIN_DIR;
- Name = STRING(CONCAT2(libexslt,UNXSUFFIX));
- Styles = (PACKED);
- Target = STRING(CONCAT3(libexslt,UNXSUFFIX,.0));
-End
-#endif
-#endif
-
Module gid_Module_Root_Files_Images
PackageInfo = "packinfo_office.txt";
ParentID = gid_Module_Root;
diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp
index 582c5e1e1dae..a9540d9f6b47 100644
--- a/scp2/source/ooo/module_ooo.scp
+++ b/scp2/source/ooo/module_ooo.scp
@@ -32,12 +32,6 @@ Module gid_Module_Root
gid_Starregistry_Services_Rdb,
auto_ooo_ALL,
auto_ooobinarytable_ALL,
- gid_Unixlink_File_Lib_Curl,
- gid_Unixlink_File_Lib_Raptor,
- gid_Unixlink_File_Lib_Rasqal,
- gid_Unixlink_File_Lib_Rdf,
- gid_Unixlink_File_Lib_Xslt,
- gid_Unixlink_File_Lib_eXslt,
GID_FILE_LIB_WPD,
gid_File_Lib_Cli_Oootypes_Assembly,
gid_File_Lib_Policy_Cli_Oootypes_Assembly,
@@ -98,12 +92,6 @@ Module gid_Module_Root
gid_File_Share_Registry_Forcedefault_Xcd,
gid_File_Extra_Fontunxpsprint,
gid_File_Extra_Fontunxafm);
- Unixlinks = (gid_Unixlink_File_Lib_Curl,
- gid_Unixlink_File_Lib_Raptor,
- gid_Unixlink_File_Lib_Rasqal,
- gid_Unixlink_File_Lib_Rdf,
- gid_Unixlink_File_Lib_Xslt,
- gid_Unixlink_File_Lib_eXslt);
End
Module gid_Module_Prg
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 30e06e4942f9..e36fb7215d2e 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -27,58 +27,6 @@ Directory gid_Dir_Ure_Share_Misc
End
#endif
-// Public Dynamic Libraries:
-
-#ifdef AIX
-Unixlink gid_Unixlink_File_Dl_Cppu
- BIN_FILE_BODY;
- Dir = SCP2_URE_DL_DIR;
- Name = SCP2_URE_DL_UNO_NORMAL("cppu");
- Styles = (PACKED);
- Target = SCP2_URE_DL_UNO_VER("cppu", "3");
-End
-#endif
-
-#ifdef AIX
-Unixlink gid_Unixlink_File_Dl_Cppuhelper
- BIN_FILE_BODY;
- Dir = SCP2_URE_DL_DIR;
- Name = SCP2_URE_DL_UNO_COMID_NORMAL("cppuhelper");
- Styles = (PACKED);
- Target = SCP2_URE_DL_UNO_COMID_VER("cppuhelper", "3");
-End
-#endif
-
-#ifdef AIX
-Unixlink gid_Unixlink_File_Dl_PurpEnvHelper
- BIN_FILE_BODY;
- Dir = SCP2_URE_DL_DIR;
- Name = SCP2_URE_DL_UNO_COMID_NORMAL("purpenvhelper");
- Styles = (PACKED);
- Target = SCP2_URE_DL_UNO_COMID_VER("purpenvhelper", "3");
-End
-#endif
-
-#ifdef AIX
-Unixlink gid_Unixlink_File_Dl_Sal
- BIN_FILE_BODY;
- Dir = SCP2_URE_DL_DIR;
- Name = SCP2_URE_DL_UNO_NORMAL("sal");
- Styles = (PACKED);
- Target = SCP2_URE_DL_UNO_VER("sal", "3");
-End
-#endif
-
-#ifdef AIX
-Unixlink gid_Unixlink_File_Dl_Salhelper
- BIN_FILE_BODY;
- Dir = SCP2_URE_DL_DIR;
- Name = SCP2_URE_DL_UNO_COMID_NORMAL("salhelper");
- Styles = (PACKED);
- Target = SCP2_URE_DL_UNO_COMID_VER("salhelper", "3");
-End
-#endif
-
// Private Dynamic Libraries:
#if defined _MSC_VER && ! defined _ARM64_
@@ -220,16 +168,6 @@ End
#endif
-#ifdef AIX
-Unixlink gid_Unixlink_File_Dl_Libxml2
- BIN_FILE_BODY;
- Dir = SCP2_URE_DL_DIR;
- Name = SCP2_URE_DL_NORMAL("xml2");
- Styles = (PACKED);
- Target = SCP2_URE_DL_VER("xml2", "2");
-End
-#endif
-
// Public Miscellaneous Files:
File gid_File_Misc_TypesRdb
@@ -282,19 +220,8 @@ Module gid_Module_Root_Ure_Hidden
gid_File_Lib_Cli_Cppuhelper_Assembly,
gid_File_Lib_Policy_Cli_Cppuhelper_Assembly,
gid_File_Lib_Policy_Cli_Cppuhelper_Config,
- gid_Unixlink_File_Dl_Cppu,
- gid_Unixlink_File_Dl_Cppuhelper,
- gid_Unixlink_File_Dl_PurpEnvHelper,
- gid_Unixlink_File_Dl_Sal,
- gid_Unixlink_File_Dl_Salhelper,
gid_File_Misc_TypesRdb,
gid_File_Misc_ServicesRdb);
- Unixlinks = (gid_Unixlink_File_Dl_Sal,
- gid_Unixlink_File_Dl_Salhelper,
- gid_Unixlink_File_Dl_Cppu,
- gid_Unixlink_File_Dl_Cppuhelper,
- gid_Unixlink_File_Dl_PurpEnvHelper,
- gid_Unixlink_File_Dl_Libxml2);
End
// Windows Registry:
diff --git a/scp2/source/python/file_python_librelogo.scp b/scp2/source/python/file_python_librelogo.scp
index 67f789f80045..8c0f0defc6c3 100644
--- a/scp2/source/python/file_python_librelogo.scp
+++ b/scp2/source/python/file_python_librelogo.scp
@@ -8,7 +8,6 @@
#include "macros.inc"
-#ifndef AIX
#ifndef DISABLE_PYUNO
File gid_File_Share_Registry_LibreLogo_Xcd
TXT_FILE_BODY;
@@ -17,4 +16,3 @@ File gid_File_Share_Registry_LibreLogo_Xcd
Name = "librelogo.xcd";
End
#endif
-#endif
diff --git a/scp2/source/python/module_python_librelogo.scp b/scp2/source/python/module_python_librelogo.scp
index 1102b8750252..a056d49acc3e 100644
--- a/scp2/source/python/module_python_librelogo.scp
+++ b/scp2/source/python/module_python_librelogo.scp
@@ -10,7 +10,6 @@
#include "AutoInstall/python_librelogo"
-#ifndef AIX
#ifndef DISABLE_PYUNO
Module gid_Module_Optional_Pyuno_LibreLogo
PackageInfo = "packinfo_office.txt";
@@ -23,4 +22,3 @@ Module gid_Module_Optional_Pyuno_LibreLogo
Styles = ( );
End
#endif
-#endif