Bug 1313787 - Find relevant dlls on Windows when packaging an artifact build. r=glandium draft
authorChris Manchester <cmanchester@mozilla.com>
Fri, 11 Nov 2016 00:20:17 -0800
changeset 437483 1fc3f2ca3b70ab8894358349941a177bde3fce0e
parent 437246 d38d06f85ef59c5dbb5d4a1a8d895957a78714de
child 536651 1dc54ae89690854fa207645faefb857c856b5e89
push id35426
push userbmo:cmanchester@mozilla.com
push dateFri, 11 Nov 2016 00:20:43 +0000
reviewersglandium
bugs1313787
milestone52.0a1
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