mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updater: move the windows process starting code to comphelper

Browse Source 
Change-Id: I1a499f57d01ee28afdb2c4f85dc976f2e6837dfd
Reviewed-on: https://gerrit.libreoffice.org/40837
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
This commit is contained in:
Markus Mohrhard
2017-08-07 15:35:30 +02:00
parent 9d184e2cc9
commit 5875fd0313
7 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
comphelper/Module_comphelper.mk
View File

@@ -21,6 +21,8 @@ $(eval $(call gb_Module_Module,comphelper))
$(eval $(call gb_Module_add_targets,comphelper,\ $(eval $(call gb_Module_add_targets,comphelper,\
Library_comphelper \ Library_comphelper \
$(if $(filter WNT,$(OS)),\
StaticLibrary_windows_process )\
)) ))
$(eval $(call gb_Module_add_subsequentcheck_targets,comphelper,\ $(eval $(call gb_Module_add_subsequentcheck_targets,comphelper,\

14
onlineupdate/StaticLibrary_winhelper.mk → comphelper/StaticLibrary_windows_process.mk
View File

@@ -7,16 +7,18 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
# #
$(eval $(call gb_StaticLibrary_StaticLibrary,winhelper)) $(eval $(call gb_StaticLibrary_StaticLibrary,windows_process))
$(eval $(call gb_StaticLibrary_set_include,winhelper,\ $(eval $(call gb_StaticLibrary_set_include,windows_process,\
-I$(SRCDIR)/onlineupdate/inc/ \
-I$(SRCDIR)/onlineupdate/source/winhelper/ \
$$(INCLUDE) \ $$(INCLUDE) \
)) ))
$(eval $(call gb_StaticLibrary_add_exception_objects,winhelper,\ $(eval $(call gb_StaticLibrary_add_defs,windows_process,\
onlineupdate/source/winhelper/windowsStart \ -DUNICODE \
))
$(eval $(call gb_StaticLibrary_add_exception_objects,windows_process,\
comphelper/source/windows/windows_process \
)) ))
# vim:set shiftwidth=4 tabstop=4 noexpandtab: */ # vim:set shiftwidth=4 tabstop=4 noexpandtab: */

0
onlineupdate/source/winhelper/windowsStart.cxx → comphelper/source/windows/windows_process.cxx
View File

4
onlineupdate/inc/winhelper/windowsStart.hxx → include/comphelper/windowsStart.hxx
View File

@@ -3,8 +3,8 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * 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/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#ifndef INCLUDED_ONLINEUPDATE_INC_WINSTART_HXX #ifndef INCLUDED_COMPHELPER_WINSTART_HXX
#define INCLUDED_ONLINEUPDATE_INC_WINSTART_HXX #define INCLUDED_COMPHELPER_WINSTART_HXX
#ifdef _WIN32 #ifdef _WIN32
#include <windows.h> #include <windows.h>

2
onlineupdate/Executable_updater.mk
View File

@@ -23,7 +23,7 @@ $(eval $(call gb_Executable_use_static_libraries,updater,\
libmarverify \ libmarverify \
updatehelper \ updatehelper \
$(if $(filter WNT,$(OS)), \ $(if $(filter WNT,$(OS)), \
winhelper )\ windows_process )\
)) ))
$(eval $(call gb_Executable_use_externals,updater,\ $(eval $(call gb_Executable_use_externals,updater,\

3
onlineupdate/Module_onlineupdate.mk
View File

@@ -17,8 +17,7 @@ $(eval $(call gb_Module_add_targets,onlineupdate,\
StaticLibrary_updatehelper \ StaticLibrary_updatehelper \
$(if $(filter WNT,$(OS)),\ $(if $(filter WNT,$(OS)),\
Executable_update_service \ Executable_update_service \
WinResTarget_updater \ WinResTarget_updater )\
StaticLibrary_winhelper )\
Executable_mar \ Executable_mar \
Executable_updater \ Executable_updater \
Executable_mbsdiff \ Executable_mbsdiff \

2
onlineupdate/source/update/updater/updater.cxx
View File

@@ -63,7 +63,7 @@
#include <onlineupdate/mozilla/Types.h> #include <onlineupdate/mozilla/Types.h>
#ifdef _WIN32 #ifdef _WIN32
#include <winhelper/windowsStart.hxx> #include <comphelper/windowsStart.hxx>
#include "uachelper.h" #include "uachelper.h"
#include "pathhash.h" #include "pathhash.h"