From 69b6d5988e5e7c63c9d7c5cea0e346c1a5d92cf0 Mon Sep 17 00:00:00 2001 From: Fincer Date: Sat, 3 Jun 2017 13:52:23 +0300 Subject: [PATCH] Update Windows script files --- .../patches/windows/windows-d2-ra2-make.patch | 30 ++----------------- data/patches/windows/windows-ra2-make.patch | 24 ++------------- data/windows/install.ps1 | 16 +++++----- 3 files changed, 15 insertions(+), 55 deletions(-) diff --git a/data/patches/windows/windows-d2-ra2-make.patch b/data/patches/windows/windows-d2-ra2-make.patch index d163cce..103ca27 100644 --- a/data/patches/windows/windows-d2-ra2-make.patch +++ b/data/patches/windows/windows-d2-ra2-make.patch @@ -1,35 +1,11 @@ --- a/make.ps1 +++ b/make.ps1 -@@ -71,7 +71,7 @@ +@@ -74,7 +74,7 @@ if ($version -ne $null) { -- $mods = @("mods/ra/mod.yaml", "mods/cnc/mod.yaml", "mods/d2k/mod.yaml", "mods/ts/mod.yaml", "mods/modchooser/mod.yaml", "mods/all/mod.yaml") -+ $mods = @("mods/ra/mod.yaml", "mods/cnc/mod.yaml", "mods/d2k/mod.yaml", "mods/ts/mod.yaml", "mods/ra2/mod.yaml", "mods/d2/mod.yaml", "mods/modchooser/mod.yaml", "mods/all/mod.yaml") +- $mods = @("mods/ra/mod.yaml", "mods/cnc/mod.yaml", "mods/d2k/mod.yaml", "mods/ts/mod.yaml", "mods/modcontent/mod.yaml", "mods/all/mod.yaml") ++ $mods = @("mods/ra/mod.yaml", "mods/cnc/mod.yaml", "mods/d2k/mod.yaml", "mods/ts/mod.yaml", "mods/ra2/mod.yaml", "mods/d2/mod.yaml", "mods/modcontent/mod.yaml", "mods/all/mod.yaml") foreach ($mod in $mods) { $replacement = (gc $mod) -Replace "Version:.*", ("Version: {0}" -f $version) -@@ -111,8 +111,12 @@ - echo "Testing mods..." - echo "Testing Tiberian Sun mod MiniYAML..." - ./OpenRA.Utility.exe ts --check-yaml -+ echo "Testing Red Alert 2 mod MiniYAML..." -+ ./OpenRA.Utility.exe ra2 --check-yaml - echo "Testing Dune 2000 mod MiniYAML..." - ./OpenRA.Utility.exe d2k --check-yaml -+ echo "Testing Dune 2 mod MiniYAML..." -+ ./OpenRA.Utility.exe d2 --check-yaml - echo "Testing Tiberian Dawn mod MiniYAML..." - ./OpenRA.Utility.exe cnc --check-yaml - echo "Testing Red Alert mod MiniYAML..." -@@ -141,6 +145,10 @@ - ./OpenRA.Utility.exe cnc --check-code-style OpenRA.Mods.Cnc - echo "Checking for code style violations in OpenRA.Mods.D2k..." - ./OpenRA.Utility.exe cnc --check-code-style OpenRA.Mods.D2k -+ echo "Checking for code style violations in OpenRA.Mods.D2..." -+ ./OpenRA.Utility.exe d2 --check-code-style OpenRA.Mods.D2 -+ echo "Checking for code style violations in OpenRA.Mods.RA2..." -+ ./OpenRA.Utility.exe ra2 --check-code-style OpenRA.Mods.RA2 - echo "Checking for code style violations in OpenRA.Utility..." - ./OpenRA.Utility.exe cnc --check-code-style OpenRA.Utility - echo "Checking for code style violations in OpenRA.Test..." diff --git a/data/patches/windows/windows-ra2-make.patch b/data/patches/windows/windows-ra2-make.patch index ba06d65..a5ff5cf 100644 --- a/data/patches/windows/windows-ra2-make.patch +++ b/data/patches/windows/windows-ra2-make.patch @@ -1,29 +1,11 @@ --- a/make.ps1 +++ b/make.ps1 -@@ -71,7 +71,7 @@ +@@ -74,7 +74,7 @@ if ($version -ne $null) { -- $mods = @("mods/ra/mod.yaml", "mods/cnc/mod.yaml", "mods/d2k/mod.yaml", "mods/ts/mod.yaml", "mods/modchooser/mod.yaml", "mods/all/mod.yaml") -+ $mods = @("mods/ra/mod.yaml", "mods/cnc/mod.yaml", "mods/d2k/mod.yaml", "mods/ts/mod.yaml", "mods/ra2/mod.yaml", "mods/modchooser/mod.yaml", "mods/all/mod.yaml") +- $mods = @("mods/ra/mod.yaml", "mods/cnc/mod.yaml", "mods/d2k/mod.yaml", "mods/ts/mod.yaml", "mods/modcontent/mod.yaml", "mods/all/mod.yaml") ++ $mods = @("mods/ra/mod.yaml", "mods/cnc/mod.yaml", "mods/d2k/mod.yaml", "mods/ts/mod.yaml", "mods/ra2/mod.yaml", "mods/modcontent/mod.yaml", "mods/all/mod.yaml") foreach ($mod in $mods) { $replacement = (gc $mod) -Replace "Version:.*", ("Version: {0}" -f $version) -@@ -111,6 +111,8 @@ - echo "Testing mods..." - echo "Testing Tiberian Sun mod MiniYAML..." - ./OpenRA.Utility.exe ts --check-yaml -+ echo "Testing Red Alert 2 mod MiniYAML..." -+ ./OpenRA.Utility.exe ra2 --check-yaml - echo "Testing Dune 2000 mod MiniYAML..." - ./OpenRA.Utility.exe d2k --check-yaml - echo "Testing Tiberian Dawn mod MiniYAML..." -@@ -141,6 +143,8 @@ - ./OpenRA.Utility.exe cnc --check-code-style OpenRA.Mods.Cnc - echo "Checking for code style violations in OpenRA.Mods.D2k..." - ./OpenRA.Utility.exe cnc --check-code-style OpenRA.Mods.D2k -+ echo "Checking for code style violations in OpenRA.Mods.RA2..." -+ ./OpenRA.Utility.exe ra2 --check-code-style OpenRA.Mods.RA2 - echo "Checking for code style violations in OpenRA.Utility..." - ./OpenRA.Utility.exe cnc --check-code-style OpenRA.Utility - echo "Checking for code style violations in OpenRA.Test..." diff --git a/data/windows/install.ps1 b/data/windows/install.ps1 index 0f8226a..77ba92f 100755 --- a/data/windows/install.ps1 +++ b/data/windows/install.ps1 @@ -95,7 +95,7 @@ If (Test-Path ".\data\hotfixes\windows\*.patch"){ Remove-Item .\data\windows\*.patch -Force -ErrorAction SilentlyContinue #------------------------------------------------------ -## Prepare Github environment for downloading the source +## Prepare GitHub environment for downloading the source [System.Net.ServicePointManager]::ServerCertificateValidationCallback = {$true} @@ -106,20 +106,20 @@ If (Test-Path ".\data\hotfixes\windows\*.patch"){ #------------------------------------------------------ ## Download OpenRA-bleed source code - "`nDownloading OpenRA source files from Github. Please Stand By." + "`nDownloading OpenRA source files from GitHub. Please stand by." $client.DownloadFile("https://github.com/OpenRA/OpenRA/archive/bleed.zip?ref=bleed",".\data\windows\OpenRA-bleed.zip") #------------------------------------------------------ ## Download Red Alert 2 mod files - "`nDownloading Red Alert 2 mod files from Github. Please Stand By." + "`nDownloading Red Alert 2 mod files from GitHub. Please stand by." $client.DownloadFile("https://github.com/OpenRA/ra2/archive/master.zip?ref=master",".\data\windows\ra2-master.zip") #------------------------------------------------------ ## Download Dune 2 mod files if (-Not ($dune2_install -eq "n") -and -Not ($dune2_install -eq "o")) { - "`nDownloading Dune 2 mod files from Github. Please Stand By." + "`nDownloading Dune 2 mod files from GitHub. Please stand by." $client.DownloadFile("https://github.com/OpenRA/d2/archive/master.zip?ref=master",".\data\windows\d2-master.zip") } @@ -278,6 +278,7 @@ If (Test-Path ".\data\hotfixes\windows\*.patch"){ #These files will conflict with windows-d2-ra2-make.patch & windows-d2-ra2-openra-solution.patch Remove-Item .\data\windows\windows-ra2-make.patch -Force -ErrorAction SilentlyContinue Remove-Item .\data\windows\windows-ra2-openra-solution.patch -Force -ErrorAction SilentlyContinue + Remove-Item .\data\windows\windows-ra2-launchcommand.patch -Force -ErrorAction SilentlyContinue } else { @@ -333,7 +334,7 @@ If (Test-Path ".\data\hotfixes\windows\*.patch"){ (Get-Content .\data\windows\Openra-bleed\mods\ra2\mod.yaml) -replace '{DEV_VERSION}',$ra2_gitversion | Set-Content .\data\windows\Openra-bleed\mods\ra2\mod.yaml # Mod Chooser - (Get-Content .\data\windows\Openra-bleed\mods\modchooser\mod.yaml) -replace '{DEV_VERSION}',$openra_gitversion | Set-Content .\data\windows\Openra-bleed\mods\modchooser\mod.yaml +# (Get-Content .\data\windows\Openra-bleed\mods\modchooser\mod.yaml) -replace '{DEV_VERSION}',$openra_gitversion | Set-Content .\data\windows\Openra-bleed\mods\modchooser\mod.yaml # All (Get-Content .\data\windows\Openra-bleed\mods\all\mod.yaml) -replace '{DEV_VERSION}',$openra_gitversion | Set-Content .\data\windows\Openra-bleed\mods\all\mod.yaml @@ -376,7 +377,7 @@ If (Test-Path ".\data\hotfixes\windows\*.patch"){ Remove-Item -Recurse .\data\windows\OpenRA-bleed\OpenRA.Server Remove-Item -Recurse .\data\windows\OpenRA-bleed\OpenRA.Test Remove-Item -Recurse .\data\windows\OpenRA-bleed\OpenRA.Utility - Remove-Item -Recurse .\data\windows\OpenRA-bleed\OpenRA.GameMonitor +# Remove-Item -Recurse .\data\windows\OpenRA-bleed\OpenRA.GameMonitor Remove-Item -Recurse .\data\windows\OpenRA-bleed\OpenRA.Game Remove-Item -Recurse .\data\windows\OpenRA-bleed\packaging Remove-Item -Recurse .\data\windows\OpenRA-bleed\thirdparty @@ -409,7 +410,8 @@ If (Test-Path ".\data\hotfixes\windows\*.patch"){ Remove-Item .\data\windows\OpenRA-bleed\OpenRA.Platforms.Default.pdb Remove-Item .\data\windows\OpenRA-bleed\OpenRA.Test.nunit Remove-Item .\data\windows\OpenRA-bleed\OpenRA.Test.pdb - Remove-Item .\data\windows\OpenRA-bleed\OpenRA.pdb + Remove-Item .\data\windows\OpenRA-bleed\OpenRA.sln.orig + Remove-Item .\data\windows\OpenRA-bleed\utility.cmd.orig Remove-Item .\data\windows\OpenRA-bleed\OpenRA.Utility.pdb Remove-Item .\data\windows\OpenRA-bleed\AUTHORS