[tor-commits] [tor-browser-bundle/master] mbsdiff is not linked as mbsdiff.exe anymore.

[gk at torproject.org]

commit 0155dc71e24f434cb463062d1b22eca50d5aabd5
Author: Georg Koppen <gk at torproject.org>
Date:   Fri Sep 12 10:02:23 2014 +0000

    mbsdiff is not linked as mbsdiff.exe anymore.
    
    This got fixed by https://bugzilla.mozilla.org/show_bug.cgi?id=933120.
---
 gitian/descriptors/windows/gitian-firefox.yml |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/gitian/descriptors/windows/gitian-firefox.yml b/gitian/descriptors/windows/gitian-firefox.yml
index 2975ab5..da0c8b1 100644
--- a/gitian/descriptors/windows/gitian-firefox.yml
+++ b/gitian/descriptors/windows/gitian-firefox.yml
@@ -95,14 +95,12 @@ script: |
   i686-w64-mingw32-strip $INSTDIR/Browser/xul.dll
 
   # Make MAR-based update tools available for use during the bundle phase.
-  # Strangely, mbsdiff is linked as mbsdiff.exe even though it is a host
-  # (e.g., Linux) executable.
   MARTOOLS=~/build/mar-tools
   mkdir -p $MARTOOLS
   cp -p config/createprecomplete.py $MARTOOLS/
   cp -p tools/update-packaging/*.sh $MARTOOLS/
   cp -p obj-*/dist/host/bin/mar $MARTOOLS/
-  cp -p obj-*/dist/host/bin/mbsdiff.exe $MARTOOLS/
+  cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/
   cd ~/build
   zip -r mar-tools-win32.zip mar-tools
   cp mar-tools-win32.zip $OUTDIR/