ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

WIN add and apply default msbuild platform+config

Browse Source 
Adds three Windows gb_* variables:

- gb_MSBUILD_CONFIG_AND_PLATFORM can be passed as msbuild flags
- gb_MSBUILD_PLATFORM maps debug / release settings
- gb_MSBUILD_CONFIG maps the CPUTYPE to the default msbuild names

and converts the users in external projects.

Change-Id: Ie9b817721180d78d104db11c44241e4b3e46bba9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102701
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
This commit is contained in:
Jan-Marek Glogowski
2020-09-15 08:42:54 +02:00
parent 937b780e3f
commit 63cf188ce0
7 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
RepositoryExternal.mk
+1 -1
View File
@@ -2748,7 +2748,7 @@ $(call gb_LinkTarget_set_include,$(1),\
ifeq ($(COM),MSC)
$(call gb_LinkTarget_add_libs,$(1),\
$(call gb_UnpackedTarball_get_dir,curl)/builds/libcurl-vc12-$(if $(filter X86_64,$(CPUNAME)),x64,x86)-$(if $(MSVC_USE_DEBUG_RUNTIME),debug,release)-dll-ipv6-sspi-winssl/lib/libcurl$(if $(MSVC_USE_DEBUG_RUNTIME),_debug).lib \
$(call gb_UnpackedTarball_get_dir,curl)/builds/libcurl-vc12-$(gb_MSBUILD_PLATFORM)-$(gb_MSBUILD_CONFIG)-dll-ipv6-sspi-winssl/lib/libcurl$(if $(MSVC_USE_DEBUG_RUNTIME),_debug).lib \
)
else
$(call gb_LinkTarget_add_libs,$(1),\
external/cppunit/ExternalProject_cppunit.mk
Vendored
+2 -2
View File
@@ -17,8 +17,8 @@ ifeq ($(OS),WNT)
$(call gb_ExternalProject_get_state_target,cppunit,build) :
$(call gb_Trace_StartRange,cppunit,EXTERNAL)
$(call gb_ExternalProject_run,build,\
PROFILEFLAGS="$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
/p:Platform=$(if $(filter INTEL,$(CPUNAME)),Win32,x64) \
PROFILEFLAGS="$(gb_MSBUILD_CONFIG) \
/p:Platform=$(gb_MSBUILD_PLATFORM) \
$(if $(filter 160,$(VCVER)),/p:PlatformToolset=v142 /p:VisualStudioVersion=16.0 /ToolsVersion:Current) \
$(if $(filter 10,$(WINDOWS_SDK_VERSION)),/p:WindowsTargetPlatformVersion=$(UCRTVERSION))" \
&& msbuild.exe cppunit_dll.vcxproj /p:Configuration=$${PROFILEFLAGS} \
external/curl/ExternalPackage_curl.mk
Vendored
+1 -1
View File
@@ -14,7 +14,7 @@ $(eval $(call gb_ExternalPackage_use_external_project,curl,curl))
ifneq ($(DISABLE_DYNLOADING),TRUE)
ifeq ($(COM),MSC)
$(eval $(call gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl$(if $(MSVC_USE_DEBUG_RUNTIME),_debug).dll,builds/libcurl-vc12-$(if $(filter X86_64,$(CPUNAME)),x64,x86)-$(if $(MSVC_USE_DEBUG_RUNTIME),debug,release)-dll-ipv6-sspi-winssl/bin/libcurl$(if $(MSVC_USE_DEBUG_RUNTIME),_debug).dll))
$(eval $(call gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl$(if $(MSVC_USE_DEBUG_RUNTIME),_debug).dll,builds/libcurl-vc12-$(gb_MSBUILD_PLATFORM)-$(gb_MSBUILD_CONFIG)-dll-ipv6-sspi-winssl/bin/libcurl$(if $(MSVC_USE_DEBUG_RUNTIME),_debug).dll))
else ifeq ($(OS),MACOSX)
$(eval $(call gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl.4.dylib,lib/.libs/libcurl.4.dylib))
else ifeq ($(OS),AIX)
external/curl/ExternalProject_curl.mk
Vendored
+1 -1
View File
@@ -81,7 +81,7 @@ $(call gb_ExternalProject_get_state_target,curl,build):
nmake -f Makefile.vc \
mode=dll \
VC=12 \
$(if $(filter X86_64,$(CPUNAME)),MACHINE=x64,MACHINE=x86) \
MACHINE=$(gb_MSBUILD_PLATFORM) \
GEN_PDB=$(if $(call gb_Module__symbols_enabled,curl),yes,no) \
DEBUG=$(if $(MSVC_USE_DEBUG_RUNTIME),yes,no) \
ENABLE_IPV6=yes \
external/lcms2/ExternalProject_lcms2.mk
Vendored
+1 -3
View File
@@ -14,15 +14,13 @@ $(eval $(call gb_ExternalProject_register_targets,lcms2,\
))
ifeq ($(COM),MSC)
$(call gb_ExternalProject_get_state_target,lcms2,build):
$(call gb_Trace_StartRange,lcms2,EXTERNAL)
$(call gb_ExternalProject_run,build,\
MSBuild.exe lcms2_DLL.vcxproj \
$(gb_MSBUILD_CONFIG_AND_PLATFORM) /p:TargetName=lcms2 \
$(if $(filter 160,$(VCVER)),/p:PlatformToolset=v142 /p:VisualStudioVersion=16.0 /ToolsVersion:Current) \
$(if $(filter 10,$(WINDOWS_SDK_VERSION)),/p:WindowsTargetPlatformVersion=$(UCRTVERSION)) \
/p:Configuration=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
/p:Platform=$(if $(filter INTEL,$(CPUNAME)),Win32,x64) /p:TargetName=lcms2 \
,Projects/VC2019/lcms2_DLL)
$(call gb_Trace_EndRange,lcms2,EXTERNAL)
else
external/python3/ExternalProject_python3.mk
Vendored
+1 -9
View File
@@ -30,20 +30,12 @@ ifeq ($(OS),WNT)
# TODO: using Debug configuration and related mangling of pyconfig.h
python3_WIN_PLATFORM_MSBUILD := $(strip \
$(if $(filter INTEL,$(CPUNAME)),Win32) \
$(if $(filter X86_64,$(CPUNAME)),x64) \
$(if $(filter ARM64,$(CPUNAME)),arm64) \
)
# at least for MSVC 2008 it is necessary to clear MAKEFLAGS because
# nmake is invoked
$(call gb_ExternalProject_get_state_target,python3,build) :
$(call gb_Trace_StartRange,python3,EXTERNAL)
$(call gb_ExternalProject_run,build,\
MAKEFLAGS= MSBuild.exe pcbuild.sln /t:Build \
/p:Configuration=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
/p:Platform=$(python3_WIN_PLATFORM_MSBUILD) \
MAKEFLAGS= MSBuild.exe pcbuild.sln /t:Build $(gb_MSBUILD_CONFIG_AND_PLATFORM) \
/p:opensslIncludeDir=$(call gb_UnpackedTarball_get_dir,openssl)/include \
/p:opensslOutDir=$(call gb_UnpackedTarball_get_dir,openssl) \
/p:zlibDir=$(call gb_UnpackedTarball_get_dir,zlib) \
solenv/gbuild/platform/windows.mk
+10
View File
@@ -42,4 +42,14 @@ gb_Executable_LAYER := \
# empty to avoid --warn-undefined-functions
gb_Library__set_soversion_script_platform =
# default platform and configuration values used by msbuild
gb_MSBUILD_CONFIG := $(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release)
gb_MSBUILD_PLATFORM := $(strip \
$(if $(filter INTEL,$(CPUNAME)),Win32) \
$(if $(filter X86_64,$(CPUNAME)),x64) \
)
gb_MSBUILD_CONFIG_AND_PLATFORM := \
/p:Configuration=$(gb_MSBUILD_CONFIG) \
/p:Platform=$(gb_MSBUILD_PLATFORM)
# vim:set noexpandtab: