From 931d7e0f30f1282bbc2d8e0895b32c8b90bf4df4 Mon Sep 17 00:00:00 2001
From: elasota <ejlasota@gmail.com>
Date: Mon, 11 May 2020 04:34:43 -0400
Subject: [PATCH] Move install package generation to MakeRelease, fix missing
 read-only attribute on MSI installation houses

---
 ConvertResources.bat | 14 --------------
 MakeRelease.bat      | 19 +++++++++++++++++++
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/ConvertResources.bat b/ConvertResources.bat
index 68463e6..52ae00e 100644
--- a/ConvertResources.bat
+++ b/ConvertResources.bat
@@ -79,18 +79,4 @@ copy /Y GliderProData\ConvertedMovies\*.mov.gpa Packaged\Houses\
 
 attrib +R Packaged\Houses\*
 
-mkdir InstallerPackages
-mkdir InstallerPackages\DefaultHouses
-mkdir InstallerPackages\HousePack1
-mkdir InstallerPackages\LooseDocumentation
-
-copy /Y Packaged\Houses\* InstallerPackages\HousePack1\
-del /Q InstallerPackages\HousePack1\Slumberland.*
-del /Q "InstallerPackages\HousePack1\Demo House.*"
-copy /Y Packaged\Houses\Slumberland.* InstallerPackages\DefaultHouses
-copy /Y "Packaged\Houses\Demo House.*" InstallerPackages\DefaultHouses
-
-copy /Y Documentation\* InstallerPackages\LooseDocumentation\
-del /Q InstallerPackages\LooseDocumentation\readme.txt
-
 pause
diff --git a/MakeRelease.bat b/MakeRelease.bat
index 249928f..7739e96 100644
--- a/MakeRelease.bat
+++ b/MakeRelease.bat
@@ -23,4 +23,23 @@ xcopy /I /E /Y /K Packaged ReleasePkg\Aerofoil\Packaged
 xcopy /I /E /Y /K Resources ReleasePkg\Aerofoil\Resources
 xcopy /I /E /Y /K Documentation ReleasePkg\Aerofoil\Documentation
 
+attrib +R Packaged\Houses\*
+
+mkdir InstallerPackages
+mkdir InstallerPackages\DefaultHouses
+mkdir InstallerPackages\HousePack1
+mkdir InstallerPackages\LooseDocumentation
+
+copy /Y Packaged\Houses\* InstallerPackages\HousePack1\
+del /Q InstallerPackages\HousePack1\Slumberland.*
+del /Q "InstallerPackages\HousePack1\Demo House.*"
+copy /Y Packaged\Houses\Slumberland.* InstallerPackages\DefaultHouses
+copy /Y "Packaged\Houses\Demo House.*" InstallerPackages\DefaultHouses
+
+attrib +R InstallerPackages\DefaultHouses\*
+attrib +R InstallerPackages\HousePack1\*
+
+copy /Y Documentation\* InstallerPackages\LooseDocumentation\
+del /Q InstallerPackages\LooseDocumentation\readme.txt
+
 pause