[Libreoffice-commits] .: 5 commits - cppuhelper/prj cppuhelper/source cppu/prj cppu/source cppu/util external/gcc3_specific external/mingwm10 external/prj salhelper/prj salhelper/source scp2/inc scp2/source scp2/util solenv/bin solenv/inc
Tor Lillqvist
tml at kemper.freedesktop.org
Tue Aug 30 01:15:31 PDT 2011
cppu/prj/d.lst | 4 +-
cppu/source/helper/purpenv/export.mk | 9 ----
cppu/util/extra.mk | 15 +++++++-
cppu/util/makefile.mk | 8 +++-
cppuhelper/prj/d.lst | 2 -
cppuhelper/source/makefile.mk | 6 +--
external/gcc3_specific/makefile.mk | 26 ++++++++------
external/mingwm10/README_mingwm10.dll | 3 -
external/prj/d.lst | 1
salhelper/prj/d.lst | 3 +
salhelper/source/makefile.mk | 6 +--
scp2/inc/macros.inc | 17 +++++++++
scp2/source/base/registryitem_base.scp | 2 +
scp2/source/calc/registryitem_calc.scp | 9 ++++
scp2/source/draw/registryitem_draw.scp | 8 ++++
scp2/source/impress/registryitem_impress.scp | 8 ++++
scp2/source/javafilter/file_javafilter.scp | 2 -
scp2/source/math/registryitem_math.scp | 4 ++
scp2/source/ooo/file_library_ooo.scp | 21 ++++-------
scp2/source/ooo/makefile.mk | 7 +++
scp2/source/ooo/windowscustomaction_ooo.scp | 8 ++++
scp2/source/winexplorerext/makefile.mk | 3 +
scp2/source/writer/registryitem_writer.scp | 15 +++++++-
scp2/util/makefile.mk | 13 +++++--
solenv/bin/make_installer.pl | 2 -
solenv/inc/_tg_scp.mk | 50 ---------------------------
solenv/inc/tg_scp.mk | 5 --
27 files changed, 145 insertions(+), 112 deletions(-)
New commits:
commit bf3ff35d8c96315c35cf8dc8495be4b488b55cb6
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Tue Aug 30 10:47:54 2011 +0300
Adapt for MinGW cross-builds
Adapt some of the DLL names to match conventions we currently use in a
MinGW build. If those are changed to be exactly like when built with
MSVC (for SDK ABI stability reasons), will have to change here, too.
Bypass stuff that we can't build with MinGW when necessary. Should be
synchronized with the corresponding makefiles, obviously. We can't
currently build the Explorer extension or MSI installer custom actions
with MinGW due to lack of some required headers and/or import
libraries.
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index 5efd896..2c20cb0 100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -489,6 +489,8 @@ End
// ---------------------------------------
+#ifdef _MSC_VER
+
#define REGISTER_PROPERTY_HANDLER_FOR_EXTENSION(extension) \
RegistryItem CONCAT2(gid_Regitem_Software_Microsoft_Windows_CurrentVersion_PropertySystem_PropertyHandlers_,extension) \
ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; \
@@ -500,6 +502,10 @@ End
Val64 = "{AE424E85-F6DF-4910-A6A9-438797986431}"; \
End
+#else
+#define REGISTER_PROPERTY_HANDLER_FOR_EXTENSION(extension) // empty
+#endif
+
// ---------------------------------------
#if defined WNT
diff --git a/scp2/source/base/registryitem_base.scp b/scp2/source/base/registryitem_base.scp
index 833ed39..abd35ee 100644
--- a/scp2/source/base/registryitem_base.scp
+++ b/scp2/source/base/registryitem_base.scp
@@ -94,6 +94,7 @@ RegistryItem gid_Regitem_Openoffice_Databasedocument_1_Defaulticon
Value = "<progpath>\program\soffice.exe,13";
End
+#ifdef _MSC_VER
RegistryItem gid_Regitem_odb_FullDetails
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
@@ -101,6 +102,7 @@ RegistryItem gid_Regitem_odb_FullDetails
Name = "FullDetails";
Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
End
+#endif
RegistryItem gid_Regitem_Openoffice_Databasedocument_1_Shell
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
diff --git a/scp2/source/calc/registryitem_calc.scp b/scp2/source/calc/registryitem_calc.scp
index 8220610..19d4ba1 100644
--- a/scp2/source/calc/registryitem_calc.scp
+++ b/scp2/source/calc/registryitem_calc.scp
@@ -504,6 +504,7 @@ RegistryItem gid_Regitem_Stc_Contenttype
Value = "application/vnd.sun.xml.calc.template";
End
+#ifdef _MSC_VER
RegistryItem gid_Regitem_stc_FullDetails
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
@@ -511,6 +512,7 @@ RegistryItem gid_Regitem_stc_FullDetails
Name = "FullDetails";
Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
End
+#endif
RegistryItem gid_Regitem_Sxc_Contenttype
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
@@ -545,6 +547,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
Styles = ();
End
+#ifdef _MSC_VER
RegistryItem gid_Regitem_sxc_FullDetails
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
@@ -552,7 +555,7 @@ RegistryItem gid_Regitem_sxc_FullDetails
Name = "FullDetails";
Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
End
-
+#endif
// new ods file extension
@@ -665,6 +668,7 @@ RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Defaulticon
Value = "<progpath>\program\soffice.exe,3";
End
+#ifdef _MSC_VER
RegistryItem gid_Regitem_ods_FullDetails
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
@@ -672,6 +676,7 @@ RegistryItem gid_Regitem_ods_FullDetails
Name = "FullDetails";
Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
End
+#endif
RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Insertable
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
@@ -856,6 +861,7 @@ RegistryItem gid_Regitem_Openoffice_Calctemplate_1_Defaulticon
Value = "<progpath>\program\soffice.exe,4";
End
+#ifdef _MSC_VER
RegistryItem gid_Regitem_ots_FullDetails
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
@@ -863,6 +869,7 @@ RegistryItem gid_Regitem_ots_FullDetails
Name = "FullDetails";
Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
End
+#endif
RegistryItem gid_Regitem_Openoffice_Calctemplate_1_Shell
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
diff --git a/scp2/source/draw/registryitem_draw.scp b/scp2/source/draw/registryitem_draw.scp
index d722319..561dbf1 100644
--- a/scp2/source/draw/registryitem_draw.scp
+++ b/scp2/source/draw/registryitem_draw.scp
@@ -476,6 +476,7 @@ RegistryItem gid_Regitem_Std_Contenttype
Value = "application/vnd.sun.xml.draw.template";
End
+#ifdef _MSC_VER
RegistryItem gid_Regitem_std_FullDetails
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
@@ -483,6 +484,7 @@ RegistryItem gid_Regitem_std_FullDetails
Name = "FullDetails";
Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
End
+#endif
RegistryItem gid_Regitem_Sxd_PersistentHandler
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
@@ -544,6 +546,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
Styles = ();
End
+#ifdef _MSC_VER
RegistryItem gid_Regitem_sxd_FullDetails
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
@@ -551,6 +554,7 @@ RegistryItem gid_Regitem_sxd_FullDetails
Name = "FullDetails";
Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
End
+#endif
// new odg file extension
@@ -663,6 +667,7 @@ RegistryItem gid_Regitem_Openoffice_Drawdocument_1_Defaulticon
Value = "<progpath>\program\soffice.exe,5";
End
+#ifdef _MSC_VER
RegistryItem gid_Regitem_odg_FullDetails
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
@@ -670,6 +675,7 @@ RegistryItem gid_Regitem_odg_FullDetails
Name = "FullDetails";
Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
End
+#endif
RegistryItem gid_Regitem_Openoffice_Drawdocument_1_Shell
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
@@ -854,6 +860,7 @@ RegistryItem gid_Regitem_Openoffice_Drawtemplate_1_Defaulticon
Value = "<progpath>\program\soffice.exe,6";
End
+#ifdef _MSC_VER
RegistryItem gid_Regitem_otg_FullDetails
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
@@ -861,6 +868,7 @@ RegistryItem gid_Regitem_otg_FullDetails
Name = "FullDetails";
Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
End
+#endif
RegistryItem gid_Regitem_Openoffice_Drawtemplate_1_Shell
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
diff --git a/scp2/source/impress/registryitem_impress.scp b/scp2/source/impress/registryitem_impress.scp
index ead0603..7b26fc5 100644
--- a/scp2/source/impress/registryitem_impress.scp
+++ b/scp2/source/impress/registryitem_impress.scp
@@ -490,6 +490,7 @@ RegistryItem gid_Regitem_Sti_Contenttype
Value = "application/vnd.sun.xml.impress.template";
End
+#ifdef _MSC_VER
RegistryItem gid_Regitem_sti_FullDetails
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
@@ -497,6 +498,7 @@ RegistryItem gid_Regitem_sti_FullDetails
Name = "FullDetails";
Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
End
+#endif
RegistryItem gid_Regitem_Sxi_PersistentHandler
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
@@ -558,6 +560,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
Styles = ();
End
+#ifdef _MSC_VER
RegistryItem gid_Regitem_sxi_FullDetails
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
@@ -565,6 +568,7 @@ RegistryItem gid_Regitem_sxi_FullDetails
Name = "FullDetails";
Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
End
+#endif
// new odp file extension
@@ -678,6 +682,7 @@ RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Defaulticon
Value = "<progpath>\program\soffice.exe,7";
End
+#ifdef _MSC_VER
RegistryItem gid_Regitem_odp_FullDetails
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
@@ -685,6 +690,7 @@ RegistryItem gid_Regitem_odp_FullDetails
Name = "FullDetails";
Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
End
+#endif
RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Insertable
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
@@ -883,6 +889,7 @@ RegistryItem gid_Regitem_Openoffice_Impresstemplate_1_Defaulticon
Value = "<progpath>\program\soffice.exe,8";
End
+#ifdef _MSC_VER
RegistryItem gid_Regitem_otp_FullDetails
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
@@ -890,6 +897,7 @@ RegistryItem gid_Regitem_otp_FullDetails
Name = "FullDetails";
Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
End
+#endif
RegistryItem gid_Regitem_Openoffice_Impresstemplate_1_Shell
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
diff --git a/scp2/source/javafilter/file_javafilter.scp b/scp2/source/javafilter/file_javafilter.scp
index a6d3f33..e9eb2d1 100644
--- a/scp2/source/javafilter/file_javafilter.scp
+++ b/scp2/source/javafilter/file_javafilter.scp
@@ -38,7 +38,7 @@ End
#endif
-#ifdef WNT
+#if defined(WNT) && defined(HAVE_WINDOWS_SDK)
File gid_File_Lib_Jfregca
TXT_FILE_BODY;
diff --git a/scp2/source/math/registryitem_math.scp b/scp2/source/math/registryitem_math.scp
index b58e15e..449a6c6 100644
--- a/scp2/source/math/registryitem_math.scp
+++ b/scp2/source/math/registryitem_math.scp
@@ -436,6 +436,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
Styles = ();
End
+#ifdef _MSC_VER
RegistryItem gid_Regitem_sxm_FullDetails
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
@@ -443,6 +444,7 @@ RegistryItem gid_Regitem_sxm_FullDetails
Name = "FullDetails";
Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
End
+#endif
// new odf file extension
@@ -547,6 +549,7 @@ RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Defaulticon
Value = "<progpath>\program\soffice.exe,14";
End
+#ifdef _MSC_VER
RegistryItem gid_Regitem_odf_FullDetails
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
@@ -554,6 +557,7 @@ RegistryItem gid_Regitem_odf_FullDetails
Name = "FullDetails";
Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
End
+#endif
RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Insertable
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 3ea5298..04026ae 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -780,7 +780,7 @@ End
#endif
-#ifdef WNT
+#if defined(WNT) && defined(HAVE_WINDOWS_SDK)
File gid_File_Lib_sn_tools
BIN_FILE_BODY;
@@ -802,7 +802,7 @@ End
#endif
-#ifdef WNT
+#if defined(WNT) && defined(HAVE_WINDOWS_SDK)
File gid_File_Lib_Rebasemsi
TXT_FILE_BODY;
@@ -811,7 +811,7 @@ File gid_File_Lib_Rebasemsi
Styles = (PACKED,BINARYTABLE,BINARYTABLE_ONLY,DONTRENAMEINPATCH);
End
-#endif
+#endif /* WNT && HAVE_WINDOWS_SDK */
STD_LIB_FILE( gid_File_Lib_Lng, lng)
@@ -1091,7 +1091,7 @@ End
#endif
-#ifdef WNT
+#if defined(WNT) && defined(HAVE_WINDOWS_SDK)
File gid_File_Lib_Reg4allmsdoc
TXT_FILE_BODY;
@@ -1100,10 +1100,6 @@ File gid_File_Lib_Reg4allmsdoc
Name = "reg4allmsdoc.dll";
End
-#endif
-
-#ifdef WNT
-
File gid_File_Lib_Qslnkmsi
TXT_FILE_BODY;
Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
@@ -1111,9 +1107,6 @@ File gid_File_Lib_Qslnkmsi
Name = "qslnkmsi.dll";
End
-#endif
-
-#ifdef WNT
File gid_File_Lib_Sdqsmsi
TXT_FILE_BODY;
@@ -1122,7 +1115,7 @@ File gid_File_Lib_Sdqsmsi
Name = "sdqsmsi.dll";
End
-#endif
+#endif /* WNT && HAVE_WINDOWS_SDK */
File gid_File_Lib_Res
Name = LIBNAME(res);
@@ -1854,13 +1847,15 @@ End
#endif
-#ifdef WNT
+#if defined(WNT) && defined(HAVE_WINDOWS_SDK)
+
File gid_File_Lib_sellangmsi
TXT_FILE_BODY;
Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
Dir = gid_Dir_Program;
Name = "sellangmsi.dll";
End
+
#endif
#ifdef ENABLE_LOMENUBAR
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index a3fcd6a..53f4f9d 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -212,7 +212,7 @@ SCPDEFS+=-DSYSTEM_NEON
.ENDIF
# if yes or unset (neon not used) -> do not install openssl library!
-.IF $(SYSTEM_OPENSSL) != "YES"
+.IF "$(SYSTEM_OPENSSL)" != "YES"
SCPDEFS+=-DOPENSSL
.ENDIF
@@ -288,6 +288,11 @@ SCPDEFS+=-DSYSTEM_LIBGSF
SCPDEFS+=-DENABLE_LOMENUBAR
.ENDIF
+# Synchronize with condition to build the jfregqa.dll custom action in setup_native
+.IF "$(WINDOWS_SDK_HOME)"!=""
+SCPDEFS+=-DHAVE_WINDOWS_SDK
+.ENDIF
+
SCP_PRODUCT_TYPE=osl
ICUVERSION_DEPENDENT_FILES= \
diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp b/scp2/source/ooo/windowscustomaction_ooo.scp
index f35482e..70197b7 100644
--- a/scp2/source/ooo/windowscustomaction_ooo.scp
+++ b/scp2/source/ooo/windowscustomaction_ooo.scp
@@ -99,6 +99,8 @@ WindowsCustomAction gid_Customaction_Reg64dll2
Assignment1 = ("InstallExecuteSequence", "REMOVE=\"ALL\" and VersionNT64", "end");
End
+#ifdef HAVE_WINDOWS_SDK
+
WindowsCustomAction gid_Customaction_Jfregcadll1
Name = "Jfregcadll1";
Typ = "65";
@@ -135,6 +137,8 @@ WindowsCustomAction gid_Customaction_qslnkmsidll
Assignment1 = ("InstallExecuteSequence", "REMOVE=\"ALL\" And Not PATCH", "sdqsmsidll");
End
+#endif /* HAVE_WINDOWS_SDK */
+
WindowsCustomAction gid_Customaction_Shellextensionsdll1
Name = "Shellextensionsdll1";
Typ = "65";
@@ -449,6 +453,8 @@ WindowsCustomAction gid_Customaction_CompleteInstallPath
Assignment2 = ("InstallUISequence", "Not REMOVE=\"ALL\" And Not PATCH", "MigrateInstallPath");
End
+#ifdef HAVE_WINDOWS_SDK
+
WindowsCustomAction gid_Customaction_CheckVersions
Name = "CheckVersions";
Typ = "321";
@@ -495,3 +501,5 @@ WindowsCustomAction gid_Customaction_RegisterSomeExtensions
Inbinarytable = 1;
Assignment1 = ("ControlEvent", "FileTypeDialog", "Next", "DoAction", "RegisterSomeExtensions", "1", "1");
End
+
+#endif /* HAVE_WINDOWS_SDK */
diff --git a/scp2/source/winexplorerext/makefile.mk b/scp2/source/winexplorerext/makefile.mk
index 435ed43..0c193c2 100755
--- a/scp2/source/winexplorerext/makefile.mk
+++ b/scp2/source/winexplorerext/makefile.mk
@@ -43,7 +43,8 @@ SCPDEFS+=-DBUILD_X64
SCP_PRODUCT_TYPE=osl
-.IF "$(GUI)"=="WNT"
+# The Explorer extensions don't build with MinGW
+.IF "$(GUI)" == "WNT" && "$(COM)" == "MSC"
PARFILES= \
module_winexplorerext.par \
file_winexplorerext.par \
diff --git a/scp2/source/writer/registryitem_writer.scp b/scp2/source/writer/registryitem_writer.scp
index 6e3d974..ef40203 100644
--- a/scp2/source/writer/registryitem_writer.scp
+++ b/scp2/source/writer/registryitem_writer.scp
@@ -546,6 +546,7 @@ RegistryItem gid_Regitem_Stw_Contenttype
Value = "application/vnd.sun.xml.writer.template";
End
+#ifdef _MSC_VER
RegistryItem gid_Regitem_stw_FullDetails
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
@@ -553,6 +554,7 @@ RegistryItem gid_Regitem_stw_FullDetails
Name = "FullDetails";
Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
End
+#endif
RegistryItem gid_Regitem_Sxg_PersistentHandler
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
@@ -598,6 +600,7 @@ RegistryItem gid_Regitem_Sxg_Mime_Database
Value = ".sxg";
End
+#ifdef _MSC_VER
RegistryItem gid_Regitem_sxg_FullDetails
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
@@ -605,6 +608,7 @@ RegistryItem gid_Regitem_sxg_FullDetails
Name = "FullDetails";
Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
End
+#endif
RegistryItem gid_Regitem_Sxw_PersistentHandler
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
@@ -666,6 +670,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi
Styles = ();
End
+#ifdef _MSC_VER
RegistryItem gid_Regitem_sxw_FullDetails
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
@@ -673,7 +678,7 @@ RegistryItem gid_Regitem_sxw_FullDetails
Name = "FullDetails";
Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
End
-
+#endif
// new odt file extension
@@ -792,6 +797,7 @@ RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Insertable
Subkey = "opendocument.WriterDocument.1\Insertable";
End
+#ifdef _MSC_VER
RegistryItem gid_Regitem_odt_FullDetails
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
@@ -799,6 +805,7 @@ RegistryItem gid_Regitem_odt_FullDetails
Name = "FullDetails";
Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
End
+#endif
RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Protocol_Stdfileediting_Server
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
@@ -1000,6 +1007,7 @@ RegistryItem gid_Regitem_Openoffice_Writertemplate_1_Defaulticon
Value = "<progpath>\program\soffice.exe,2";
End
+#ifdef _MSC_VER
RegistryItem gid_Regitem_ott_FullDetails
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
@@ -1007,6 +1015,7 @@ RegistryItem gid_Regitem_ott_FullDetails
Name = "FullDetails";
Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
End
+#endif
RegistryItem gid_Regitem_Openoffice_Writertemplate_1_Shell
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
@@ -1124,6 +1133,7 @@ RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_1_Defaulticon
Value = "<progpath>\program\soffice.exe,10";
End
+#ifdef _MSC_VER
RegistryItem gid_Regitem_odm_FullDetails
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
@@ -1131,6 +1141,7 @@ RegistryItem gid_Regitem_odm_FullDetails
Name = "FullDetails";
Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
End
+#endif
RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_1_Shell
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
@@ -1290,6 +1301,7 @@ RegistryItem gid_Regitem_Openoffice_WriterWebTemplate_1_Shell_Printto_Command
Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
End
+#ifdef _MSC_VER
RegistryItem gid_Regitem_oth_FullDetails
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Optional_Winexplorerext_PropertyHdl;
@@ -1297,6 +1309,7 @@ RegistryItem gid_Regitem_oth_FullDetails
Name = "FullDetails";
Value = "prop:System.PropGroup.Description;System.Title;System.Author;System.Subject;System.Keywords;System.Comment;System.PropGroup.FileSystem;System.ItemNameDisplay;System.ItemType;System.ItemFolderPathDisplay;System.Size;System.DateCreated;System.DateModified;System.FileAttributes;System.ComputerName";
End
+#endif
// "OpenWith" Windows Registry keys for extensions supported by Writer
diff --git a/scp2/util/makefile.mk b/scp2/util/makefile.mk
index ee6d0ad..adc03b7 100644
--- a/scp2/util/makefile.mk
+++ b/scp2/util/makefile.mk
@@ -168,10 +168,15 @@ SCP1FILES += \
folderitem_math.par \
module_quickstart.par \
file_quickstart.par \
- registryitem_quickstart.par \
+ registryitem_quickstart.par
+
+# The Explorer extensions don't build with MinGW
+.IF "$(COM)" == "MSC"
+SCP1FILES += \
module_winexplorerext.par \
file_winexplorerext.par \
registryitem_winexplorerext.par
+.ENDIF
.IF "$(ENABLE_DIRECTX)"!=""
SCP1FILES += directxcanvas.par
@@ -353,10 +358,14 @@ SCP2FILES += \
folderitem_math.par \
module_quickstart.par \
file_quickstart.par \
- registryitem_quickstart.par \
+ registryitem_quickstart.par
+
+.IF "$(COM)" == "MSC"
+SCP2FILES += \
module_winexplorerext.par \
file_winexplorerext.par \
registryitem_winexplorerext.par
+.ENDIF
.IF "$(ENABLE_DIRECTX)"!=""
SCP2FILES += directxcanvas.par
commit bf6c17c7f3fb97b0bd941e93e739dfa3db5eaab6
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Tue Aug 30 10:10:15 2011 +0300
Why would we want to copy *from* solver to the module out dir?
diff --git a/solenv/inc/_tg_scp.mk b/solenv/inc/_tg_scp.mk
index d13e579..0cf140a 100644
--- a/solenv/inc/_tg_scp.mk
+++ b/solenv/inc/_tg_scp.mk
@@ -2,11 +2,6 @@
.IF "$(SCP1TARGETN)"!=""
-# try to get missing parfiles
-$(PAR)/%.par : $(SOLARPARDIR)/%.par
- @@-$(MKDIRHIER) $(@:d:d)
- $(COMMAND_ECHO)$(COPY) $< $@
-
LOCALSCP1FILES+=$(foreach,i,$(SCP1FILES) $(foreach,j,$(SCP1LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
$(SCP1TARGETN): $(LOCALSCP1FILES)
@@ -20,11 +15,6 @@ $(SCP1TARGETN): $(LOCALSCP1FILES)
.IF "$(SCP2TARGETN)"!=""
-# try to get missing parfiles
-$(PAR)/%.par : $(SOLARPARDIR)/%.par
- @@-$(MKDIRHIER) $(@:d:d)
- $(COMMAND_ECHO)$(COPY) $< $@
-
LOCALSCP2FILES+=$(foreach,i,$(SCP2FILES) $(foreach,j,$(SCP2LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
$(SCP2TARGETN): $(LOCALSCP2FILES)
@@ -38,11 +28,6 @@ $(SCP2TARGETN): $(LOCALSCP2FILES)
.IF "$(SCP3TARGETN)"!=""
-# try to get missing parfiles
-$(PAR)/%.par : $(SOLARPARDIR)/%.par
- @@-$(MKDIRHIER) $(@:d:d)
- $(COMMAND_ECHO)$(COPY) $< $@
-
LOCALSCP3FILES+=$(foreach,i,$(SCP3FILES) $(foreach,j,$(SCP3LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
$(SCP3TARGETN): $(LOCALSCP3FILES)
@@ -56,11 +41,6 @@ $(SCP3TARGETN): $(LOCALSCP3FILES)
.IF "$(SCP4TARGETN)"!=""
-# try to get missing parfiles
-$(PAR)/%.par : $(SOLARPARDIR)/%.par
- @@-$(MKDIRHIER) $(@:d:d)
- $(COMMAND_ECHO)$(COPY) $< $@
-
LOCALSCP4FILES+=$(foreach,i,$(SCP4FILES) $(foreach,j,$(SCP4LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
$(SCP4TARGETN): $(LOCALSCP4FILES)
@@ -74,11 +54,6 @@ $(SCP4TARGETN): $(LOCALSCP4FILES)
.IF "$(SCP5TARGETN)"!=""
-# try to get missing parfiles
-$(PAR)/%.par : $(SOLARPARDIR)/%.par
- @@-$(MKDIRHIER) $(@:d:d)
- $(COMMAND_ECHO)$(COPY) $< $@
-
LOCALSCP5FILES+=$(foreach,i,$(SCP5FILES) $(foreach,j,$(SCP5LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
$(SCP5TARGETN): $(LOCALSCP5FILES)
@@ -92,11 +67,6 @@ $(SCP5TARGETN): $(LOCALSCP5FILES)
.IF "$(SCP6TARGETN)"!=""
-# try to get missing parfiles
-$(PAR)/%.par : $(SOLARPARDIR)/%.par
- @@-$(MKDIRHIER) $(@:d:d)
- $(COMMAND_ECHO)$(COPY) $< $@
-
LOCALSCP6FILES+=$(foreach,i,$(SCP6FILES) $(foreach,j,$(SCP6LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
$(SCP6TARGETN): $(LOCALSCP6FILES)
@@ -110,11 +80,6 @@ $(SCP6TARGETN): $(LOCALSCP6FILES)
.IF "$(SCP7TARGETN)"!=""
-# try to get missing parfiles
-$(PAR)/%.par : $(SOLARPARDIR)/%.par
- @@-$(MKDIRHIER) $(@:d:d)
- $(COMMAND_ECHO)$(COPY) $< $@
-
LOCALSCP7FILES+=$(foreach,i,$(SCP7FILES) $(foreach,j,$(SCP7LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
$(SCP7TARGETN): $(LOCALSCP7FILES)
@@ -128,11 +93,6 @@ $(SCP7TARGETN): $(LOCALSCP7FILES)
.IF "$(SCP8TARGETN)"!=""
-# try to get missing parfiles
-$(PAR)/%.par : $(SOLARPARDIR)/%.par
- @@-$(MKDIRHIER) $(@:d:d)
- $(COMMAND_ECHO)$(COPY) $< $@
-
LOCALSCP8FILES+=$(foreach,i,$(SCP8FILES) $(foreach,j,$(SCP8LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
$(SCP8TARGETN): $(LOCALSCP8FILES)
@@ -146,11 +106,6 @@ $(SCP8TARGETN): $(LOCALSCP8FILES)
.IF "$(SCP9TARGETN)"!=""
-# try to get missing parfiles
-$(PAR)/%.par : $(SOLARPARDIR)/%.par
- @@-$(MKDIRHIER) $(@:d:d)
- $(COMMAND_ECHO)$(COPY) $< $@
-
LOCALSCP9FILES+=$(foreach,i,$(SCP9FILES) $(foreach,j,$(SCP9LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
$(SCP9TARGETN): $(LOCALSCP9FILES)
@@ -164,11 +119,6 @@ $(SCP9TARGETN): $(LOCALSCP9FILES)
.IF "$(SCP10TARGETN)"!=""
-# try to get missing parfiles
-$(PAR)/%.par : $(SOLARPARDIR)/%.par
- @@-$(MKDIRHIER) $(@:d:d)
- $(COMMAND_ECHO)$(COPY) $< $@
-
LOCALSCP10FILES+=$(foreach,i,$(SCP10FILES) $(foreach,j,$(SCP10LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
$(SCP10TARGETN): $(LOCALSCP10FILES)
diff --git a/solenv/inc/tg_scp.mk b/solenv/inc/tg_scp.mk
index 0033dd9..3237708 100644
--- a/solenv/inc/tg_scp.mk
+++ b/solenv/inc/tg_scp.mk
@@ -31,11 +31,6 @@
.IF "$(SCP$(TNR)TARGETN)"!=""
-# try to get missing parfiles
-$(PAR)/%.par : $(SOLARPARDIR)/%.par
- @@-$(MKDIRHIER) $(@:d:d)
- $(COMMAND_ECHO)$(COPY) $< $@
-
LOCALSCP$(TNR)FILES+=$(foreach,i,$(SCP$(TNR)FILES) $(foreach,j,$(SCP$(TNR)LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
$(SCP$(TNR)TARGETN): $(LOCALSCP$(TNR)FILES)
commit e081225623ee71557d28afe9a1fbeeeb80faa798
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Mon Aug 29 23:42:11 2011 +0300
Tweak some DLL and import library names in the WNTGCC case
diff --git a/cppu/prj/d.lst b/cppu/prj/d.lst
index 87ff914..0ee434b 100644
--- a/cppu/prj/d.lst
+++ b/cppu/prj/d.lst
@@ -55,11 +55,13 @@ mkdir: %_DEST%\inc\uno
..\%__SRC%\lib\icppu.lib %_DEST%\lib\icppu.lib
..\%__SRC%\bin\cppu* %_DEST%\bin\*
+..\%__SRC%\bin\uno_cppu* %_DEST%\bin\*
..\%__SRC%\lib\libuno_cppu.* %_DEST%\lib\*
..\%__SRC%\lib\ipurpenvhelper* %_DEST%\lib\*
..\%__SRC%\bin\purpe*.dll %_DEST%\bin\*
-..\%__SRC%\lib\libuno_purpenvhelper*.*.* %_DEST%\lib\*
+..\%__SRC%\bin\uno_purpe*.dll %_DEST%\bin\*
+..\%__SRC%\lib\libuno_purpenvhelper*.* %_DEST%\lib\*
..\%__SRC%\bin\unsafe_u*.dll %_DEST%\bin\*
..\%__SRC%\lib\libunsafe_uno_uno.* %_DEST%\lib\*
diff --git a/cppu/source/helper/purpenv/export.mk b/cppu/source/helper/purpenv/export.mk
index 004787e..6ffea2e 100644
--- a/cppu/source/helper/purpenv/export.mk
+++ b/cppu/source/helper/purpenv/export.mk
@@ -1,15 +1,8 @@
-.IF "$(GUI)"=="UNX" || "$(GUI)"=="MAC"
+.IF "$(COM)"=="GCC"
NAMEpurpenv_helper := uno_purpenvhelper$(COMID)
-
purpenv_helper_LIB := -l$(NAMEpurpenv_helper)
-
.ELSE
NAMEpurpenv_helper := purpenvhelper$(UDK_MAJOR)$(COMID)
-.IF "$(COM)"=="GCC"
-purpenv_helper_LIB := -l$(NAMEpurpenv_helper)
-.ELSE
purpenv_helper_LIB := $(LIBPRE) i$(NAMEpurpenv_helper).lib
.ENDIF
-
-.ENDIF
diff --git a/cppu/util/extra.mk b/cppu/util/extra.mk
index 8c6d694..f3cb0c6 100644
--- a/cppu/util/extra.mk
+++ b/cppu/util/extra.mk
@@ -41,7 +41,11 @@ USE_DEFFILE :=TRUE
# --- Files --------------------------------------------------------
SHL3TARGET := unsafe_uno_uno
+.IF "$(COM)" == "MSC"
SHL3IMPLIB := i$(SHL3TARGET)
+.ELSE
+SHL3IMPLIB := $(SHL3TARGET)
+.ENDIF
SHL3STDLIBS := $(purpenv_helper_LIB) $(SALLIB)
SHL3OBJS := $(SLO)$/UnsafeBridge.obj
SHL3DEF := empty.def
@@ -49,19 +53,26 @@ SHL3OBJS := $(SLO)$/UnsafeBridge.obj
SHL3RPATH := URELIB
SHL4TARGET := affine_uno_uno
+.IF "$(COM)" == "MSC"
SHL4IMPLIB := i$(SHL4TARGET)
+.ELSE
+SHL4IMPLIB := $(SHL4TARGET)
+.ENDIF
SHL4STDLIBS := $(purpenv_helper_LIB) $(SALLIB)
SHL4OBJS := $(SLO)$/AffineBridge.obj
SHL4DEF := empty.def
SHL4OBJS := $(SLO)$/AffineBridge.obj
SHL4RPATH := URELIB
-
SHL5TARGET := log_uno_uno
+.IF "$(COM)" == "MSC"
SHL5IMPLIB := i$(SHL5TARGET)
+.ELSE
+SHL5IMPLIB := $(SHL5TARGET)
+.ENDIF
SHL5STDLIBS := $(purpenv_helper_LIB) $(SALLIB) $(CPPULIB)
SHL5OBJS := $(SLO)$/LogBridge.obj
-
+
SHL5DEF := empty.def
SHL5RPATH := URELIB
diff --git a/cppu/util/makefile.mk b/cppu/util/makefile.mk
index 0c09a1b..ea0c094 100644
--- a/cppu/util/makefile.mk
+++ b/cppu/util/makefile.mk
@@ -32,7 +32,7 @@ USE_DEFFILE=TRUE
ENABLE_EXCEPTIONS=TRUE
NO_BSYMBOLIC=TRUE
-.IF "$(OS)" != "WNT"
+.IF "$(COM)" != "MSC"
UNIXVERSIONNAMES=UDK
.ENDIF
@@ -50,7 +50,7 @@ SHL1LIBS= \
$(SLB)$/cppu_threadpool.lib \
$(SLB)$/cppu_cppu.lib
-.IF "$(GUI)" == "WNT"
+.IF "$(COM)" == "MSC"
SHL1TARGET=$(TARGET)$(UDK_MAJOR)
.ELSE
SHL1TARGET= uno_$(TARGET)
@@ -84,7 +84,11 @@ SHL2VERSIONMAP:=$(SHL2TARGET)X.map
SHL2VERSIONMAP:=$(SHL2TARGET).map
.ENDIF # "$(GUI)$(COM)"=="WNTGCC"
SHL2DEF := $(MISC)$/$(SHL2TARGET).def
+.IF "$(COM)" == "MSC"
SHL2IMPLIB := i$(SHL2TARGET)
+.ELSE
+SHL2IMPLIB := $(SHL2TARGET)
+.ENDIF
SHL2STDLIBS := $(CPPULIB) $(SALLIB)
SHL2RPATH := URELIB
SHL2OBJS := \
diff --git a/cppuhelper/prj/d.lst b/cppuhelper/prj/d.lst
index c26529d..a27212c 100644
--- a/cppuhelper/prj/d.lst
+++ b/cppuhelper/prj/d.lst
@@ -57,8 +57,8 @@ mkdir: %_DEST%\inc\cppuhelper
..\inc\cppuhelper\unourl.hxx %_DEST%\inc\cppuhelper\unourl.hxx
..\%__SRC%\bin\cppuh*.dll %_DEST%\bin\cppuh*.dll
+..\%__SRC%\bin\uno_cppuh*.dll %_DEST%\bin\uno_cppuh*.dll
..\%__SRC%\lib\*cppuhelper*.lib %_DEST%\lib\*
-
..\%__SRC%\lib\libuno_cppuhelper*.* %_DEST%\lib\*
..\%__SRC%\lib\libcppuhelper*.a %_DEST%\lib\*
diff --git a/cppuhelper/source/makefile.mk b/cppuhelper/source/makefile.mk
index f312354..aed6ae6 100755
--- a/cppuhelper/source/makefile.mk
+++ b/cppuhelper/source/makefile.mk
@@ -37,9 +37,9 @@ USE_DEFFILE=TRUE
# without "-L" (light) switch
BOOTSTRAP_SERVICE=TRUE
-.IF "$(OS)" != "WNT"
+.IF "$(COM)" != "MSC"
UNIXVERSIONNAMES=UDK
-.ENDIF # WNT
+.ENDIF
# --- Settings -----------------------------------------------------
@@ -148,7 +148,7 @@ SLOFILES= \
OBJFILES = $(OBJ)$/findsofficepath.obj
-.IF "$(GUI)" == "WNT"
+.IF "$(COM)" == "MSC"
SHL1TARGET=$(TARGET)$(UDK_MAJOR)$(COMID)
.ELSE
SHL1TARGET=uno_$(TARGET)$(COMID)
diff --git a/salhelper/prj/d.lst b/salhelper/prj/d.lst
index 6f5df50..2aa89bb 100644
--- a/salhelper/prj/d.lst
+++ b/salhelper/prj/d.lst
@@ -13,8 +13,9 @@ mkdir: %_DEST%\inc\salhelper
..\inc\salhelper\timer.hxx %_DEST%\inc\salhelper\timer.hxx
..\%__SRC%\bin\salhelp*.dll %_DEST%\bin\salhelp*.dll
-..\%__SRC%\lib\*salhelper*.lib %_DEST%\lib\*
+..\%__SRC%\bin\uno_salhelp*.dll %_DEST%\bin\uno_salhelp*.dll
+..\%__SRC%\lib\*salhelper*.lib %_DEST%\lib\*
..\%__SRC%\lib\libuno_salhelper*.* %_DEST%\lib\*
..\%__SRC%\lib\libsalhelper*.a %_DEST%\lib\*
diff --git a/salhelper/source/makefile.mk b/salhelper/source/makefile.mk
index 8c7d8a2..9d7abaf 100644
--- a/salhelper/source/makefile.mk
+++ b/salhelper/source/makefile.mk
@@ -33,9 +33,9 @@ ENABLE_EXCEPTIONS=TRUE
NO_BSYMBOLIC=TRUE
USE_DEFFILE=TRUE
-.IF "$(OS)" != "WNT"
+.IF "$(COM)" != "MSC"
UNIXVERSIONNAMES=UDK
-.ENDIF # WNT
+.ENDIF
# --- Settings -----------------------------------------------------
@@ -54,7 +54,7 @@ SHL1TARGET= $(TARGET)$(UDK_MAJOR)$(COMID)
SHL1IMPLIB= i$(TARGET)
.ELSE
SHL1TARGET= uno_$(TARGET)$(COMID)
-SHL1IMPLIB= $(SHL1TARGET)
+SHL1IMPLIB= uno_$(TARGET)$(COMID)
.ENDIF
SHL1STDLIBS=$(SALLIB)
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index 677bf28..5efd896 100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -506,6 +506,7 @@ End
#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"
+#if defined _MSC
#define SCP2_URE_DL_VER(n, v) n v ".dll"
#define SCP2_URE_DL_COMID_VER(n, v) n v STRING(COMID) ".dll"
#define SCP2_URE_DL_COMID_NORMAL(n) n STRING(COMID) ".dll"
@@ -517,6 +518,16 @@ End
#else
#define SCP2_STDLP_DEBUG ""
#endif
+#else // GCC
+#define SCP2_URE_DL_VER(n, v) n v ".dll"
+#define SCP2_URE_DL_COMID_VER(n, v) n v STRING(COMID) ".dll"
+#define SCP2_URE_DL_COMID_NORMAL(n) n STRING(COMID) ".dll"
+#define SCP2_URE_DL_UNO_VER(n, v) "uno_" n v ".dll"
+#define SCP2_URE_DL_UNO_COMID_VER(n, v) \
+ "uno_" n STRING(COMID) v ".dll"
+#define SCP2_URE_SHARE_DIR gid_Dir_Common_Ure
+#define SCP2_STDLP_DEBUG ""
+#endif
#else
#define SCP2_URE_DL_DIR gid_Dir_Ure_Lib
#define SCP2_URE_DL_NORMAL(n) "lib" n STRING(UNXSUFFIX)
commit c908467f098bf1e8be7c5d7fddaf66c5506675af
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Mon Aug 29 22:47:17 2011 +0300
Don't check makecab version when cross-compiling
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index bb7c684..c8e92dc 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -289,7 +289,7 @@ if (!($installer::globals::is_copy_only_project)) { installer::ziplist::set_manu
# Checking version of makecab.exe
##############################################
-if ( $installer::globals::iswindowsbuild ) { installer::control::check_makecab_version(); }
+if ( $installer::globals::iswindowsbuild && $ENV{'CROSS_COMPILING'} ne 'YES') { installer::control::check_makecab_version(); }
##########################################################
# Getting the include path from the settings in zip list
commit 41c2fc546a96e7ea8b7850086cbeb072a989e395
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Mon Aug 29 21:57:36 2011 +0300
Look for and deliver shared libgcc and libstdc++ for MinGW
Also remove mingwm10.dll stuff. That is an obsolete DLL not used by
current MinGW, says Fridrich.
diff --git a/external/gcc3_specific/makefile.mk b/external/gcc3_specific/makefile.mk
index d40468c..5d0fef8 100644
--- a/external/gcc3_specific/makefile.mk
+++ b/external/gcc3_specific/makefile.mk
@@ -11,10 +11,6 @@ TARGET=gcc3_specific
.IF "$(GUI)" == "WNT"
-.IF "$(CROSS_COMPILING)" != "YES"
-# Don't do any of this weird and presumably obsolete crack when
-# cross-compiling
-
.IF "$(COM)" == "GCC"
.IF "$(MINGW_SHARED_GCCLIB)" == "YES"
@@ -25,20 +21,28 @@ MINGWGCCDLL=$(BIN)$/$(MINGW_GCCDLL)
MINGWGXXDLL=$(BIN)$/$(MINGW_GXXDLL)
.ENDIF
-all : $(BIN)$/mingwm10.dll $(MINGWGCCDLL) $(MINGWGXXDLL)
+all : $(MINGWGCCDLL) $(MINGWGXXDLL)
+
+# Guesstimate where $(MINGW_GCCDLL) and $(MINGW_GXXDLL) might be
-$(BIN)$/mingwm10.dll :
- $(COPY) -p $(COMPATH)$/bin$/mingwm10.dll $(BIN)$/
+POTENTIAL_MINGW_RUNTIME_BINDIRS = \
+ $(COMPATH)/i686-w64-mingw32/sys-root/mingw/bin \
+ /usr/i686-w64-mingw32/sys-root/mingw/bin \
.IF "$(MINGW_SHARED_GCCLIB)" == "YES"
$(MINGWGCCDLL) :
- $(COPY) -p $(COMPATH)$/bin$/$(MINGW_GCCDLL) $(BIN)$/
+ @for D in $(POTENTIAL_MINGW_RUNTIME_BINDIRS); do \
+ test -f $$D/$(MINGW_GCCDLL) && $(COPY) -p $$D/$(MINGW_GCCDLL) $(BIN)$/ && break; \
+ done
+ @test -f $@ || (echo Could not find $(MINGW_GCCDLL) && exit 1)
.ENDIF
-.IF "$(MINGW_SHARED_GXXLIB)" == "YES"
$(MINGWGXXDLL) :
- $(COPY) -p $(COMPATH)$/bin$/$(MINGW_GXXDLL) $(BIN)$/
-.ENDIF
+.IF "$(MINGW_SHARED_GXXLIB)" == "YES"
+ @for D in $(POTENTIAL_MINGW_RUNTIME_BINDIRS); do \
+ test -f $$D/$(MINGW_GXXDLL) && $(COPY) -p $$D/$(MINGW_GXXDLL) $(BIN)$/ && break; \
+ done
+ @test -f $@ || (echo Could not find $(MINGW_GXXDLL) && exit 1)
.ENDIF
diff --git a/external/mingwm10/README_mingwm10.dll b/external/mingwm10/README_mingwm10.dll
deleted file mode 100644
index 992e9b6..0000000
--- a/external/mingwm10/README_mingwm10.dll
+++ /dev/null
@@ -1,3 +0,0 @@
-Put the mingwm10.dll in this directory for Windows builds using
-a MinGW compiler. The dlls are part of the MinGW installation and can be found
-in the directory where the compiler binary is installed.
diff --git a/external/prj/d.lst b/external/prj/d.lst
index 3891210..b2edb8f 100644
--- a/external/prj/d.lst
+++ b/external/prj/d.lst
@@ -48,7 +48,6 @@ mkdir: %_DEST%\inc\external\wine
..\vcredist\vcredist_x86.exe %_DEST%\bin\vcredist_x86.exe
..\vcredist\vcredist_x64.exe %_DEST%\bin\vcredist_x64.exe
-..\%__SRC%\bin\mingwm10.dll %_DEST%\bin\mingwm10.dll
..\%__SRC%\bin\libgcc*.dll %_DEST%\bin\libgcc*.dll
..\%__SRC%\bin\libstdc++*.dll %_DEST%\bin\libstdc++*.dll
More information about the Libreoffice-commits
mailing list