[Libreoffice-commits] core.git: setup_native/Library_inst_msu_msi.mk setup_native/Library_instooofiltmsi.mk setup_native/Library_qslnkmsi.mk setup_native/Library_reg4allmsdoc.mk setup_native/Library_regactivex.mk setup_native/Library_sdqsmsi.mk setup_native/Library_sellangmsi.mk setup_native/Library_shlxtmsi.mk setup_native/Library_sn_tools.mk setup_native/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Fri Sep 28 05:10:57 UTC 2018 

 setup_native/Library_inst_msu_msi.mk                                      |    1 
 setup_native/Library_instooofiltmsi.mk                                    |    1 
 setup_native/Library_qslnkmsi.mk                                          |    1 
 setup_native/Library_reg4allmsdoc.mk                                      |    1 
 setup_native/Library_regactivex.mk                                        |    1 
 setup_native/Library_sdqsmsi.mk                                           |    1 
 setup_native/Library_sellangmsi.mk                                        |    1 
 setup_native/Library_shlxtmsi.mk                                          |    1 
 setup_native/Library_sn_tools.mk                                          |    1 
 setup_native/source/win32/customactions/indexingfilter/instooofiltmsi.def |    3 ++
 setup_native/source/win32/customactions/inst_msu/inst_msu_msi.def         |    5 ++++
 setup_native/source/win32/customactions/quickstarter/qslnkmsi.def         |    3 ++
 setup_native/source/win32/customactions/quickstarter/sdqsmsi.def          |    3 ++
 setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsdoc.def     |    6 +++++
 setup_native/source/win32/customactions/regactivex/regactivex.def         |    4 +++
 setup_native/source/win32/customactions/sellang/sellang.def               |    4 +++
 setup_native/source/win32/customactions/shellextensions/shlxtmsi.def      |   11 ++++++++++
 setup_native/source/win32/customactions/tools/sn_tools.def                |    3 ++
 18 files changed, 51 insertions(+)

New commits:
commit 84deb15526fa9501eb57eec53e21bd6e2d7f7ce5
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Thu Sep 27 17:34:30 2018 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Fri Sep 28 07:10:31 2018 +0200

    tdf#120099 Reintroduce .def files
    
    ...that had been removed with 28b4f4aeaf160c7721dfecf5bd2445d7dbc6f01c "Get rid
    of Windows .def files in setup_native, use __declspec(dllexport)".  Looks like
    for 32-bit builds, the .def file EXPORTS are still needed to avoid __stdcall's
    _... at NN symbol decoration (and for 64-bit builds __stdcall is effectively
    ignored, so the removed .def files didn't make a difference there).
    
    This is only a partial revert of 28b4f4aeaf160c7721dfecf5bd2445d7dbc6f01c, the
    addition of __declspec(dllexport) for the benefit of loplguin:external should
    still be fine.
    
    Change-Id: I76a1a3f4671824367bab495afeba291c0340108d
    Reviewed-on: https://gerrit.libreoffice.org/61047
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/setup_native/Library_inst_msu_msi.mk b/setup_native/Library_inst_msu_msi.mk
index 8e617b495fe1..d423b5168697 100644
--- a/setup_native/Library_inst_msu_msi.mk
+++ b/setup_native/Library_inst_msu_msi.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_Library_add_cxxflags,inst_msu_msi,\
 ))
 
 $(eval $(call gb_Library_add_ldflags,inst_msu_msi,\
+	/DEF:$(SRCDIR)/setup_native/source/win32/customactions/inst_msu/inst_msu_msi.def \
 	/NODEFAULTLIB \
 ))
 
diff --git a/setup_native/Library_instooofiltmsi.mk b/setup_native/Library_instooofiltmsi.mk
index a0656842cd47..36e2e2a6b81c 100644
--- a/setup_native/Library_instooofiltmsi.mk
+++ b/setup_native/Library_instooofiltmsi.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_Library_add_cxxflags,instooofiltmsi,\
 ))
 
 $(eval $(call gb_Library_add_ldflags,instooofiltmsi,\
+	/DEF:$(SRCDIR)/setup_native/source/win32/customactions/indexingfilter/instooofiltmsi.def \
 	/NODEFAULTLIB \
 ))
 
diff --git a/setup_native/Library_qslnkmsi.mk b/setup_native/Library_qslnkmsi.mk
index 9893d1c227b5..f958534f07b1 100644
--- a/setup_native/Library_qslnkmsi.mk
+++ b/setup_native/Library_qslnkmsi.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_Library_add_cxxflags,qslnkmsi,\
 ))
 
 $(eval $(call gb_Library_add_ldflags,qslnkmsi,\
+	/DEF:$(SRCDIR)/setup_native/source/win32/customactions/quickstarter/qslnkmsi.def \
 	/NODEFAULTLIB \
 ))
 
diff --git a/setup_native/Library_reg4allmsdoc.mk b/setup_native/Library_reg4allmsdoc.mk
index 6d13ecb97afb..f20fa5ad5aea 100644
--- a/setup_native/Library_reg4allmsdoc.mk
+++ b/setup_native/Library_reg4allmsdoc.mk
@@ -20,6 +20,7 @@ $(eval $(call gb_Library_add_cxxflags,reg4allmsdoc,\
 ))
 
 $(eval $(call gb_Library_add_ldflags,reg4allmsdoc,\
+	/DEF:$(SRCDIR)/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsdoc.def \
 	/NODEFAULTLIB \
 ))
 
diff --git a/setup_native/Library_regactivex.mk b/setup_native/Library_regactivex.mk
index 96d9095a0f28..7142b8ee0a7d 100644
--- a/setup_native/Library_regactivex.mk
+++ b/setup_native/Library_regactivex.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_Library_add_cxxflags,regactivex,\
 ))
 
 $(eval $(call gb_Library_add_ldflags,regactivex,\
+	/DEF:$(SRCDIR)/setup_native/source/win32/customactions/regactivex/regactivex.def \
 	/NODEFAULTLIB \
 ))
 
diff --git a/setup_native/Library_sdqsmsi.mk b/setup_native/Library_sdqsmsi.mk
index 8b4c485dfc2d..ff9a1bd586a7 100644
--- a/setup_native/Library_sdqsmsi.mk
+++ b/setup_native/Library_sdqsmsi.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_Library_add_cxxflags,sdqsmsi,\
 ))
 
 $(eval $(call gb_Library_add_ldflags,sdqsmsi,\
+	/DEF:$(SRCDIR)/setup_native/source/win32/customactions/quickstarter/sdqsmsi.def \
 	/NODEFAULTLIB \
 ))
 
diff --git a/setup_native/Library_sellangmsi.mk b/setup_native/Library_sellangmsi.mk
index 3289f8fb04d3..04f8f6edbc46 100644
--- a/setup_native/Library_sellangmsi.mk
+++ b/setup_native/Library_sellangmsi.mk
@@ -22,6 +22,7 @@ $(eval $(call gb_Library_add_cxxflags,sellangmsi,\
 ))
 
 $(eval $(call gb_Library_add_ldflags,sellangmsi,\
+	/DEF:$(SRCDIR)/setup_native/source/win32/customactions/sellang/sellang.def \
 	/NODEFAULTLIB \
 ))
 
diff --git a/setup_native/Library_shlxtmsi.mk b/setup_native/Library_shlxtmsi.mk
index e80600f300de..e6780d014b5f 100644
--- a/setup_native/Library_shlxtmsi.mk
+++ b/setup_native/Library_shlxtmsi.mk
@@ -22,6 +22,7 @@ $(eval $(call gb_Library_add_cxxflags,shlxtmsi,\
 ))
 
 $(eval $(call gb_Library_add_ldflags,shlxtmsi,\
+	/DEF:$(SRCDIR)/setup_native/source/win32/customactions/shellextensions/shlxtmsi.def \
 	/NODEFAULTLIB \
 ))
 
diff --git a/setup_native/Library_sn_tools.mk b/setup_native/Library_sn_tools.mk
index f99e8b1af75c..aa94f2ebcf02 100644
--- a/setup_native/Library_sn_tools.mk
+++ b/setup_native/Library_sn_tools.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_Library_add_cxxflags,sn_tools,\
 ))
 
 $(eval $(call gb_Library_add_ldflags,sn_tools,\
+	/DEF:$(SRCDIR)/setup_native/source/win32/customactions/tools/sn_tools.def \
 	/NODEFAULTLIB \
 ))
 
diff --git a/setup_native/source/win32/customactions/indexingfilter/instooofiltmsi.def b/setup_native/source/win32/customactions/indexingfilter/instooofiltmsi.def
new file mode 100644
index 000000000000..0126556a48eb
--- /dev/null
+++ b/setup_native/source/win32/customactions/indexingfilter/instooofiltmsi.def
@@ -0,0 +1,3 @@
+LIBRARY		"instooofiltmsi.dll"
+EXPORTS
+			RestartIndexingService
\ No newline at end of file
diff --git a/setup_native/source/win32/customactions/inst_msu/inst_msu_msi.def b/setup_native/source/win32/customactions/inst_msu/inst_msu_msi.def
new file mode 100644
index 000000000000..49ade9c0169e
--- /dev/null
+++ b/setup_native/source/win32/customactions/inst_msu/inst_msu_msi.def
@@ -0,0 +1,5 @@
+LIBRARY		"inst_msu_msi.dll"
+EXPORTS
+			UnpackMSUForInstall
+			InstallMSU
+			CleanupMSU
\ No newline at end of file
diff --git a/setup_native/source/win32/customactions/quickstarter/qslnkmsi.def b/setup_native/source/win32/customactions/quickstarter/qslnkmsi.def
new file mode 100644
index 000000000000..f50a3a39686e
--- /dev/null
+++ b/setup_native/source/win32/customactions/quickstarter/qslnkmsi.def
@@ -0,0 +1,3 @@
+LIBRARY		"qslnkmsi.dll"
+EXPORTS
+			RemoveQuickstarterLink
\ No newline at end of file
diff --git a/setup_native/source/win32/customactions/quickstarter/sdqsmsi.def b/setup_native/source/win32/customactions/quickstarter/sdqsmsi.def
new file mode 100644
index 000000000000..c8df896e579d
--- /dev/null
+++ b/setup_native/source/win32/customactions/quickstarter/sdqsmsi.def
@@ -0,0 +1,3 @@
+LIBRARY		"sdqsmsi.dll"
+EXPORTS
+			ShutDownQuickstarter
\ No newline at end of file
diff --git a/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsdoc.def b/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsdoc.def
new file mode 100644
index 000000000000..cea8b4699569
--- /dev/null
+++ b/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsdoc.def
@@ -0,0 +1,6 @@
+LIBRARY		"reg4allmsdoc.dll"
+EXPORTS
+			FindRegisteredExtensions
+			LookForRegisteredExtensions
+			RegisterSomeExtensions
+			RestoreRegAllMSDoc 
\ No newline at end of file
diff --git a/setup_native/source/win32/customactions/regactivex/regactivex.def b/setup_native/source/win32/customactions/regactivex/regactivex.def
new file mode 100644
index 000000000000..8a4c744d78a0
--- /dev/null
+++ b/setup_native/source/win32/customactions/regactivex/regactivex.def
@@ -0,0 +1,4 @@
+LIBRARY		"regactivex.dll"
+EXPORTS
+			InstallActiveXControl
+			DeinstallActiveXControl 
\ No newline at end of file
diff --git a/setup_native/source/win32/customactions/sellang/sellang.def b/setup_native/source/win32/customactions/sellang/sellang.def
new file mode 100644
index 000000000000..8d3c4d44cd00
--- /dev/null
+++ b/setup_native/source/win32/customactions/sellang/sellang.def
@@ -0,0 +1,4 @@
+LIBRARY		"sellangmsi.dll"
+EXPORTS
+			SelectLanguage
+			SortTree
\ No newline at end of file
diff --git a/setup_native/source/win32/customactions/shellextensions/shlxtmsi.def b/setup_native/source/win32/customactions/shellextensions/shlxtmsi.def
new file mode 100644
index 000000000000..e0e667953d4f
--- /dev/null
+++ b/setup_native/source/win32/customactions/shellextensions/shlxtmsi.def
@@ -0,0 +1,11 @@
+LIBRARY		"shlxtmsi.dll"
+EXPORTS
+			CheckInstallDirectory
+			CheckPatchList
+			CompleteInstallPath
+			MigrateInstallPath
+			InstallStartmenuFolderIcon
+			DeinstallStartmenuFolderIcon
+			SetProductInstallMode
+			RenamePrgFolder
+			RemovePrgFolder
diff --git a/setup_native/source/win32/customactions/tools/sn_tools.def b/setup_native/source/win32/customactions/tools/sn_tools.def
new file mode 100644
index 000000000000..3c881861b8d3
--- /dev/null
+++ b/setup_native/source/win32/customactions/tools/sn_tools.def
@@ -0,0 +1,3 @@
+LIBRARY		"sn_tools.dll"
+EXPORTS
+			CheckVersions
\ No newline at end of file

More information about the Libreoffice-commits mailing list