Skip to content

Commit

Permalink
Added some debug
Browse files Browse the repository at this point in the history
  • Loading branch information
CreepPork committed Jun 22, 2019
1 parent 94d5fde commit 0ea5c07
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 32 deletions.
4 changes: 3 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,13 @@ release: clean version commit

releaseCI: clean version
@"$(MAKE)" $(MAKEFLAGS) signatures
@echo " TAR $(ZIP)_$(VERSION_F).tar.gz"
@echo " TAR $(ZIP)_$(VERSION_F)-$(GIT_HASH).tar.gz"
@cp mod.cpp README.md AUTHORS.txt LICENSE logo_achilles_ca.paa $(BIN)
@tar -czf $(ZIP)_$(VERSION_F)-$(GIT_HASH).tar.gz $(BIN)
@ls

clean:
rm -rf $(BIN) $(ZIP)_*.zip
rm -rf $(BIN) $(ZIP)_*.tar.gz

.PHONY: all filepatching signatures extensions extensions-win64 version commit push release releaseCI clean
31 changes: 0 additions & 31 deletions tools/make.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -85,27 +85,6 @@ function Update-Armake {
Remove-Item "$PSScriptRoot\temp" -Recurse -Force
}


function Build-Directory {
param(
[Parameter(Mandatory=$True)]
$directory
)

$component = $directory.Name
$fullPath = $directory.FullName
$parent = $directory.Parent
$binPath = "$projectRoot\@achilles\$parent\achilles_$component.pbo"

Write-Output " PBO $component"
& $armake build -i "$projectRoot\include" -w unquoted-string -w redefinition-wo-undef -f $fullPath $binPath

if ($LastExitCode -ne 0) {
Write-Error "Failed to build $component."
}
}


function Main {
$installed = Get-InstalledArmakeVersion
$latest = Get-LatestArmakeVersion
Expand All @@ -115,16 +94,6 @@ function Main {
Update-Armake ($downloadPage -f $latest)
Write-Output "Update complete, armake up-to-date."
}

$orgLocation = Get-Location
Set-Location -Path $projectRoot
foreach ($folder in "addons") {
New-Item "$projectRoot\@achilles\$folder" -ItemType "directory" -Force | Out-Null
foreach ($component in Get-ChildItem -Directory "$PSScriptRoot\..\$folder") {
Build-Directory $component
}
}
Set-Location $orgLocation
}

Main

0 comments on commit 0ea5c07

Please sign in to comment.