Skip to content

Commit

Permalink
Bump to 1.22.0 Beta
Browse files Browse the repository at this point in the history
  • Loading branch information
robojumper authored and Iridar committed Jul 2, 2021
1 parent 92cada9 commit 03ac46e
Show file tree
Hide file tree
Showing 8 changed files with 29 additions and 34 deletions.
9 changes: 2 additions & 7 deletions .scripts/build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ Write-Host "Sourcing $common"

$builder = [BuildProject]::new("X2WOTCCommunityHighlander", $srcDirectory, $sdkPath, $gamePath)

$dev = $false
$compiletest = $false

Write-Host "Configuration: $($config)"
Expand All @@ -21,16 +20,12 @@ switch ($config)
{
"debug" {
$builder.EnableDebug()
$dev = $true
}
"compiletest" {
$builder.EnableDebug()
$compiletest = $true
$dev = $true
}
"default" {
$dev = $true
}
"default" { }
"final_release" {
$builder.EnableFinalRelease()
}
Expand Down Expand Up @@ -59,7 +54,7 @@ if (Test-Path "$srcDirectory\WorkshopID")
}

$builder.AddPreMakeHook({
if ($dev) {
if ($config -ne "stable") {
Write-Host "Updating version and commit..."
& "$srcDirectory\.scripts\update_version.ps1" -ps "$srcDirectory\VERSION.ps1" -srcDirectory "$sdkPath\Development\Src\" -use_commit
} else {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ var string Commit;
// AUTO-CODEGEN: Version-Info
defaultproperties
{
MajorVersion = 1;
MinorVersion = 20;
PatchVersion = 0;
Commit = "%COMMIT%";
MajorVersion = 1;
MinorVersion = 22;
PatchVersion = 0;
Commit = "";
}
8 changes: 4 additions & 4 deletions VERSION.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ $version_block = @'
// AUTO-CODEGEN: Version-Info
defaultproperties
{
MajorVersion = 1;
MinorVersion = 21;
PatchVersion = 1;
Commit = "%COMMIT%";
MajorVersion = 1;
MinorVersion = 22;
PatchVersion = 0;
Commit = "%COMMIT%";
}
'@
8 changes: 4 additions & 4 deletions X2WOTCCommunityHighlander/Src/Core/Classes/CHCoreVersion.uc
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ var string Commit;
// AUTO-CODEGEN: Version-Info
defaultproperties
{
MajorVersion = 1;
MinorVersion = 21;
PatchVersion = 1;
Commit = "RC1";
MajorVersion = 1;
MinorVersion = 22;
PatchVersion = 0;
Commit = "";
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ var string Commit;
// AUTO-CODEGEN: Version-Info
defaultproperties
{
MajorVersion = 1;
MinorVersion = 21;
PatchVersion = 1;
Commit = "RC1";
MajorVersion = 1;
MinorVersion = 22;
PatchVersion = 0;
Commit = "";
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ var string Commit;
// AUTO-CODEGEN: Version-Info
defaultproperties
{
MajorVersion = 1;
MinorVersion = 21;
PatchVersion = 1;
Commit = "%COMMIT%";
MajorVersion = 1;
MinorVersion = 22;
PatchVersion = 0;
Commit = "";
}
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ static function array<X2DataTemplate> CreateTemplates()
// AUTO-CODEGEN: Version-Info
defaultproperties
{
MajorVersion = 1;
MinorVersion = 21;
PatchVersion = 1;
Commit = "RC1";
MajorVersion = 1;
MinorVersion = 22;
PatchVersion = 0;
Commit = "";
}
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,8 @@ function int GetVersionNumber()
defaultproperties
{
MajorVersion = 1;
MinorVersion = 21;
PatchVersion = 1;
Commit = "RC1";
MinorVersion = 22;
PatchVersion = 0;
Commit = "";
}

0 comments on commit 03ac46e

Please sign in to comment.