Bug 1313787 - Find relevant dlls on Windows when packaging an artifact build. r=glandium
authorChris Manchester <cmanchester@mozilla.com>
Fri, 11 Nov 2016 00:20:17 -0800
changeset 322611 7d6d40b8751d9cb1cb950fe9a7fe130a46f66f6c
parent 322610 ee65eebbbef90bb6a73b7be5ebadac176d875e88
child 322612 c3b28797c209b71e2e966dc41bd0c228ba3196df
push id30958
push usercbook@mozilla.com
push dateWed, 16 Nov 2016 13:04:28 +0000
treeherdermozilla-central@2598a93e2e1a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs1313787
milestone53.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1313787 - Find relevant dlls on Windows when packaging an artifact build. r=glandium MozReview-Commit-ID: KJq8ouh6Umi
browser/installer/package-manifest.in
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -104,16 +104,24 @@
 #ifdef MOZ_ICU_DATA_ARCHIVE
 @RESPATH@/@ICU_DATA_FILE@
 #endif
 #ifdef MOZ_GTK3
 @BINPATH@/@DLL_PREFIX@mozgtk@DLL_SUFFIX@
 @BINPATH@/gtk2/@DLL_PREFIX@mozgtk@DLL_SUFFIX@
 #endif
 
+; We don't have a complete view of which dlls to expect when doing an artifact
+; build because we haven't run all of configure, so we trust what's in
+; dist/bin, because everything there was extracted from our original build's
+; package.
+#if defined(MOZ_ARTIFACT_BUILDS) && defined(XP_WIN)
+@BINPATH@/*.dll
+#endif
+
 [browser]
 ; [Base Browser Files]
 #ifndef XP_UNIX
 @BINPATH@/@MOZ_APP_NAME@.exe
 @BINPATH@/firefox.VisualElementsManifest.xml
 @BINPATH@/browser/VisualElements/VisualElements_150.png
 @BINPATH@/browser/VisualElements/VisualElements_70.png
 #else