Skip to content

Merge base/mod script compilation into a single _RunMake() #98

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
marlonrichert wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Merge base/mod script compilation into a single _RunMake() #98

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 13 additions & 32 deletions build_common.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,11 +114,10 @@ class BuildProject {
$this._PerformStep({ ($_)._CopyToSrc() }, "Populating", "Populated", "Development\Src folder")
$this._PerformStep({ ($_)._RunPreMakeHooks() }, "Running", "Ran", "Pre-Make hooks")
$this._PerformStep({ ($_)._CheckCleanCompiled() }, "Verifying", "Verified", "compiled script packages")
$this._PerformStep({ ($_)._RunMakeBase() }, "Compiling", "Compiled", "base-game script packages")
}

if ($this._HasScriptPackages()) {
$this._PerformStep({ ($_)._RunMakeMod() }, "Compiling", "Compiled", "mod script packages")
if ($this._ShouldCompileBase() -or $this._HasScriptPackages()) {
$this._PerformStep({ ($_)._RunMake() }, "Compiling", "Compiled", "script packages")
}

if ($this._ShouldCompileBase()) {
Expand Down Expand Up @@ -535,42 +534,24 @@ class BuildProject {
$lastBuildDetails | ConvertTo-Json | Set-Content -Path $this.makeFingerprintsPath
}

[void]_RunMakeBase() {
# build the base game scripts
[void]_RunMake() {
$scriptsMakeArguments = "make -nopause -unattended"
if ($this.final_release -eq $true)
{
$scriptsMakeArguments = "$scriptsMakeArguments -final_release"
}
if ($this.debug -eq $true)
{
$scriptsMakeArguments = "$scriptsMakeArguments -debug"
$scope = "base game scripts"
if ($this._HasScriptPackages()) {
$scriptsMakeArguments += " -mods $($this.modNameCanonical) $($this.stagingPath)"
$scope = "mod scripts"
}

$handler = [MakeStdoutReceiver]::new($this)
$handler.processDescr = "compiling base game scripts"
$this._InvokeEditorCmdlet($handler, $scriptsMakeArguments, 50)

# If we build in final release, we must build the normal scripts too
if ($this.final_release -eq $true)
{
Write-Host "Compiling base game scripts without final_release..."
$scriptsMakeArguments = "make -nopause -unattended"
$handler = [MakeStdoutReceiver]::new($this)
$handler.processDescr = "compiling base game scripts"
$this._InvokeEditorCmdlet($handler, $scriptsMakeArguments, 50)
if ($this.final_release -eq $true) {
Write-Host "Compiling $scope with and without final_release..."
$this._InvokeMake($scope, "$scriptsMakeArguments -final_release")
}
$this._InvokeMake($scope, "$scriptsMakeArguments$(if ($this.debug -eq $true) { " -debug" })")
}

[void]_RunMakeMod() {
# build the mod's scripts
$scriptsMakeArguments = "make -nopause -mods $($this.modNameCanonical) $($this.stagingPath)"
if ($this.debug -eq $true)
{
$scriptsMakeArguments = "$scriptsMakeArguments -debug"
}
[void]_InvokeMake($scope, $scriptsMakeArguments) {
$handler = [MakeStdoutReceiver]::new($this)
$handler.processDescr = "compiling mod scripts"
$handler.processDescr = "compiling $scope"
$this._InvokeEditorCmdlet($handler, $scriptsMakeArguments, 50)
}

Expand Down