Skip to content

Commit

Permalink
Merge branch '1.1.4.1' into development
Browse files Browse the repository at this point in the history
  • Loading branch information
MartiUK committed Aug 31, 2014
2 parents a39c632 + 9822fa8 commit 75801cb
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 2 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@ vendor/*
config/.history
Thumbs.db
*.exe
build/
build/
Version v*
Binary file removed msvcp110.dll
Binary file not shown.
Binary file added msvcp120.dll
Binary file not shown.
Binary file removed msvcr110.dll
Binary file not shown.
Binary file added msvcr120.dll
Binary file not shown.
10 changes: 9 additions & 1 deletion scripts/utils.ps1
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
function Ensure-Exists ($path) {
if (-not (Test-Path $path)) {
Write-Error "Missing required $path! Ensure it is installed"
exit 1
}
return $true > $null
}

function Ensure-Executable ($command) {
try { Get-Command $command -ErrorAction Stop > $null }
catch {
Expand Down Expand Up @@ -47,4 +55,4 @@ function Flatten-Directory ($name) {

function Digest-MD5 ($path) {
return Invoke-Expression "md5sum $path"
}
}

0 comments on commit 75801cb

Please sign in to comment.