From 9e97a6d414f6af52166ac6f2413b2f2310b99e70 Mon Sep 17 00:00:00 2001
From: netkas <netkas@n64.cc>
Date: Fri, 27 Dec 2024 15:27:57 -0500
Subject: [PATCH] Refactor build process and streamline executable handling

---
 .github/workflows/ncc_workflow.yml | 170 ++++-------------------------
 Makefile                           |  31 ++++--
 main                               |  24 +++-
 project.json                       |  89 +++++++++++----
 4 files changed, 134 insertions(+), 180 deletions(-)

diff --git a/.github/workflows/ncc_workflow.yml b/.github/workflows/ncc_workflow.yml
index 5f5ff8b..647282e 100644
--- a/.github/workflows/ncc_workflow.yml
+++ b/.github/workflows/ncc_workflow.yml
@@ -51,7 +51,7 @@ jobs:
 
       - name: Build project
         run: |
-          ncc build --config release --log-level debug
+          ncc build --config release --build-source --log-level debug
 
       - name: Upload build artifact
         uses: actions/upload-artifact@v4
@@ -100,111 +100,13 @@ jobs:
 
       - name: Build project
         run: |
-          ncc build --config debug --log-level debug
+          ncc build --config debug --build-source --log-level debug
 
       - name: Upload build artifact
         uses: actions/upload-artifact@v4
         with:
           name: debug
           path: build/debug/net.nosial.configlib.ncc
-  release-compressed:
-    runs-on: ubuntu-latest
-    container:
-      image: php:8.3
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Install dependencies
-        run: |
-          apt update -yqq
-          apt install git libpq-dev libzip-dev zip make wget gnupg -yqq
-
-      - name: Install phive
-        run: |
-          wget -O phive.phar https://phar.io/releases/phive.phar
-          wget -O phive.phar.asc https://phar.io/releases/phive.phar.asc
-          gpg --keyserver hkps://keys.openpgp.org --recv-keys 0x9D8A98B29B2D5D79
-          gpg --verify phive.phar.asc phive.phar
-          chmod +x phive.phar
-          mv phive.phar /usr/local/bin/phive
-
-      - name: Install phab
-        run: |
-          phive install phpab --global --trust-gpg-keys 0x2A8299CE842DD38C
-
-      - name: Install latest version of NCC
-        run: |
-          git clone https://git.n64.cc/nosial/ncc.git
-          cd ncc
-          make redist
-          NCC_DIR=$(find build/ -type d -name "ncc_*" | head -n 1)
-          if [ -z "$NCC_DIR" ]; then
-            echo "NCC build directory not found"
-            exit 1
-          fi
-          php "$NCC_DIR/INSTALL" --auto
-          cd .. && rm -rf ncc
-
-      - name: Build project
-        run: |
-          ncc build --config release-compressed --log-level debug
-
-      - name: Upload build artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: release-compressed
-          path: build/release/net.nosial.configlib.gz.ncc
-  debug-compressed:
-    runs-on: ubuntu-latest
-    container:
-      image: php:8.3
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Install dependencies
-        run: |
-          apt update -yqq
-          apt install git libpq-dev libzip-dev zip make wget gnupg -yqq
-
-      - name: Install phive
-        run: |
-          wget -O phive.phar https://phar.io/releases/phive.phar
-          wget -O phive.phar.asc https://phar.io/releases/phive.phar.asc
-          gpg --keyserver hkps://keys.openpgp.org --recv-keys 0x9D8A98B29B2D5D79
-          gpg --verify phive.phar.asc phive.phar
-          chmod +x phive.phar
-          mv phive.phar /usr/local/bin/phive
-
-      - name: Install phab
-        run: |
-          phive install phpab --global --trust-gpg-keys 0x2A8299CE842DD38C
-
-      - name: Install latest version of NCC
-        run: |
-          git clone https://git.n64.cc/nosial/ncc.git
-          cd ncc
-          make redist
-          NCC_DIR=$(find build/ -type d -name "ncc_*" | head -n 1)
-          if [ -z "$NCC_DIR" ]; then
-            echo "NCC build directory not found"
-            exit 1
-          fi
-          php "$NCC_DIR/INSTALL" --auto
-          cd .. && rm -rf ncc
-
-      - name: Build project
-        run: |
-          ncc build --config debug-compressed --log-level debug
-
-      - name: Upload build artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: debug-compressed
-          path: build/debug/net.nosial.configlib.gz.ncc
   release-executable:
     runs-on: ubuntu-latest
     container:
@@ -247,7 +149,7 @@ jobs:
 
       - name: Build project
         run: |
-          ncc build --config release-executable --log-level debug
+          ncc build --config release-executable --build-source --log-level debug
 
       - name: Upload build artifact
         uses: actions/upload-artifact@v4
@@ -296,14 +198,14 @@ jobs:
 
       - name: Build project
         run: |
-          ncc build --config debug-executable --log-level debug
+          ncc build --config debug-executable --build-source --log-level debug
 
       - name: Upload build artifact
         uses: actions/upload-artifact@v4
         with:
           name: debug-executable
           path: build/debug/debug_executable_gz
-  release-compressed-executable:
+  release_executable:
     runs-on: ubuntu-latest
     container:
       image: php:8.3
@@ -345,14 +247,14 @@ jobs:
 
       - name: Build project
         run: |
-          ncc build --config release-compressed-executable --log-level debug
+          ncc build --config release_executable --build-source --log-level debug
 
       - name: Upload build artifact
         uses: actions/upload-artifact@v4
         with:
-          name: release-compressed-executable
-          path: build/release/release_compressed_executable
-  debug-compressed-executable:
+          name: release_executable
+          path: build/release/ConfigLib
+  debug_executable:
     runs-on: ubuntu-latest
     container:
       image: php:8.3
@@ -394,13 +296,13 @@ jobs:
 
       - name: Build project
         run: |
-          ncc build --config debug-compressed-executable --log-level debug
+          ncc build --config debug_executable --build-source --log-level debug
 
       - name: Upload build artifact
         uses: actions/upload-artifact@v4
         with:
-          name: debug-compressed-executable
-          path: build/debug/debug_compressed_executable
+          name: debug_executable
+          path: build/debug/ConfigLib
 
 
   # Checking for phpunit.xml
@@ -471,7 +373,7 @@ jobs:
           path: docs.zip
 
   test:
-    needs: [release, debug, release-compressed, debug-compressed, release-executable, debug-executable, release-compressed-executable, debug-compressed-executable, check-phpunit]
+    needs: [release, debug, release-executable, debug-executable, release_executable, debug_executable, check-phpunit]
     runs-on: ubuntu-latest
     container:
       image: php:8.3
@@ -565,7 +467,7 @@ jobs:
 
 
   release-artifacts:
-    needs: [release, debug, release-compressed, debug-compressed, release-executable, debug-executable, release-compressed-executable, debug-compressed-executable]
+    needs: [release, debug, release-executable, debug-executable, release_executable, debug_executable]
     permissions: write-all
     runs-on: ubuntu-latest
     container:
@@ -600,30 +502,6 @@ jobs:
                 debug/*
         env:
             GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - name: Download release-compressed artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: release-compressed
-          path: release-compressed
-      - name: Upload release-compressed artifact to release
-        uses: softprops/action-gh-release@v1
-        with:
-            files: |
-                release-compressed/*
-        env:
-            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - name: Download debug-compressed artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: debug-compressed
-          path: debug-compressed
-      - name: Upload debug-compressed artifact to release
-        uses: softprops/action-gh-release@v1
-        with:
-            files: |
-                debug-compressed/*
-        env:
-            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Download release-executable artifact
         uses: actions/download-artifact@v4
         with:
@@ -648,27 +526,27 @@ jobs:
                 debug-executable/*
         env:
             GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - name: Download release-compressed-executable artifact
+      - name: Download release_executable artifact
         uses: actions/download-artifact@v4
         with:
-          name: release-compressed-executable
-          path: release-compressed-executable
-      - name: Upload release-compressed-executable artifact to release
+          name: release_executable
+          path: release_executable
+      - name: Upload release_executable artifact to release
         uses: softprops/action-gh-release@v1
         with:
             files: |
-                release-compressed-executable/*
+                release_executable/*
         env:
             GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - name: Download debug-compressed-executable artifact
+      - name: Download debug_executable artifact
         uses: actions/download-artifact@v4
         with:
-          name: debug-compressed-executable
-          path: debug-compressed-executable
-      - name: Upload debug-compressed-executable artifact to release
+          name: debug_executable
+          path: debug_executable
+      - name: Upload debug_executable artifact to release
         uses: softprops/action-gh-release@v1
         with:
             files: |
-                debug-compressed-executable/*
+                debug_executable/*
         env:
             GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/Makefile b/Makefile
index 97f1fe0..3c90178 100644
--- a/Makefile
+++ b/Makefile
@@ -1,20 +1,33 @@
 # Variables
-CONFIG ?= release
+DEFAULT_CONFIGURATION ?= release
 LOG_LEVEL = debug
-OUTDIR = build/$(CONFIG)
-PACKAGE = $(OUTDIR)/net.nosial.configlib.ncc
 
 # Default Target
-all: build
+all: release debug release-executable debug-executable release_executable debug_executable
 
 # Build Steps
-build:
-	ncc build --config=$(CONFIG) --log-level $(LOG_LEVEL)
+release:
+	ncc build --config=release --log-level $(LOG_LEVEL)
+debug:
+	ncc build --config=debug --log-level $(LOG_LEVEL)
+release-executable:
+	ncc build --config=release-executable --log-level $(LOG_LEVEL)
+debug-executable:
+	ncc build --config=debug-executable --log-level $(LOG_LEVEL)
+release_executable:
+	ncc build --config=release_executable --log-level $(LOG_LEVEL)
+debug_executable:
+	ncc build --config=debug_executable --log-level $(LOG_LEVEL)
 
-install: build
-	ncc package install --package=$(PACKAGE) --skip-dependencies --build-source --reinstall -y --log-level $(LOG_LEVEL)
+
+install: release
+	ncc package install --package=build/release/net.nosial.configlib.ncc --skip-dependencies --build-source --reinstall -y --log-level $(LOG_LEVEL)
+
+test: release
+	[ -f phpunit.xml ] || { echo "phpunit.xml not found"; exit 1; }
+	phpunit
 
 clean:
 	rm -rf build
 
-.PHONY: all build install clean
\ No newline at end of file
+.PHONY: all install test clean release debug release-executable debug-executable release_executable debug_executable
\ No newline at end of file
diff --git a/main b/main
index 97cce65..4a09fdf 100644
--- a/main
+++ b/main
@@ -1,6 +1,24 @@
 <?php
 
-    require('ncc');
-    import('net.nosial.configlib', 'latest');
+    if (PHP_SAPI !== 'cli')
+    {
+        print('net.nosial.configlib must be run from the command line.' . PHP_EOL);
+        exit(1);
+    }
 
-    \ConfigLib\Program::main();
\ No newline at end of file
+    if(!isset($argv))
+    {
+        if(isset($_SERVER['argv']))
+        {
+            $argv = $_SERVER['argv'];
+        }
+        else
+        {
+            print('net.nosial.configlib failed to run, no $argv found.' . PHP_EOL);
+            exit(1);
+        }
+    }
+
+    require('ncc');
+    \ncc\Classes\Runtime::import('net.nosial.configlib', 'latest');
+	exit(\ConfigLib\Program::main($argv));
\ No newline at end of file
diff --git a/project.json b/project.json
index 820656c..a7a34fa 100644
--- a/project.json
+++ b/project.json
@@ -5,6 +5,9 @@
             "minimum_version": "8.0",
             "maximum_version": "8.2"
         },
+        "options": {
+            "create_symlink": true
+        },
         "update_source": {
             "source": "nosial/libs.config@n64",
             "repository": {
@@ -13,35 +16,21 @@
                 "host": "git.n64.cc",
                 "ssl": true
             }
-        },
-        "options": {
-            "create_symlink": true
         }
     },
-    "execution_policies":[
-        {
-            "name": "main",
-            "runner": "php",
-            "execute": {
-                "target": "main",
-                "working_directory": "%CWD%",
-                "tty": true
-            }
-        }
-    ],
     "assembly": {
         "name": "ConfigLib",
         "package": "net.nosial.configlib",
+        "description": "ConfigLib is a library for reading and writing configuration files via the NCC Runtime API",
         "company": "Nosial",
         "copyright": "Copyright (c) 2022-2023 Nosial",
-        "description": "ConfigLib is a library for reading and writing configuration files via the NCC Runtime API",
         "version": "1.1.2",
         "uuid": "9347259e-8e4d-11ed-85a7-fd07cf28ef35"
     },
     "build": {
         "source_path": "src",
         "default_configuration": "release",
-        "main": "main",
+        "main": "main_policy",
         "define_constants": {
             "VERSION": "%ASSEMBLY.VERSION%"
         },
@@ -49,31 +38,26 @@
             {
                 "name": "net.nosial.optslib",
                 "version": "latest",
-                "source_type": "remote",
                 "source": "nosial/libs.opts=latest@n64"
             },
             {
                 "name": "net.nosial.loglib",
                 "version": "latest",
-                "source_type": "remote",
                 "source": "nosial/libs.log=latest@n64"
             },
             {
                 "name": "com.symfony.filesystem",
                 "version": "latest",
-                "source_type": "remote",
                 "source": "symfony/filesystem=latest@packagist"
             },
             {
                 "name": "com.symfony.yaml",
                 "version": "latest",
-                "source_type": "remote",
                 "source": "symfony/yaml=latest@packagist"
             },
             {
                 "name": "com.symfony.process",
                 "version": "latest",
-                "source_type": "remote",
                 "source": "symfony/process=latest@packagist"
             }
         ],
@@ -90,7 +74,68 @@
                 "define_constants": {
                     "DEBUG": "1"
                 }
+            },
+            {
+                "name": "release-executable",
+                "build_type": "executable",
+                "output": "build/release/release_executable_gz",
+                "options": {
+                    "ncc_configuration": "release"
+                }
+            },
+            {
+                "name": "debug-executable",
+                "build_type": "executable",
+                "output": "build/debug/debug_executable_gz",
+                "options": {
+                    "ncc_configuration": "debug"
+                }
+            },
+            {
+                "name": "release_executable",
+                "build_type": "executable",
+                "output": "build/release/%ASSEMBLY.NAME%",
+                "options": {
+                    "ncc_configuration": "release"
+                }
+            },
+            {
+                "name": "debug_executable",
+                "build_type": "executable",
+                "output": "build/debug/%ASSEMBLY.NAME%",
+                "options": {
+                    "ncc_configuration": "debug"
+                },
+                "define_constants": {
+                    "DEBUG": "1"
+                }
             }
         ]
-    }
+    },
+    "execution_policies": [
+        {
+            "name": "main",
+            "runner": "php",
+            "execute": {
+                "working_directory": "%CWD%",
+                "silent": false,
+                "tty": true,
+                "timeout": null,
+                "idle_timeout": null,
+                "target": "main"
+            }
+        },
+        {
+            "name": "main_policy",
+            "runner": "php",
+            "execute": {
+                "working_directory": "%CWD%",
+                "silent": false,
+                "tty": true,
+                "timeout": null,
+                "idle_timeout": null,
+                "target": "main"
+            }
+        }
+    ]
 }
\ No newline at end of file