From 983370ece8e73b2891e943a1b200b0629f85226d Mon Sep 17 00:00:00 2001 From: Frakist <90983918+Frakist@users.noreply.github.com> Date: Mon, 15 May 2023 15:54:17 +0300 Subject: [PATCH 01/14] new actions (for windows only) --- .github/workflows/windows.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 6088d1c2..b3436549 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -27,10 +27,10 @@ jobs: cache-build-windows - name: Installing/Updating libraries run: | - haxe -cp ./update -D analyzer-optimize -main Update --interp + haxe -cp commandline -D analyzer-optimize --run Main setup - name: Building the game run: | - haxelib run lime build windows + haxe -cp commandline -D analyzer-optimize --run Main release - name: Uploading artifact (entire build) uses: actions/upload-artifact@v2 with: @@ -70,4 +70,4 @@ jobs: export/release/windows/haxe/ export/release/windows/obj/ restore-keys: | - cache-build-windows \ No newline at end of file + cache-build-windows From b184c448335daab86e93d0aa3aa0120c060bfc66 Mon Sep 17 00:00:00 2001 From: Frakist <90983918+Frakist@users.noreply.github.com> Date: Mon, 15 May 2023 16:01:00 +0300 Subject: [PATCH 02/14] Update linux.yml --- .github/workflows/linux.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 5463a51b..91a978b8 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -27,10 +27,10 @@ jobs: cache-build-linux - name: Installing/Updating libraries run: | - haxe -cp ./update -D analyzer-optimize -main Update --interp + haxe -cp commandline -D analyzer-optimize --run Main setup - name: Building the game run: | - haxelib run lime build linux + haxe -cp commandline -D analyzer-optimize --run Main release - name: Uploading artifact (entire build) uses: actions/upload-artifact@v2 with: @@ -70,4 +70,4 @@ jobs: export/release/linux/haxe/ export/release/linux/obj/ restore-keys: | - cache-build-linux \ No newline at end of file + cache-build-linux From 829cfae48138534090a4ab83e98b503e36997caa Mon Sep 17 00:00:00 2001 From: Frakist <90983918+Frakist@users.noreply.github.com> Date: Mon, 15 May 2023 16:01:51 +0300 Subject: [PATCH 03/14] Update macos.yml --- .github/workflows/macos.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 772db147..b7049ba1 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -27,10 +27,10 @@ jobs: cache-build-mac - name: Installing/Updating libraries run: | - haxe -cp ./update -D analyzer-optimize -main Update --interp + haxe -cp commandline -D analyzer-optimize --run Main setup - name: Building the game run: | - haxelib run lime build mac + haxe -cp commandline -D analyzer-optimize --run Main release - name: Uploading artifact (entire build) uses: actions/upload-artifact@v2 with: @@ -70,4 +70,4 @@ jobs: export/release/macos/haxe/ export/release/macos/obj/ restore-keys: | - cache-build-mac \ No newline at end of file + cache-build-mac From 973d69bd2afd57c2bbaf36af9f147e1b7ab8eb75 Mon Sep 17 00:00:00 2001 From: Frakist <90983918+Frakist@users.noreply.github.com> Date: Mon, 15 May 2023 16:06:16 +0300 Subject: [PATCH 04/14] bruh --- .github/workflows/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index b3436549..1c93ad8c 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -30,7 +30,7 @@ jobs: haxe -cp commandline -D analyzer-optimize --run Main setup - name: Building the game run: | - haxe -cp commandline -D analyzer-optimize --run Main release + haxelib run lime build windows - name: Uploading artifact (entire build) uses: actions/upload-artifact@v2 with: From d504a7a346c2cf732877edcf5062877705c99d5c Mon Sep 17 00:00:00 2001 From: Frakist <90983918+Frakist@users.noreply.github.com> Date: Mon, 15 May 2023 16:23:51 +0300 Subject: [PATCH 05/14] bruh #2 --- .github/workflows/macos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index b7049ba1..65a3fa2e 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -30,7 +30,7 @@ jobs: haxe -cp commandline -D analyzer-optimize --run Main setup - name: Building the game run: | - haxe -cp commandline -D analyzer-optimize --run Main release + haxelib run lime build mac - name: Uploading artifact (entire build) uses: actions/upload-artifact@v2 with: From f6070aa6f67aa4e5100553758aed143bebfd5da9 Mon Sep 17 00:00:00 2001 From: Frakist <90983918+Frakist@users.noreply.github.com> Date: Mon, 15 May 2023 16:24:17 +0300 Subject: [PATCH 06/14] bruh #3 --- .github/workflows/linux.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 91a978b8..bae9c158 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -30,7 +30,7 @@ jobs: haxe -cp commandline -D analyzer-optimize --run Main setup - name: Building the game run: | - haxe -cp commandline -D analyzer-optimize --run Main release + haxelib run lime test linux - name: Uploading artifact (entire build) uses: actions/upload-artifact@v2 with: From 6a97b9d0edcdaae16f7c5a13367b4ba0f7138eeb Mon Sep 17 00:00:00 2001 From: Frakist <90983918+Frakist@users.noreply.github.com> Date: Mon, 15 May 2023 16:27:38 +0300 Subject: [PATCH 07/14] oops --- .github/workflows/linux.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index bae9c158..08e9b4d2 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -30,7 +30,7 @@ jobs: haxe -cp commandline -D analyzer-optimize --run Main setup - name: Building the game run: | - haxelib run lime test linux + haxelib run lime build linux - name: Uploading artifact (entire build) uses: actions/upload-artifact@v2 with: From 9fae50b65f3d74183f2954bd1ce45c3ac8feca1e Mon Sep 17 00:00:00 2001 From: Frakits <90983918+Frakits@users.noreply.github.com> Date: Sat, 1 Jul 2023 12:19:57 +0300 Subject: [PATCH 08/14] change linc_discord-rpc to simply discord-rpc --- project.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.xml b/project.xml index 327e5bd7..83f5b817 100644 --- a/project.xml +++ b/project.xml @@ -182,7 +182,7 @@ - + From 2aa4329b5666fc6267c60b92567db248079dd4d6 Mon Sep 17 00:00:00 2001 From: Frakits <90983918+Frakits@users.noreply.github.com> Date: Sat, 1 Jul 2023 12:46:38 +0300 Subject: [PATCH 09/14] added global attribute --- libs.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs.xml b/libs.xml index 3ee3beeb..293c40a2 100644 --- a/libs.xml +++ b/libs.xml @@ -8,7 +8,7 @@ - + @@ -20,4 +20,4 @@ - \ No newline at end of file + From 5d10527b13bc119e780b70d62aeabc2a3f74762e Mon Sep 17 00:00:00 2001 From: Frakits <90983918+Frakits@users.noreply.github.com> Date: Sat, 1 Jul 2023 12:48:19 +0300 Subject: [PATCH 10/14] made global attribute functional --- commandline/commands/Update.hx | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/commandline/commands/Update.hx b/commandline/commands/Update.hx index 6404ab35..26eafb91 100644 --- a/commandline/commands/Update.hx +++ b/commandline/commands/Update.hx @@ -20,8 +20,9 @@ class Update { for (libNode in libsXML.elements) { var lib:Library = { name: libNode.att.name, - type: libNode.name + type: libNode.name, }; + if (libNode.has.global) lib.global = libNode.att.global; switch (lib.type) { case "lib": if (libNode.has.version) lib.version = libNode.att.version; @@ -34,16 +35,17 @@ class Update { for(lib in libs) { // install libs + var globalism = lib.global == "true" ? "--global" : ""; switch(lib.type) { case "lib": prettyPrint('Installing "${lib.name}"...'); - Sys.command('haxelib install ${lib.name} ${lib.version != null ? " " + lib.version : " "}'); + Sys.command('haxelib $globalism install ${lib.name} ${lib.version != null ? " " + lib.version : " "}'); case "git": prettyPrint('Installing "${lib.name}" from git url "${lib.url}"'); - if (lib.ref != null) - Sys.command('haxelib git ${lib.name} ${lib.url} ${lib.ref}'); - else - Sys.command('haxelib git ${lib.name} ${lib.url}'); + if (lib.ref != null) + Sys.command('haxelib $globalism git ${lib.name} ${lib.url} ${lib.ref}'); + else + Sys.command('haxelib $globalism git ${lib.name} ${lib.url}'); default: prettyPrint('Cannot resolve library of type "${lib.type}"'); } @@ -90,7 +92,8 @@ class Update { typedef Library = { var name:String; var type:String; + var ?global:String; var ?version:String; var ?ref:String; var ?url:String; -} \ No newline at end of file +} From 77cf8276010eb8d86f4e16ccb7eb9f4c7e7ccc3c Mon Sep 17 00:00:00 2001 From: Frakits <90983918+Frakits@users.noreply.github.com> Date: Sat, 1 Jul 2023 12:49:20 +0300 Subject: [PATCH 11/14] oops --- commandline/commands/Update.hx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/commandline/commands/Update.hx b/commandline/commands/Update.hx index 26eafb91..f42346be 100644 --- a/commandline/commands/Update.hx +++ b/commandline/commands/Update.hx @@ -20,7 +20,7 @@ class Update { for (libNode in libsXML.elements) { var lib:Library = { name: libNode.att.name, - type: libNode.name, + type: libNode.name }; if (libNode.has.global) lib.global = libNode.att.global; switch (lib.type) { From bd44c70a9bdb6cbb4ca828c5696a5fadf3013059 Mon Sep 17 00:00:00 2001 From: Frakits <90983918+Frakits@users.noreply.github.com> Date: Sat, 1 Jul 2023 13:28:30 +0300 Subject: [PATCH 12/14] Update libs.xml --- libs.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/libs.xml b/libs.xml index 293c40a2..63dc13a6 100644 --- a/libs.xml +++ b/libs.xml @@ -9,6 +9,7 @@ + From 6c1e58a3f54f18676d3f834fe8b6bfa9b63da60f Mon Sep 17 00:00:00 2001 From: Frakits <90983918+Frakits@users.noreply.github.com> Date: Sat, 1 Jul 2023 13:30:17 +0300 Subject: [PATCH 13/14] Update libs.xml --- libs.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/libs.xml b/libs.xml index 63dc13a6..f3a63710 100644 --- a/libs.xml +++ b/libs.xml @@ -9,6 +9,7 @@ + From 662a6efcbf7d3fcf7dece93ed961542ea5dcaaef Mon Sep 17 00:00:00 2001 From: Frakits <90983918+Frakits@users.noreply.github.com> Date: Sat, 1 Jul 2023 16:40:08 +0300 Subject: [PATCH 14/14] better clarification --- commandline/commands/Update.hx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/commandline/commands/Update.hx b/commandline/commands/Update.hx index f42346be..f829131f 100644 --- a/commandline/commands/Update.hx +++ b/commandline/commands/Update.hx @@ -38,10 +38,10 @@ class Update { var globalism = lib.global == "true" ? "--global" : ""; switch(lib.type) { case "lib": - prettyPrint('Installing "${lib.name}"...'); + prettyPrint((lib.global == "true" ? "Globally installing" : "Locally installing") + ' "${lib.name}"...'); Sys.command('haxelib $globalism install ${lib.name} ${lib.version != null ? " " + lib.version : " "}'); case "git": - prettyPrint('Installing "${lib.name}" from git url "${lib.url}"'); + prettyPrint((lib.global == "true" ? "Globally installing" : "Locally installing") + ' "${lib.name}" from git url "${lib.url}"'); if (lib.ref != null) Sys.command('haxelib $globalism git ${lib.name} ${lib.url} ${lib.ref}'); else