From 1ce553075ad7b71ba37ecda3b9aa6d17ef19e850 Mon Sep 17 00:00:00 2001
From: Daylily-Zeleen <daylily-zeleen@foxmail.com>
Date: Sun, 30 Jul 2023 04:08:45 +0800
Subject: [PATCH] Fix dist filename

---
 .github/actions/upload/action.yml    | 2 +-
 .github/workflows/android_builds.yml | 2 +-
 .github/workflows/ios_builds.yml     | 2 +-
 .github/workflows/linux_builds.yml   | 2 +-
 .github/workflows/macos_builds.yml   | 2 +-
 .github/workflows/windows_builds.yml | 2 +-
 SConstruct                           | 6 ++++--
 build.py                             | 2 +-
 8 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/.github/actions/upload/action.yml b/.github/actions/upload/action.yml
index ec3a1d3..3b707ae 100644
--- a/.github/actions/upload/action.yml
+++ b/.github/actions/upload/action.yml
@@ -9,5 +9,5 @@ runs:
       with:
         name: Godot Universal Serializer 2
         path: |
-          ${{ github.workspace }}/dist/addons/com.daylily_zeleen.godot_universal_serializer/libgus2.${{ input.artifact_file_suffix }}
+          ${{ github.workspace }}/dist/addons/com.daylily_zeleen.godot_universal_serializer/bin/libgus2.${{ inputs.artifact_file_suffix }}
         retention-days: 14
diff --git a/.github/workflows/android_builds.yml b/.github/workflows/android_builds.yml
index 3fc26ab..92833bf 100644
--- a/.github/workflows/android_builds.yml
+++ b/.github/workflows/android_builds.yml
@@ -15,7 +15,7 @@ jobs:
       matrix:
         target: [template_debug, template_release]
         arch: [arm64, x86_64]
-        shlibsuffix: "so"
+        shlibsuffix: ["so"]
 
     steps:
       - uses: actions/checkout@v3
diff --git a/.github/workflows/ios_builds.yml b/.github/workflows/ios_builds.yml
index e43f135..e3c322f 100644
--- a/.github/workflows/ios_builds.yml
+++ b/.github/workflows/ios_builds.yml
@@ -15,7 +15,7 @@ jobs:
       matrix:
         target: [template_debug, template_release]
         arch: [arm64]
-        shlibsuffix: "dylib"
+        shlibsuffix: ["dylib"]
 
     steps:
       - uses: actions/checkout@v3
diff --git a/.github/workflows/linux_builds.yml b/.github/workflows/linux_builds.yml
index bc2cc23..11b70e5 100644
--- a/.github/workflows/linux_builds.yml
+++ b/.github/workflows/linux_builds.yml
@@ -15,7 +15,7 @@ jobs:
       matrix:
         target: [template_debug, template_release]
         arch: [x86_64]
-        shlibsuffix: "so"
+        shlibsuffix: ["so"]
 
     steps:
       - uses: actions/checkout@v3
diff --git a/.github/workflows/macos_builds.yml b/.github/workflows/macos_builds.yml
index c6420ac..0244e0e 100644
--- a/.github/workflows/macos_builds.yml
+++ b/.github/workflows/macos_builds.yml
@@ -16,7 +16,7 @@ jobs:
       matrix:
         target: [template_debug, template_release]
         arch: [universal]
-        shlibsuffix: "framework"
+        shlibsuffix: ["framework"]
 
     steps:
       - uses: actions/checkout@v3
diff --git a/.github/workflows/windows_builds.yml b/.github/workflows/windows_builds.yml
index 1e2337b..241cbf2 100644
--- a/.github/workflows/windows_builds.yml
+++ b/.github/workflows/windows_builds.yml
@@ -15,7 +15,7 @@ jobs:
       matrix:
         target: [template_debug, template_release]
         arch: [x86_32, x86_64]
-        shlibsuffix: "dll"
+        shlibsuffix: ["dll"]
 
     steps:
       - uses: actions/checkout@v3
diff --git a/SConstruct b/SConstruct
index 024393c..8209fd6 100644
--- a/SConstruct
+++ b/SConstruct
@@ -32,12 +32,14 @@ sources = Glob("src/*.cpp")
 #         env["CXXFLAGS"] = ["-std=c++2a"]
 
 
-bin_dir = "demo/addons/com.daylily_zeleen.godot_universal_serializer2/bin/"
+bin_dir = "dist/addons/com.daylily_zeleen.godot_universal_serializer2/bin/"
 
 if env["platform"] == "macos":
     library = env.SharedLibrary(
         bin_dir
-        + "libgus2.{}.{}.framework/libgus.{}.{}".format(env["platform"], env["target"], env["platform"], env["target"]),
+        + "libgus2.{}.{}.framework/libguss.{}.{}".format(
+            env["platform"], env["target"], env["platform"], env["target"]
+        ),
         source=sources,
     )
 else:
diff --git a/build.py b/build.py
index 5c6c4de..f6fac62 100644
--- a/build.py
+++ b/build.py
@@ -29,7 +29,7 @@ def main():
         if arg.startswith("target"):
             debug_and_relaese = False
 
-    bin_dir = "demo/addons/com.daylily_zeleen.godot_universal_serializer2/bin/"
+    bin_dir = "dist/addons/com.daylily_zeleen.godot_universal_serializer2/bin/"
     # Remove all last build files.
     for f in os.listdir(bin_dir):
         os.remove(path_join(bin_dir, f))