Skip to content

Commit de30806

Browse files
committed
Merge pull request #13494 from felipenoris/fn/wgit
[master] bump version of embedded git for windows
2 parents 38299b7 + e0fb404 commit de30806

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

Makefile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -594,7 +594,8 @@ ifneq (,$(filter $(ARCH), i386 i486 i586 i686))
594594
7z x -y 7z920.exe 7z.exe 7z.dll && \
595595
../contrib/windows/winrpm.sh http://download.opensuse.org/repositories/windows:/mingw:/win32/openSUSE_13.1 \
596596
"mingw32-libgfortran3 mingw32-libquadmath0 mingw32-libstdc++6 mingw32-libgcc_s_sjlj1 mingw32-libssp0 mingw32-libexpat1 mingw32-zlib1" && \
597-
cp usr/i686-w64-mingw32/sys-root/mingw/bin/*.dll .
597+
cp usr/i686-w64-mingw32/sys-root/mingw/bin/*.dll . && \
598+
$(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
598599
else ifeq ($(ARCH),x86_64)
599600
cd $(JULIAHOME)/dist-extras && \
600601
$(JLDOWNLOAD) 7z920-x64.msi http://downloads.sourceforge.net/sevenzip/7z920-x64.msi && \
@@ -603,7 +604,8 @@ else ifeq ($(ARCH),x86_64)
603604
mv _7z.exe 7z.exe && \
604605
../contrib/windows/winrpm.sh http://download.opensuse.org/repositories/windows:/mingw:/win64/openSUSE_13.1 \
605606
"mingw64-libgfortran3 mingw64-libquadmath0 mingw64-libstdc++6 mingw64-libgcc_s_seh1 mingw64-libssp0 mingw64-libexpat1 mingw64-zlib1" && \
606-
cp usr/x86_64-w64-mingw32/sys-root/mingw/bin/*.dll .
607+
cp usr/x86_64-w64-mingw32/sys-root/mingw/bin/*.dll . && \
608+
$(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
607609
else
608610
$(error no win-extras target for ARCH=$(ARCH))
609611
endif
@@ -615,5 +617,4 @@ endif
615617
chmod a+x 7z.dll && \
616618
$(call spawn,./7z.exe) x -y -onsis nsis-2.46.5-Unicode-setup.exe && \
617619
chmod a+x ./nsis/makensis.exe && \
618-
chmod a+x busybox.exe && \
619-
$(JLDOWNLOAD) PortableGit.7z https://github.com/msysgit/msysgit/releases/download/Git-1.9.5-preview20141217/PortableGit-1.9.5-preview20141217.7z
620+
chmod a+x busybox.exe

0 commit comments

Comments
 (0)