Bug 1286286 - Copy VS2015 runtime files for Windows. r+a=IanN
authorFrank-Rainer Grahl <frgrahl@gmx.net>
Sat, 23 Jul 2016 11:22:48 +0800
changeset 27252 d37be8bdb8e3ee6d1a124374bbd93db442cf69fc
parent 27251 ecc56fcf0f7e48fc574c8921fbf819667bb43dc6
child 27253 0e8f0295298db6bc6ca5ee126459a30b19245950
push id1850
push userclokep@gmail.com
push dateWed, 08 Mar 2017 19:29:12 +0000
treeherdercomm-esr52@028df196b2d9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1286286
Bug 1286286 - Copy VS2015 runtime files for Windows. r+a=IanN
suite/installer/Makefile.in
suite/installer/package-manifest.in
--- a/suite/installer/Makefile.in
+++ b/suite/installer/Makefile.in
@@ -98,21 +98,26 @@ endif
 ifdef MOZ_MOVEMAIL
 DEFINES += -DMOZ_MOVEMAIL=1
 endif
 ifdef NECKO_WIFI
 DEFINES += -DNECKO_WIFI=1
 endif
 
 # Set MSVC dlls version to package, if any.
+# With VS2015+ it does not make sense to define the ucrt libs without
+# the base c++ libs and vice versa. 
+ifdef MOZ_NO_DEBUG_RTL
 ifdef WIN32_REDIST_DIR
-ifdef MOZ_NO_DEBUG_RTL
+ifdef WIN_UCRT_REDIST_DIR
 DEFINES += -DMOZ_PACKAGE_MSVC_DLLS=1
 DEFINES += -DMSVC_C_RUNTIME_DLL=$(MSVC_C_RUNTIME_DLL)
 DEFINES += -DMSVC_CXX_RUNTIME_DLL=$(MSVC_CXX_RUNTIME_DLL)
+DEFINES += -DMOZ_PACKAGE_WIN_UCRT_DLLS=1
+endif
 endif
 endif
 
 ifneq (,$(filter WINNT Darwin Android,$(OS_TARGET)))
 DEFINES += -DMOZ_SHARED_MOZGLUE=1
 endif
 
 ifneq (en-US, $(AB_CD))
--- a/suite/installer/package-manifest.in
+++ b/suite/installer/package-manifest.in
@@ -98,30 +98,34 @@
 #ifdef MOZ_D3DCOMPILER_VISTA_DLL
 @BINPATH@/@MOZ_D3DCOMPILER_VISTA_DLL@
 #endif
 
 #ifdef MOZ_D3DCOMPILER_XP_DLL
 @BINPATH@/@MOZ_D3DCOMPILER_XP_DLL@
 #endif
 #endif # MOZ_ANGLE_RENDERER
-#ifdef XP_WIN32
+
+#ifdef XP_WIN
 @BINPATH@/plugin-hang-ui@BIN_SUFFIX@
 #if MOZ_PACKAGE_MSVC_DLLS
 @BINPATH@/@MSVC_C_RUNTIME_DLL@
 @BINPATH@/@MSVC_CXX_RUNTIME_DLL@
+@BINPATH@/api-ms-win-*.dll
+@BINPATH@/ucrtbase.dll
 #endif
 #endif
+
 #ifndef MOZ_SYSTEM_ICU
 @RESPATH@/@ICU_DATA_FILE@
 #endif
 
 [browser]
 ; [Base Browser Files]
-#ifdef XP_WIN32
+#ifdef XP_WIN
 @BINPATH@/@MOZ_APP_NAME@.exe
 #else
 @BINPATH@/@MOZ_APP_NAME@-bin
 @BINPATH@/@MOZ_APP_NAME@
 #endif
 @RESPATH@/application.ini
 @RESPATH@/platform.ini
 #ifdef MOZ_UPDATER