Bug 1257435 - Package Universal CRT DLLs with jsshell; r=glandium
authorGregory Szorc <gps@mozilla.com>
Thu, 17 Mar 2016 15:19:30 -0700
changeset 289501 c1a7ef0126e5296593e71b0922cd0d6eb12cead4
parent 289500 48cc9c0818d01e51498959b0607724dfe8c9f4e8
child 289502 70a45b0e52860c9deab399bdfb9d59492ccecd24
push id19656
push usergwagner@mozilla.com
push dateMon, 04 Apr 2016 13:43:23 +0000
treeherderb2g-inbound@e99061fde28a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs1257435
milestone48.0a1
Bug 1257435 - Package Universal CRT DLLs with jsshell; r=glandium Builds with Visual Studio 2015 require the Universal CRT. While the universal CRT may be present on the target machine, there is no guarantee of this. So, we have to package these DLLs to ensure target machines are able to run js.exe. Similar code to what this commit adds exists in build/win32/Makefile.in. MozReview-Commit-ID: 8LIk1JlKLiT
toolkit/mozapps/installer/upload-files.mk
--- a/toolkit/mozapps/installer/upload-files.mk
+++ b/toolkit/mozapps/installer/upload-files.mk
@@ -77,16 +77,21 @@ endif # MOZ_SYSTEM_NSPR
 
 ifdef MSVC_C_RUNTIME_DLL
   JSSHELL_BINS += $(MSVC_C_RUNTIME_DLL)
 endif
 ifdef MSVC_CXX_RUNTIME_DLL
   JSSHELL_BINS += $(MSVC_CXX_RUNTIME_DLL)
 endif
 
+ifdef WIN_UCRT_REDIST_DIR
+  JSSHELL_BINS += $(notdir $(wildcard $(DIST)/bin/api-ms-win-*.dll))
+  JSSHELL_BINS += ucrtbase.dll
+endif
+
 ifdef MOZ_SHARED_ICU
 ifeq ($(OS_TARGET), WINNT)
 JSSHELL_BINS += \
   icudt$(MOZ_ICU_DBG_SUFFIX)$(MOZ_ICU_VERSION).dll \
   icuin$(MOZ_ICU_DBG_SUFFIX)$(MOZ_ICU_VERSION).dll \
   icuuc$(MOZ_ICU_DBG_SUFFIX)$(MOZ_ICU_VERSION).dll \
   $(NULL)
 else