From 0b2f7b13a12a23beea07b8a3e6d7eb4f981f6215 Mon Sep 17 00:00:00 2001
From: Mikayla Fischler <mikayla@ky8.io>
Date: Sat, 29 Jun 2024 15:14:43 -0400
Subject: [PATCH] moved build scripts to new build directory

---
 .github/workflows/manifest.yml | 4 ++--
 imgen.py => build/imgen.py     | 6 +++++-
 safemin.py => build/safemin.py | 0
 3 files changed, 7 insertions(+), 3 deletions(-)
 rename imgen.py => build/imgen.py (97%)
 rename safemin.py => build/safemin.py (100%)

diff --git a/.github/workflows/manifest.yml b/.github/workflows/manifest.yml
index efafe3d..565363b 100644
--- a/.github/workflows/manifest.yml
+++ b/.github/workflows/manifest.yml
@@ -46,7 +46,7 @@ jobs:
       - name: Generate manifest and shields for main branch
         id: manifest-main
         if: ${{ (success() || failure()) && steps.checkout-main.outcome == 'success' }}
-        run: python imgen.py shields
+        run: python ./build/imgen.py shields
       - name: Save main's manifest
         if: ${{ (success() || failure()) && steps.manifest-main.outcome == 'success' }}
         run: mv install_manifest.json deploy/manifests/main
@@ -61,7 +61,7 @@ jobs:
       - name: Generate manifest for devel
         id: manifest-devel
         if: ${{ (success() || failure()) && steps.checkout-devel.outcome == 'success' }}
-        run: python imgen.py
+        run: python ./build/imgen.py
       - name: Save devel's manifest
         if: ${{ (success() || failure()) && steps.manifest-devel.outcome == 'success' }}
         run: mv install_manifest.json deploy/manifests/devel
diff --git a/imgen.py b/build/imgen.py
similarity index 97%
rename from imgen.py
rename to build/imgen.py
index a854b1f..265f786 100644
--- a/imgen.py
+++ b/build/imgen.py
@@ -44,9 +44,11 @@ def get_version(path, is_lib = False):
 
 # generate installation manifest object
 def make_manifest(size):
+    os.chdir('./_minified')
+
     manifest = {
         "versions" : {
-            "installer" : get_version("./ccmsi.lua"),
+            "installer" : get_version("../ccmsi.lua"),
             "bootloader" : get_version("./startup.lua"),
             "common" : get_version("./scada-common/util.lua", True),
             "comms" : get_version("./scada-common/comms.lua", True),
@@ -95,6 +97,8 @@ def make_manifest(size):
         }
     }
 
+    os.chdir('../')
+
     return manifest
 
 # write initial manifest with placeholder size
diff --git a/safemin.py b/build/safemin.py
similarity index 100%
rename from safemin.py
rename to build/safemin.py