From 19066cafbb3a5a4013277f62b0e577294534a70b Mon Sep 17 00:00:00 2001
From: Markus Mohrhard <markus.mohrhard@googlemail.com>
Date: Tue, 27 Dec 2016 02:38:18 +0100
Subject: extract the common updater code to an own static library

We again need to use a static lib to prevent the file is in use problem
during the update.

Change-Id: I22d00ea2ab46949d32cdaae85c799896d6e0468f
---
 onlineupdate/Executable_updater.mk              |  7 ++----
 onlineupdate/Module_onlineupdate.mk             |  1 +
 onlineupdate/StaticLibrary_updatehelper.mk      | 32 +++++++++++++++++++++++++
 onlineupdate/source/update/common/readstrings.h |  1 -
 4 files changed, 35 insertions(+), 6 deletions(-)
 create mode 100644 onlineupdate/StaticLibrary_updatehelper.mk

diff --git a/onlineupdate/Executable_updater.mk b/onlineupdate/Executable_updater.mk
index e5c1611f9dc1..75d97a3d8c0f 100644
--- a/onlineupdate/Executable_updater.mk
+++ b/onlineupdate/Executable_updater.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_Executable_set_include,updater,\
 
 $(eval $(call gb_Executable_use_static_libraries,updater,\
     libmar \
+    updatehelper \
 	$(if $(filter WNT,$(OS)), \
 		winhelper )\
 ))
@@ -51,6 +52,7 @@ $(eval $(call gb_Executable_use_externals,updater,\
 $(eval $(call gb_Executable_add_defs,updater,\
 	-DVERIFY_MAR_SIGNATURE \
 	-DNSS3 \
+	-DUNICODE \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,updater,\
@@ -60,11 +62,6 @@ $(eval $(call gb_Executable_add_exception_objects,updater,\
 	onlineupdate/source/update/updater/progressui_gtk \
 	onlineupdate/source/update/updater/progressui_null \
 	onlineupdate/source/update/updater/updater \
-	onlineupdate/source/update/common/pathhash \
-	onlineupdate/source/update/common/readstrings \
-	onlineupdate/source/update/common/uachelper \
-	onlineupdate/source/update/common/updatehelper \
-	onlineupdate/source/update/common/updatelogging \
 	$(if $(filter WNT,$(OS)),\
 		onlineupdate/source/update/updater/loaddlls \
 		onlineupdate/source/update/updater/progressui_win \
diff --git a/onlineupdate/Module_onlineupdate.mk b/onlineupdate/Module_onlineupdate.mk
index 02287e641a8d..91a5ccf2a850 100644
--- a/onlineupdate/Module_onlineupdate.mk
+++ b/onlineupdate/Module_onlineupdate.mk
@@ -13,6 +13,7 @@ $(eval $(call gb_Module_Module,onlineupdate))
 ifneq ($(ENABLE_ONLINE_UPDATE_MAR),)
 $(eval $(call gb_Module_add_targets,onlineupdate,\
 	StaticLibrary_libmar \
+	StaticLibrary_updatehelper \
 	$(if $(filter WNT,$(OS)),\
 		StaticLibrary_winhelper )\
 	Executable_mar \
diff --git a/onlineupdate/StaticLibrary_updatehelper.mk b/onlineupdate/StaticLibrary_updatehelper.mk
new file mode 100644
index 000000000000..ab6b4edf77e1
--- /dev/null
+++ b/onlineupdate/StaticLibrary_updatehelper.mk
@@ -0,0 +1,32 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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/.
+#
+
+$(eval $(call gb_StaticLibrary_StaticLibrary,updatehelper))
+
+$(eval $(call gb_StaticLibrary_set_include,updatehelper,\
+	-I$(SRCDIR)/onlineupdate/inc/ \
+	-I$(SRCDIR)/onlineupdate/source/update/common \
+	$$(INCLUDE) \
+))
+
+$(eval $(call gb_StaticLibrary_add_defs,updatehelper,\
+	-DUNICODE \
+	-DNSS3 \
+	-DVERIFY_MAR_SIGNATURE \
+))
+
+$(eval $(call gb_StaticLibrary_add_exception_objects,updatehelper,\
+	onlineupdate/source/update/common/pathhash \
+	onlineupdate/source/update/common/readstrings \
+	onlineupdate/source/update/common/uachelper \
+	onlineupdate/source/update/common/updatehelper \
+	onlineupdate/source/update/common/updatelogging \
+))
+
+# vim:set shiftwidth=4 tabstop=4 noexpandtab: */
diff --git a/onlineupdate/source/update/common/readstrings.h b/onlineupdate/source/update/common/readstrings.h
index 5b3cde6acaaa..47a9c171756d 100644
--- a/onlineupdate/source/update/common/readstrings.h
+++ b/onlineupdate/source/update/common/readstrings.h
@@ -10,7 +10,6 @@
 #define MAX_TEXT_LEN 600
 
 #ifdef _WIN32
-# define UNICODE
 # include <windows.h>
   typedef WCHAR NS_tchar;
 #else
-- 
cgit v1.2.3