diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2017-02-10 14:05:21 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2017-02-10 18:01:27 +0000 |
commit | 8646ab97dc37c0606b19057686bf3d610f9c15ee (patch) | |
tree | 17b3df6f5cf55cb1091c4aa70930dd415d9ea0e3 /scp2/source | |
parent | 09e9274fc080b471393b806617eb03124db67590 (diff) |
Remove MinGW support
In OOo times, there'd originally been efforts to allow building on Windows with
MinGW. Later, in LO times, this has been shifted to an attempt of cross-
compiling for Windows on Linux. That attempt can be considered abandoned, and
the relevant code rotting.
Due to this heritage, there are now three kinds of MinGW-specific code in LO:
* Code from the original OOo native Windows effort that is no longer relevant
for the LO cross-compilation effort, but has never been removed properly.
* Code from the original OOo native Windows effort that is re-purposed for the
LO cross-compilation effort.
* Code that has been added specifially for the LO cross-compilation effort.
All three kinds of code are removed.
(An unrelated, remaining use of MinGW is for --enable-build-unowinreg, utilizing
--with-mingw-cross-compiler, MINGWCXX, and MINGWSTRIP.)
Change-Id: I49daad8669b4cbe49fa923050c4a4a6ff7dda568
Reviewed-on: https://gerrit.libreoffice.org/34127
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'scp2/source')
-rw-r--r-- | scp2/source/ooo/mingw_dlls.scp | 43 | ||||
-rw-r--r-- | scp2/source/ooo/scpaction_ooo.scp | 15 | ||||
-rw-r--r-- | scp2/source/ooo/ure.scp | 28 | ||||
-rw-r--r-- | scp2/source/python/file_python.scp | 42 | ||||
-rw-r--r-- | scp2/source/python/module_python.scp | 3 |
5 files changed, 0 insertions, 131 deletions
diff --git a/scp2/source/ooo/mingw_dlls.scp b/scp2/source/ooo/mingw_dlls.scp deleted file mode 100644 index 0e5491df19de..000000000000 --- a/scp2/source/ooo/mingw_dlls.scp +++ /dev/null @@ -1,43 +0,0 @@ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -#include "macros.inc" - -#if defined(WNT) && defined( _gcc3 ) - -File gid_Brand_File_Lib_Mingw_Dlls - TXT_FILE_BODY; - Dir = FILELIST_DIR; - Name = "mingw_dlls.filelist"; - Styles = (FILELIST, PACKED); -End - -#if defined(MINGW_GCCDLL) - -File gid_Brand_File_Lib_Mingw_GccS - TXT_FILE_BODY; - Dir = gid_Brand_Dir_Program; - Name = MINGW_GCCDLL; - Styles = (PACKED); -End - -#endif - -#if defined(MINGW_GXXDLL) - -File gid_Brand_File_Lib_Mingw_Stdcpp - TXT_FILE_BODY; - Dir = gid_Brand_Dir_Program; - Name = MINGW_GXXDLL; - Styles = (PACKED); -End - -#endif - -#endif - diff --git a/scp2/source/ooo/scpaction_ooo.scp b/scp2/source/ooo/scpaction_ooo.scp index c84f4a994857..ad15dfb8aaab 100644 --- a/scp2/source/ooo/scpaction_ooo.scp +++ b/scp2/source/ooo/scpaction_ooo.scp @@ -52,21 +52,6 @@ ScpAction scp_Copy_Install End #endif -#if defined(WNT) && defined(_gcc3) -#if defined(MINGW_GCCDLL) -ScpAction SCP_COPY_MINGW_GCCS - Copy = MINGW_GCCDLL; - Name = MINGW_GCCDLL; -End -#endif -#if defined(MINGW_GXXDLL) -ScpAction SCP_COPY_MINGW_STDCPP - Copy = MINGW_GXXDLL; - Name = MINGW_GXXDLL; -End -#endif -#endif - #ifdef MACOSX ScpAction scp_Copy_Dmg_Background_Image Copy = "osxdndinstall.png"; diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp index ec1cafef03e6..a75aeb4dbb8f 100644 --- a/scp2/source/ooo/ure.scp +++ b/scp2/source/ooo/ure.scp @@ -230,32 +230,6 @@ Unixlink gid_Unixlink_File_Dl_Libxml2 End #endif -#if defined(WNT) && defined( _gcc3 ) - -#if defined(MINGW_GCCDLL) - -File gid_File_Lib_Mingw_GccS_Ure - LIB_FILE_BODY; - Dir = SCP2_URE_DL_DIR; - Name = MINGW_GCCDLL; - Styles = (PACKED); -End - -#endif - -#if defined(MINGW_GXXDLL) - -File gid_File_Lib_Mingw_Stdcpp_Ure - LIB_FILE_BODY; - Dir = SCP2_URE_DL_DIR; - Name = MINGW_GXXDLL; - Styles = (PACKED); -End - -#endif - -#endif - // Public Miscellaneous Files: File gid_File_Misc_TypesRdb @@ -313,8 +287,6 @@ Module gid_Module_Root_Ure_Hidden gid_Unixlink_File_Dl_PurpEnvHelper, gid_Unixlink_File_Dl_Sal, gid_Unixlink_File_Dl_Salhelper, - gid_File_Lib_Mingw_GccS_Ure, - gid_File_Lib_Mingw_Stdcpp_Ure, gid_File_Misc_TypesRdb, gid_File_Misc_ServicesRdb); Unixlinks = (gid_Unixlink_File_Dl_Sal, diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp index 0f2c994a4f9b..fd008624fd66 100644 --- a/scp2/source/python/file_python.scp +++ b/scp2/source/python/file_python.scp @@ -59,47 +59,5 @@ File gid_File_Share_Registry_Pyuno_Xcd Name = "pyuno.xcd"; End -#ifdef MINGW_SYSTEM_PYTHON - -// python_wrapper.exe -File gid_File_Py_Bin_Python - BIN_FILE_BODY; - Name = "python.exe"; - Dir = gid_Brand_Dir_Program; - Styles = (PACKED); -End - -Directory gid_Dir_Py_PythonCore - ParentID = gid_Brand_Dir_Program; - HostName = STRING(CONCAT2(python-core-,PYVERSION)); -End - -Directory gid_Dir_Py_PythonCore_Lib - ParentID = gid_Dir_Py_PythonCore; - HostName = "lib"; -End - -File gid_File_Py_Python_Core - TXT_FILE_BODY; - Dir = FILELIST_DIR; - Name = "python-core.filelist"; - Styles = (FILELIST); -End - -Directory gid_Dir_Py_PythonCore_Bin - ParentID = gid_Dir_Py_PythonCore; - HostName = "bin"; -End - -File gid_File_Py_Python_Bin - BIN_FILE_BODY; - Dir = gid_Dir_Py_PythonCore_Bin; - Name = "python.exe"; - Styles = (PACKED); -End - - -#endif //MINGW_SYSTEM_PYTHON - // DISABLE_PYUNO #endif diff --git a/scp2/source/python/module_python.scp b/scp2/source/python/module_python.scp index 358923448994..1424409c1f9c 100644 --- a/scp2/source/python/module_python.scp +++ b/scp2/source/python/module_python.scp @@ -41,9 +41,6 @@ Module gid_Module_Pyuno gid_Dir_Py_PythonCore_Lib); Files = (auto_python_ALL, gid_File_Pyuno_Rdb, - gid_File_Py_Bin_Python, - gid_File_Py_Python_Core, - gid_File_Py_Python_Bin, gid_File_Lib_Python_So, gid_File_Lib_Python3_So, gid_File_Share_Registry_Pyuno_Xcd); |