github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-21 05:43:48 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fix

Browse source
This commit is contained in:
Gator96100 2020-10-06 00:13:09 +02:00
commit bba256532f
1 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

13
appveyor.yml
View file

@ -2,7 +2,7 @@ version: 3.0.1.{build}
image: Visual Studio 2019 image: Visual Studio 2019
clone_folder: C:\ProxSpace\pm3\proxmark clone_folder: C:\ProxSpace\pm3\proxmark
cache: cache:
- C:\ps-cache - C:\ps-cache -> appveyor.yml
environment: environment:
proxspace_url: https://github.com/Gator96100/ProxSpace/archive/master.zip proxspace_url: https://github.com/Gator96100/ProxSpace/archive/master.zip
proxspace_zip_file: \proxspace.zip proxspace_zip_file: \proxspace.zip
@ -52,8 +52,6 @@ clone_script:
Write-Host "[ OK ]" -ForegroundColor Green Write-Host "[ OK ]" -ForegroundColor Green
} }
$global:wsl_install_running = true
$WSLjob = Start-Job -Name WSLInstall -ScriptBlock { $WSLjob = Start-Job -Name WSLInstall -ScriptBlock {
Function WSLExec($Text, $Cmd) { Function WSLExec($Text, $Cmd) {
Write-Host "$Text" Write-Host "$Text"
@ -69,7 +67,7 @@ clone_script:
WSLExec "WSL install..." "sudo apt-get -y install --reinstall --no-install-recommends git ca-certificates build-essential pkg-config libreadline-dev gcc-arm-none-eabi libnewlib-dev libbz2-dev qtbase5-dev cmake 1>/dev/null" WSLExec "WSL install..." "sudo apt-get -y install --reinstall --no-install-recommends git ca-certificates build-essential pkg-config libreadline-dev gcc-arm-none-eabi libnewlib-dev libbz2-dev qtbase5-dev cmake 1>/dev/null"
WSLExec "WSL QT fix..." "sudo strip --remove-section=.note.ABI-tag /usr/lib/x86_64-linux-gnu/libQt5Core.so.5" WSLExec "WSL QT fix..." "sudo strip --remove-section=.note.ABI-tag /usr/lib/x86_64-linux-gnu/libQt5Core.so.5"
Add-AppveyorMessage -Message "WSL setup took $(([System.Environment]::TickCount-$WSLInstallTime) / 1000) sec" -Category Information Add-AppveyorMessage -Message "WSL setup took $(([System.Environment]::TickCount-$WSLInstallTime) / 1000) sec" -Category Information
$global:wsl_install_running = false New-Item -ItemType "file" -Path "C:\WSL-Finished.txt" -Force
} }
$env:PSInstallTime=[System.Environment]::TickCount $env:PSInstallTime=[System.Environment]::TickCount
@ -237,16 +235,15 @@ build_script:
} }
#WSL: wait for installation to finish #WSL: wait for installation to finish
if($global:wsl_install_running){ if(!(Test-Path "C:\WSL-Finished.txt")){
Write-Host "Waiting for WSL installation to finish..." -NoNewLine Write-Host "Waiting for WSL installation to finish..." -NoNewLine
while($global:wsl_install_running) { while(!(Test-Path "C:\WSL-Finished.txt")) {
Start-Sleep -s 5 Start-Sleep -s 5
} }
Remove-Item -Force "C:\WSL-Finished.txt" -ErrorAction SilentlyContinue
Write-Host "$Name [ OK ]" -ForegroundColor Green Write-Host "$Name [ OK ]" -ForegroundColor Green
} }
Add-AppveyorMessage -Message "WSL start: $global:wsl_install_running" -Category Information
#Windows Subsystem for Linux (WSL) #Windows Subsystem for Linux (WSL)
Write-Host "---------- WSL make ----------" -ForegroundColor Yellow Write-Host "---------- WSL make ----------" -ForegroundColor Yellow
$TestTime=[System.Environment]::TickCount $TestTime=[System.Environment]::TickCount