From 5d09903f31bba3824205b1443d4cc38908692125 Mon Sep 17 00:00:00 2001
From: nakst <>
Date: Thu, 3 Feb 2022 19:03:11 +0000
Subject: [PATCH] start.script add AutomationBuild

---
 util/automation/build.sh  | 104 ---------------------------------
 util/automation/genovf.py |   4 +-
 util/script.c             |  40 ++++++++-----
 util/start.script         | 117 +++++++++++++++++++++++++++++++++++++-
 4 files changed, 144 insertions(+), 121 deletions(-)
 delete mode 100755 util/automation/build.sh

diff --git a/util/automation/build.sh b/util/automation/build.sh
deleted file mode 100755
index 23b6862..0000000
--- a/util/automation/build.sh
+++ /dev/null
@@ -1,104 +0,0 @@
-#!/bin/bash
-set -eux
-
-# TODO:
-# Copy the source onto the drive for self hosting.
-# Producing installer images (including for real hardware).
-
-cd essence
-COMMIT=`git log | head -n 1 | cut -b 8-14`
-
-# Setup config files.
-mkdir -p bin root
-echo "accepted_license=1"                             >> bin/build_config.ini
-echo "automated_build=1"                              >> bin/build_config.ini
-echo "Flag.DEBUG_BUILD=0"                             >> bin/config.ini
-echo "Flag.ENABLE_POSIX_SUBSYSTEM=1"                  >> bin/config.ini
-echo "General.wallpaper=0:/Demo Content/Abstract.jpg" >> bin/config.ini
-echo "General.window_color=5"                         >> bin/config.ini
-
-# Setup toolchain, build the system and ports.
-./start.sh get-toolchain
-./start.sh build-optimised
-./start.sh build-optional-ports > /dev/null
-
-# Copy a few sample files.
-mkdir -p root/Demo\ Content
-cp -r res/Sample\ Images/* root/Demo\ Content/
-cp -r help root/Demo\ Content/
-cp bin/noodle.rom root/Demo\ Content/Noodle.uxn
-cp res/A\ Study\ in\ Scarlet.txt root/Demo\ Content/
-cp res/Theme\ Source.dat root/Demo\ Content/Theme.designer
-cp res/Flip.* root/Demo\ Content/
-cp res/Teapot.obj root/Demo\ Content/
-cp res/Fonts/Atkinson\ Hyperlegible\ Regular.ttf root/Demo\ Content/
-
-# Copy API samples.
-mkdir -p root/API\ Samples
-python util/automation/genapisamples.py
-
-# Enable extra applications.
-echo "util/designer2.ini"         >> bin/extra_applications.ini
-echo "util/build_core.ini"        >> bin/extra_applications.ini
-echo "ports/uxn/emulator.ini"     >> bin/extra_applications.ini
-echo "ports/bochs/bochs.ini"      >> bin/extra_applications.ini
-echo "ports/mesa/obj_viewer.ini"  >> bin/extra_applications.ini
-
-# Build the extra applications.
-./start.sh build-optimised
-cd ..
-
-# Create a virtual machine file.
-mkdir -p ova
-qemu-img convert -f raw essence/bin/drive -O vmdk -o adapter_type=lsilogic,subformat=streamOptimized,compat6 ova/Essence-disk001.vmdk
-python essence/util/automation/genovf.py > ova/Essence.ovf
-cd ova
-tar -cf Essence.ova Essence.ovf Essence-disk001.vmdk
-cd ..
-
-# Copy licenses.
-mkdir -p Essence Essence/Licenses
-cp essence/LICENSE.md Essence/Licenses/Essence\ License.txt
-cp essence/util/nanosvg.h Essence/Licenses/
-cp essence/util/hsluv.h Essence/Licenses/
-cp essence/util/stb_*.h Essence/Licenses/
-cp essence/shared/stb_*.h Essence/Licenses/
-cp essence/res/Fonts/Hack\ License.md Essence/Licenses/
-cp essence/res/Fonts/Inter\ License.txt Essence/Licenses/
-cp essence/res/Fonts/Atkinson\ Hyperlegible\ License.txt Essence/Licenses/
-cp essence/res/Fonts/OpenDyslexic\ License.txt Essence/Licenses/
-cp essence/res/elementary\ Icons\ License.txt Essence/Licenses/
-cp essence/res/Sample\ Images/Licenses.txt Essence/Licenses/Sample\ Images.txt
-cp essence/res/Keyboard\ Layouts/License.txt Essence/Licenses/Keyboard\ Layouts.txt
-cp essence/ports/acpica/licensing.txt Essence/Licenses/ACPICA.txt
-cp essence/ports/bochs/COPYING Essence/Licenses/Bochs.txt
-cp essence/ports/efitoolkit/LICENSE Essence/Licenses/EFI.txt
-cp essence/ports/freetype/FTL.TXT Essence/Licenses/FreeType.txt
-cp essence/ports/harfbuzz/LICENSE Essence/Licenses/HarfBuzz.txt
-cp essence/ports/md4c/LICENSE.md Essence/Licenses/Md4c.txt
-cp essence/ports/musl/COPYRIGHT Essence/Licenses/Musl.txt
-cp essence/ports/uxn/LICENSE Essence/Licenses/Uxn.txt
-cp essence/bin/BusyBox\ License.txt Essence/Licenses/BusyBox.txt
-cp -r essence/bin/FFmpeg\ License Essence/Licenses/
-cp essence/bin/Mesa\ License.html Essence/Licenses/Mesa.html
-cp essence/bin/Nasm\ License.txt Essence/Licenses/Nasm.txt
-cp essence/bin/GCC\ License.txt Essence/Licenses/GCC.txt
-cp essence/bin/Binutils\ License.txt Essence/Licenses/Binutils.txt
-cp essence/bin/GMP\ License.txt Essence/Licenses/GMP.txt
-cp essence/bin/MPFR\ License.txt Essence/Licenses/GMPF.txt
-cp essence/bin/MPC\ License.txt Essence/Licenses/MPC.txt
-
-# Compress the result.
-mv ova/Essence.ova Essence/
-mv essence/bin/drive Essence/
-echo $COMMIT > Essence/commit.txt
-tar -cJf Essence.tar.xz Essence/
-echo $COMMIT > essence/bin/commit.txt
-rm -rf essence/cross essence/.git essence/bin/cache essence/bin/freetype essence/bin/harfbuzz essence/bin/musl essence/root/Applications/POSIX/lib
-tar -cJf debug_info.tar.xz essence
-
-# Set outputs for workflow.
-echo "::set-output name=OUTPUT_BINARY::Essence.tar.xz"
-echo "::set-output name=DEBUG_OUTPUT_BINARY::debug_info.tar.xz"
-echo "::set-output name=RELEASE_NAME::essence-`date +%Y_%m_%d`-${COMMIT}"
-echo "::set-output name=COMMIT::${COMMIT}"
diff --git a/util/automation/genovf.py b/util/automation/genovf.py
index 966fe1e..6916dd9 100644
--- a/util/automation/genovf.py
+++ b/util/automation/genovf.py
@@ -1,10 +1,10 @@
 import os
 import uuid
-template = open('essence/util/automation/template.ovf','r').read().split('$')
+template = open('util/automation/template.ovf','r').read().split('$')
 uuid1 = uuid.uuid4()
 uuid2 = uuid.uuid4()
 print(template[0], end='')
-print(os.path.getsize('essence/bin/drive'), end='')
+print(os.path.getsize('bin/drive'), end='')
 print(template[1], end='')
 print(uuid1, end='')
 print(template[2], end='')
diff --git a/util/script.c b/util/script.c
index 1ad950c..29cdd2d 100644
--- a/util/script.c
+++ b/util/script.c
@@ -5,6 +5,7 @@
 // 	- Other operators: remainder, bitwise shifts, unary minus, bitwise AND/OR/XOR/NOT, ternary.
 // 	- Enums, bitsets.
 // 	- Resolving type identifiers when structs or function pointers contain references to other structs or function pointers.
+// 	- Check that the start function has the correct signature.
 
 // TODO Larger missing features:
 // 	- Serialization.
@@ -360,6 +361,8 @@ Node globalExpressionTypeIntList = { .type = T_LIST, .firstChild = &globalExpres
 
 // Global variables:
 char *scriptSourceDirectory;
+char *startFunction = "Start";
+size_t startFunctionBytes = 5;
 char **options;
 bool *optionsMatched;
 size_t optionCount;
@@ -4446,12 +4449,12 @@ int ScriptExecute(ExecutionContext *context, ImportData *mainModule) {
 	}
 
 	Node n;
-	n.token.textBytes = 5;
-	n.token.text = "Start";
+	n.token.textBytes = startFunctionBytes;
+	n.token.text = startFunction;
 	intptr_t startIndex = ScopeLookupIndex(&n, mainModule->rootNode->scope, true, false);
 
 	if (startIndex == -1) {
-		PrintError3("The script does not have a 'Start' function.\n");
+		PrintError3("The script does not have a start function '%.*s'.\n", startFunctionBytes, startFunction);
 		return 1;
 	}
 
@@ -5512,34 +5515,45 @@ void *FileLoad(const char *path, size_t *length) {
 
 int main(int argc, char **argv) {
 	if (argc < 2) {
-		fprintf(stderr, "Usage: %s <path to script> <script options...>\n", argv[0]);
+		fprintf(stderr, "Usage: %s <engine options...> <path to script> <script options...>\n", argv[0]);
 		return 1;
 	}
 
 	sem_init(&externalCoroutineSemaphore, 0, 0);
 
-	options = argv + 2;
-	optionCount = argc - 2;
-	optionsMatched = (bool *) calloc(argc - 2, sizeof(bool));
+	char *scriptPath = NULL;
 
-	scriptSourceDirectory = (char *) malloc(strlen(argv[1]) + 2);
-	strcpy(scriptSourceDirectory, argv[1]);
+	for (int i = 1; i < argc; i++) {
+		if (argv[i][0] != '-') {
+			scriptPath = argv[i];
+			options = argv + i + 1;
+			optionCount = argc - i - 1;
+			optionsMatched = (bool *) calloc(argc, sizeof(bool));
+			break;
+		} else if (0 == memcmp(argv[i], "--start=", 8)) {
+			startFunction = argv[i] + 8;
+			startFunctionBytes = strlen(argv[i]) - 8;
+		}
+	}
+
+	scriptSourceDirectory = (char *) malloc(strlen(scriptPath) + 2);
+	strcpy(scriptSourceDirectory, scriptPath);
 	char *lastSlash = strrchr(scriptSourceDirectory, '/');
 	if (lastSlash) *lastSlash = 0;
 	else strcpy(scriptSourceDirectory, ".");
 
 	Tokenizer tokenizer = { 0 };
 	ImportData importData = { 0 };
-	importData.path = argv[1];
-	importData.pathBytes = strlen(argv[1]);
-	importData.fileData = FileLoad(argv[1], &tokenizer.inputBytes);
+	importData.path = scriptPath;
+	importData.pathBytes = strlen(scriptPath);
+	importData.fileData = FileLoad(scriptPath, &tokenizer.inputBytes);
 	importData.fileDataBytes = tokenizer.inputBytes;
 	tokenizer.module = &importData;
 	tokenizer.line = 1;
 	tokenizer.input = importData.fileData;
 
 	if (!tokenizer.input) {
-		fprintf(stderr, "Error: Could not load the input file '%s'.\n", argv[1]);
+		fprintf(stderr, "Error: Could not load the input file '%s'.\n", scriptPath);
 		return 1;
 	}
 
diff --git a/util/start.script b/util/start.script
index 44726bd..98ae90a 100644
--- a/util/start.script
+++ b/util/start.script
@@ -3,7 +3,7 @@
 str options #option;
 str target #option;
 
-void Start() {
+void Setup() {
 	SystemShellEnableLogging(false);
 
 	assert PathCreateLeadingDirectories("bin/dependency_files");
@@ -42,7 +42,120 @@ void Start() {
 
 	assert SystemShellExecute("gcc -o bin/build -g util/build.c -pthread -DPARALLEL_BUILD -D%target% "
 			+ "-Wall -Wextra -Wno-missing-field-initializers");
-	SystemShellExecute("bin/build %options%");
+}
 
+void Start() {
+	Setup();
+	SystemShellExecute("bin/build %options%");
 	PrintStdErrHighlight("\n");
 }
+
+void AutomationBuild() {
+	// TODO:
+	// Copy the source onto the drive for self hosting.
+	// Producing installer images (including for real hardware).
+
+	Setup();
+
+	// Create directories.
+	assert PathCreateLeadingDirectories("bin/ova");
+	assert PathCreateLeadingDirectories("root/Demo Content");
+	assert PathCreateLeadingDirectories("root/API Samples");
+	assert PathCreateLeadingDirectories("Essence/Licenses");
+
+	// Setup the config files.
+	assert FileWriteAll("bin/build_config.ini", "accepted_license=1\n"
+			+ "automated_build=1\n");
+	assert FileWriteAll("bin/config.ini", "Flag.DEBUG_BUILD=0\n"
+			+ "Flag.ENABLE_POSIX_SUBSYSTEM=1\n"
+			+ "General.Wallpaper=0:/Demo Content/Abstract.jpg\n"
+			+ "General.window_color=5\n");
+
+	// Setup toolchain, build the system and ports.
+	assert SystemShellExecute("bin/build get-toolchain");
+	assert SystemShellExecute("bin/build build-optimised");
+	assert SystemShellExecute("bin/build build-optional-ports > /dev/null");
+
+	// Copy a few sample files.
+	assert SystemShellExecute("cp -r res/Sample\\ Images/* root/Demo\\ Content/"); // TODO Replace.
+	assert SystemShellExecute("cp -r help root/Demo\\ Content/"); // TODO Replace.
+	assert FileCopy("bin/noodle.rom", "root/Demo Content/Noodle.uxn");
+	assert FileCopy("res/A Study in Scarlet.txt", "root/Demo Content/A Study in Scarlet.txt");
+	assert FileCopy("res/Theme Source.dat", "root/Demo Content/Theme.designer");
+	assert FileCopy("res/Flip.bochsrc", "root/Demo Content/Flip.bochsrc");
+	assert FileCopy("res/Flip.img", "root/Demo Content/Flip.img");
+	assert FileCopy("res/Teapot.obj", "root/Demo Content/Teapot.obj");
+	assert FileCopy("res/Fonts/Atkinson Hyperlegible Regular.ttf", "root/Demo Content/Atkinson Hyperlegible Regular.ttf");
+
+	// Copy API samples.
+	assert SystemShellExecute("python util/automation/genapisamples.py"); // TODO Replace.
+
+	// Enable extra applications and build them.
+	assert FileWriteAll("bin/extra_applications.ini", "util/designer2.ini\n"
+			+ "util/build_core.ini\n"
+			+ "ports/uxn/emulator.ini\n"
+			+ "ports/bochs/bochs.ini\n"
+			+ "ports/mesa/obj_viewer.ini\n");
+	assert SystemShellExecute("bin/build build-optimised");
+
+	// Create a virtual machine file.
+	assert SystemShellExecute("qemu-img convert -f raw bin/drive -O vmdk -o adapter_type=lsilogic,subformat=streamOptimized,compat6 "
+			+ "bin/ova/Essence-disk001.vmdk");
+	assert SystemShellExecute("python util/automation/genovf.py > bin/ova/Essence.ovf"); // TODO Replace.
+	assert SystemShellExecuteWithWorkingDirectory("bin/ova", "tar -cf Essence.ova Essence.ovf Essence-disk001.vmdk");
+
+	// Copy licenses.
+	assert FileCopy("LICENSE.md", "Essence/Licenses/Essence License.txt");
+	assert FileCopy("util/nanosvg.h", "Essence/Licenses/nanosvg.h");
+	assert FileCopy("util/hsluv.h Essence/Licenses/hsluv.h");
+	assert FileCopy("util/stb_ds.h Essence/Licenses/stb_ds.h");
+	assert FileCopy("util/stb_truetype.h Essence/Licenses/stb_truetype.h");
+	assert FileCopy("res/Fonts/Hack License.md", "Essence/Licenses/Hack License.md");
+	assert FileCopy("res/Fonts/Inter License.txt", "Essence/Licenses/Inter License.txt");
+	assert FileCopy("res/Fonts/Atkinson Hyperlegible", "License.txt Essence/Licenses/Atkinson Hyperlegible License.txt");
+	assert FileCopy("res/Fonts/OpenDyslexic License.txt", "Essence/Licenses/OpenDyslexic License.txt");
+	assert FileCopy("res/elementary Icons License.txt", "Essence/Licenses/elementary Icons License.txt");
+	assert FileCopy("res/Sample Images/Licenses.txt", "Essence/Licenses/Sample Images.txt");
+	assert FileCopy("res/Keyboard Layouts/License.txt", "Essence/Licenses/Keyboard Layouts.txt");
+	assert FileCopy("ports/acpica/licensing.txt", "Essence/Licenses/ACPICA.txt");
+	assert FileCopy("ports/bochs/COPYING", "Essence/Licenses/Bochs.txt");
+	assert FileCopy("ports/efitoolkit/LICENSE", "Essence/Licenses/EFI.txt");
+	assert FileCopy("ports/freetype/FTL.TXT", "Essence/Licenses/FreeType.txt");
+	assert FileCopy("ports/harfbuzz/LICENSE", "Essence/Licenses/HarfBuzz.txt");
+	assert FileCopy("ports/md4c/LICENSE.md", "Essence/Licenses/Md4c.txt");
+	assert FileCopy("ports/musl/COPYRIGHT", "Essence/Licenses/Musl.txt");
+	assert FileCopy("ports/uxn/LICENSE", "Essence/Licenses/Uxn.txt");
+	assert FileCopy("bin/BusyBox License.txt", "Essence/Licenses/BusyBox.txt");
+	assert FileCopy("bin/Mesa License.html", "Essence/Licenses/Mesa.html");
+	assert FileCopy("bin/Nasm License.txt", "Essence/Licenses/Nasm.txt");
+	assert FileCopy("bin/GCC License.txt", "Essence/Licenses/GCC.txt");
+	assert FileCopy("bin/Binutils License.txt", "Essence/Licenses/Binutils.txt");
+	assert FileCopy("bin/GMP License.txt", "Essence/Licenses/GMP.txt");
+	assert FileCopy("bin/MPFR License.txt", "Essence/Licenses/GMPF.txt");
+	assert FileCopy("bin/MPC License.txt", "Essence/Licenses/MPC.txt");
+	assert FileCopy("bin/FFmpeg License/COPYING.GPLv2", "Essence/Licenses/FFmpeg GPLv2.txt");
+	assert FileCopy("bin/FFmpeg License/COPYING.GPLv3", "Essence/Licenses/FFmpeg GPLv3.txt");
+	assert FileCopy("bin/FFmpeg License/COPYING.LGPLv2.1", "Essence/Licenses/FFmpeg LGPLv2.1.txt");
+	assert FileCopy("bin/FFmpeg License/COPYING.LGPLv3", "Essence/Licenses/FFmpeg LGPLv3.txt");
+	assert FileCopy("bin/FFmpeg License/LICENSE.md", "Essence/Licenses/FFmpeg.md");
+
+	// Compress the result.
+	str commit = StringSlice(StringSplitByCharacter(SystemShellEvaluate("git log"), "\n", true)[0], 8, 15);
+	assert PathMove("bin/ova/Essence.ova", "Essence/Essence.ova");
+	assert PathMove("bin/drive", "Essence/drive");
+	assert FileWriteAll("Essence/commit.txt", commit);
+	assert FileWriteAll("bin/commit.txt", commit);
+	assert SystemShellExecute("tar -cJf ../Essence.tar.xz Essence/");
+
+	// Compress the debug info.
+	PathDeleteRecursively("cross");
+	PathDeleteRecursively("Essence");
+	PathDeleteRecursively("bin/ova");
+	PathDeleteRecursively("bin/cache");
+	PathDeleteRecursively("bin/freetype");
+	PathDeleteRecursively("bin/harfbuzz");
+	PathDeleteRecursively("bin/musl");
+	PathDeleteRecursively("bin/root/Applications/POSIX/lib");
+	PathDeleteRecursively(".git");
+	assert SystemShellExecuteWithWorkingDirectory("..", "tar -cJf debug_info.tar.xz essence");
+}