From e0fb40418ddcf1f834363a9cb53a42f181aabd43 Mon Sep 17 00:00:00 2001 From: Felipe Noronha Date: Thu, 8 Oct 2015 01:31:15 -0300 Subject: [PATCH] [master] bump version of embedded git for windows --- Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 8890e06a23f08..963a13a0b9186 100644 --- a/Makefile +++ b/Makefile @@ -594,7 +594,8 @@ ifneq (,$(filter $(ARCH), i386 i486 i586 i686)) 7z x -y 7z920.exe 7z.exe 7z.dll && \ ../contrib/windows/winrpm.sh http://download.opensuse.org/repositories/windows:/mingw:/win32/openSUSE_13.1 \ "mingw32-libgfortran3 mingw32-libquadmath0 mingw32-libstdc++6 mingw32-libgcc_s_sjlj1 mingw32-libssp0 mingw32-libexpat1 mingw32-zlib1" && \ - cp usr/i686-w64-mingw32/sys-root/mingw/bin/*.dll . + cp usr/i686-w64-mingw32/sys-root/mingw/bin/*.dll . && \ + $(JLDOWNLOAD) PortableGit.7z https://github.com/git-for-windows/git/releases/download/v2.6.1.windows.1/PortableGit-2.6.1-32-bit.7z.exe else ifeq ($(ARCH),x86_64) cd $(JULIAHOME)/dist-extras && \ $(JLDOWNLOAD) 7z920-x64.msi http://downloads.sourceforge.net/sevenzip/7z920-x64.msi && \ @@ -603,7 +604,8 @@ else ifeq ($(ARCH),x86_64) mv _7z.exe 7z.exe && \ ../contrib/windows/winrpm.sh http://download.opensuse.org/repositories/windows:/mingw:/win64/openSUSE_13.1 \ "mingw64-libgfortran3 mingw64-libquadmath0 mingw64-libstdc++6 mingw64-libgcc_s_seh1 mingw64-libssp0 mingw64-libexpat1 mingw64-zlib1" && \ - cp usr/x86_64-w64-mingw32/sys-root/mingw/bin/*.dll . + cp usr/x86_64-w64-mingw32/sys-root/mingw/bin/*.dll . && \ + $(JLDOWNLOAD) PortableGit.7z https://github.com/git-for-windows/git/releases/download/v2.6.1.windows.1/PortableGit-2.6.1-64-bit.7z.exe else $(error no win-extras target for ARCH=$(ARCH)) endif @@ -615,5 +617,4 @@ endif chmod a+x 7z.dll && \ $(call spawn,./7z.exe) x -y -onsis nsis-2.46.5-Unicode-setup.exe && \ chmod a+x ./nsis/makensis.exe && \ - chmod a+x busybox.exe && \ - $(JLDOWNLOAD) PortableGit.7z https://github.com/msysgit/msysgit/releases/download/Git-1.9.5-preview20141217/PortableGit-1.9.5-preview20141217.7z + chmod a+x busybox.exe