Skip to content

Commit 3c973ff

Browse files
committed
Merge pull request #170 from vosen/master
Fix gdb install path
2 parents 7ae8508 + a1d7eb8 commit 3c973ff

File tree

6 files changed

+1799
-1791
lines changed

6 files changed

+1799
-1791
lines changed

VisualRust.Setup/gdb/gdb.2013.i686.wxs

Lines changed: 449 additions & 447 deletions
Large diffs are not rendered by default.

VisualRust.Setup/gdb/gdb.2013.x86_64.wxs

Lines changed: 449 additions & 447 deletions
Large diffs are not rendered by default.

VisualRust.Setup/gdb/gdb.2015.i686.wxs

Lines changed: 449 additions & 447 deletions
Large diffs are not rendered by default.

VisualRust.Setup/gdb/gdb.2015.x86_64.wxs

Lines changed: 449 additions & 447 deletions
Large diffs are not rendered by default.

VisualRust/VisualRust.Gdb.msbuild

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<RemoveDir Directories="gdb\$(MingwArch)"/>
2020
<MakeDir Directories="obj" />
2121
<Message Text="Downloading mingw-w64 ($(MingwArch))"/>
22-
<Exec Command="..\..\tools\curl.exe -L -O &quot;$(MingwPath)&quot;" WorkingDirectory="obj"/>
22+
<Exec Command="..\..\tools\curl.exe -k -L -O &quot;$(MingwPath)&quot;" WorkingDirectory="obj"/>
2323
<Exec Command="..\..\tools\7za.exe -ogdb-$(MingwArch) x -y -ir@..\gdb\files_$(MingwArch).txt $(MingwVersion).7z" WorkingDirectory="obj"/>
2424
<ItemGroup>
2525
<_SourcePath Include="obj\gdb-$(MingwArch)\$(MingwRootDir)\**\*.*"/>

VisualRust/VisualRust.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@
307307
</ItemGroup>
308308
</Target>
309309
<Target Name="DownloadGdb" BeforeTargets="BeforeBuild">
310-
<MsBuild Projects="VisualRust.Gdb.msbuild" Targets="DownloadGdb" Properties="MingwVersion=i686-5.1.0-release-posix-dwarf-rt_v4-rev0;MingwRootDir=mingw32;MingwArch=i686;MingwPath=http://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win32/Personal%20Builds/mingw-builds/5.1.0/threads-posix/dwarf/i686-5.1.0-release-posix-dwarf-rt_v4-rev0.7z" />
311-
<MsBuild Projects="VisualRust.Gdb.msbuild" Targets="DownloadGdb" Properties="MingwVersion=x86_64-5.1.0-release-win32-seh-rt_v4-rev0;MingwRootDir=mingw64;MingwArch=x86_64;MingwPath=http://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win64/Personal%20Builds/mingw-builds/5.1.0/threads-win32/seh/x86_64-5.1.0-release-win32-seh-rt_v4-rev0.7z" />
310+
<MsBuild Projects="VisualRust.Gdb.msbuild" Targets="DownloadGdb" Properties="MingwVersion=i686-5.1.0-release-posix-dwarf-rt_v4-rev0;MingwRootDir=mingw32;MingwArch=i686;MingwPath=https://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win32/Personal%20Builds/mingw-builds/5.1.0/threads-posix/dwarf/i686-5.1.0-release-posix-dwarf-rt_v4-rev0.7z" />
311+
<MsBuild Projects="VisualRust.Gdb.msbuild" Targets="DownloadGdb" Properties="MingwVersion=x86_64-5.1.0-release-win32-seh-rt_v4-rev0;MingwRootDir=mingw64;MingwArch=x86_64;MingwPath=https://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win64/Personal%20Builds/mingw-builds/5.1.0/threads-win32/seh/x86_64-5.1.0-release-win32-seh-rt_v4-rev0.7z" />
312312
</Target>
313313
</Project>

0 commit comments

Comments
 (0)