chore: add cli binaries (#47)

rivet-gg · Aug 26, 2024 · 24bd9c9 · 24bd9c9
1 parent a712701
commit 24bd9c9
Show file tree

Hide file tree

Showing 22 changed files with 117 additions and 93 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,3 +1,7 @@
 Assets/Rivet/Editor/Native/*.dll filter=lfs diff=lfs merge=lfs -text
 Assets/Rivet/Editor/Native/*.so filter=lfs diff=lfs merge=lfs -text
-Assets/Rivet/Editor/Native/*.dylib filter=lfs diff=lfs merge=lfs -text
+Assets/Rivet/Editor/Native/*.dylib filter=lfs diff=lfs merge=lfs -text
+Assets/Rivet/Editor/Native/cli/rivet-aarch64-apple filter=lfs diff=lfs merge=lfs -text
+Assets/Rivet/Editor/Native/cli/rivet-linux filter=lfs diff=lfs merge=lfs -text
+Assets/Rivet/Editor/Native/cli/rivet-windows.exe filter=lfs diff=lfs merge=lfs -text
+Assets/Rivet/Editor/Native/cli/rivet-x86-apple filter=lfs diff=lfs merge=lfs -text
diff --git a/Assets/Rivet/Editor/Native/cli.meta b/Assets/Rivet/Editor/Native/cli.meta
diff --git a/Assets/Rivet/Editor/Native/cli/rivet-aarch64-apple b/Assets/Rivet/Editor/Native/cli/rivet-aarch64-apple
diff --git a/Assets/Rivet/Editor/Native/cli/rivet-aarch64-apple.meta b/Assets/Rivet/Editor/Native/cli/rivet-aarch64-apple.meta
diff --git a/Assets/Rivet/Editor/Native/cli/rivet-linux b/Assets/Rivet/Editor/Native/cli/rivet-linux
diff --git a/Assets/Rivet/Editor/Native/cli/rivet-linux.meta b/Assets/Rivet/Editor/Native/cli/rivet-linux.meta
diff --git a/Assets/Rivet/Editor/Native/cli/rivet-windows.exe b/Assets/Rivet/Editor/Native/cli/rivet-windows.exe
diff --git a/Assets/Rivet/Editor/Native/cli/rivet-windows.exe.meta b/Assets/Rivet/Editor/Native/cli/rivet-windows.exe.meta
diff --git a/Assets/Rivet/Editor/Native/cli/rivet-x86-apple b/Assets/Rivet/Editor/Native/cli/rivet-x86-apple
diff --git a/Assets/Rivet/Editor/Native/cli/rivet-x86-apple.meta b/Assets/Rivet/Editor/Native/cli/rivet-x86-apple.meta
diff --git a/Assets/Rivet/Editor/Native/librivet_toolchain_ffi_linux_x86_64.so b/Assets/Rivet/Editor/Native/librivet_toolchain_ffi_linux_x86_64.so
diff --git a/Assets/Rivet/Editor/Native/librivet_toolchain_ffi_linux_x86_64.so.meta b/Assets/Rivet/Editor/Native/librivet_toolchain_ffi_linux_x86_64.so.meta
diff --git a/Assets/Rivet/Editor/Native/librivet_toolchain_ffi_macos_arm64.dylib b/Assets/Rivet/Editor/Native/librivet_toolchain_ffi_macos_arm64.dylib
diff --git a/Assets/Rivet/Editor/Native/librivet_toolchain_ffi_macos_x86_64.dylib b/Assets/Rivet/Editor/Native/librivet_toolchain_ffi_macos_x86_64.dylib
diff --git a/Assets/Rivet/Editor/Native/rivet_toolchain_ffi_windows_x86_64.dll b/Assets/Rivet/Editor/Native/rivet_toolchain_ffi_windows_x86_64.dll
diff --git a/Assets/Rivet/Editor/Task.cs b/Assets/Rivet/Editor/Task.cs
@@ -160,9 +160,29 @@ private Result<JObject> RunTask(string name, JObject input, JObject runConfig)
         // TODO: Remove this
         public static string GetRivetCLIPath()
         {
-            // TODO: Update this path as needed
-            // return "/Users/nathan/rivet/cli/target/debug/rivet-cli";
-            return "/Users/nathan/rivet/cli/target/debug/rivet";
+            if (Application.platform == RuntimePlatform.WindowsEditor)
+            {
+                return "Assets/Rivet/Editor/Native/cli/rivet-windows.exe";
+            }
+            else if (Application.platform == RuntimePlatform.OSXEditor)
+            {
+                if (SystemInfo.processorType.Contains("Apple"))
+                {
+                    return "Assets/Rivet/Editor/Native/cli/rivet-aarch64-apple";
+                }
+                else
+                {
+                    return "Assets/Rivet/Editor/Native/cli/rivet-x86-apple";
+                }
+            }
+            else if (Application.platform == RuntimePlatform.LinuxEditor)
+            {
+                return "Assets/Rivet/Editor/Native/cli/rivet-linux";
+            }
+            else
+            {
+                throw new Exception("Unsupported platform");
+            }
         }
 
         // private static Result<JObject> RunRivetCLI(params string[] args)
@@ -326,4 +346,4 @@ private void CleanupTempFiles()
             }
         }
     }
-}
+}
diff --git a/Assets/Rivet/Editor/UI/RivetPlugin.cs b/Assets/Rivet/Editor/UI/RivetPlugin.cs
@@ -82,7 +82,7 @@ public void CreateGUI()
             // Bind links
             var links = rootVisualElement.Q(name: "Header").Q(name: "Links");
             links.Q(name: "DashboardButton").RegisterCallback<ClickEvent>((ev) => Application.OpenURL("https://hub.rivet.gg"));
-            rootVisualElement.Q(className: "docsButton").RegisterCallback<ClickEvent>((ev) => Application.OpenURL("https://rivet.gg/docs/unity"));
+            rootVisualElement.Q(className: "docsButton").RegisterCallback<ClickEvent>((ev) => Application.OpenURL("https://rivet.gg/learn/unity"));
             rootVisualElement.Q(className: "discordButton").RegisterCallback<ClickEvent>((ev) => Application.OpenURL("https://rivet.gg/discord"));
             rootVisualElement.Q(className: "feedbackButton").RegisterCallback<ClickEvent>((ev) => Application.OpenURL("https://hub.rivet.gg/?modal=feedback&utm=unity"));
 

diff --git a/Assets/Rivet/Editor/UI/Tabs/DevelopController.cs b/Assets/Rivet/Editor/UI/Tabs/DevelopController.cs
@@ -168,12 +168,14 @@ private void OnPlayerStart()
 
         private void OnBackendGenerateSDK()
         {
-            TaskPopupWindow.RunTask("Generate SDK", "backend_sdk_gen", new JObject
-            {
-                ["cwd"] = Builder.ProjectRoot(),
-                ["fallback_sdk_path"] = "Assets/Backend",
-                ["target"] = "unity",
-            });
+            // TaskPopupWindow.RunTask("Generate SDK", "backend_sdk_gen", new JObject
+            // {
+            //     ["cwd"] = Builder.ProjectRoot(),
+            //     ["fallback_sdk_path"] = "Assets/Backend",
+            //     ["target"] = "unity",
+            // });
+
+            EditorUtility.DisplayDialog("Generate SDK Disabled", "Generate SDK temporarily disabled. Contact support for further questions.", "OK");
         }
 
         private void OnBackendEditConfig()

diff --git a/Assets/Rivet/Editor/UI/Tabs/Setup.uxml b/Assets/Rivet/Editor/UI/Tabs/Setup.uxml
@@ -4,5 +4,5 @@
         <ui:Label tabindex="-1" text="Step 1: Create Game &amp; Backend Configs" parse-escape-sequences="true" display-tooltip-when-elided="true" style="flex-grow: 1; flex-shrink: 1;" />
         <ui:Button text="Setup" parse-escape-sequences="true" display-tooltip-when-elided="true" />
     </ui:VisualElement>
-    <ui:Label tabindex="-1" text="WIP" parse-escape-sequences="true" display-tooltip-when-elided="true" />
+    <ui:Label tabindex="-1" text="Please see &lt;a href=&quot;https://rivet.gg/learn/unity&quot;&gt;Quickstart Guide&lt;/a&gt; to get setarted\n\nSetup wizard coming soon" parse-escape-sequences="true" display-tooltip-when-elided="true" />
 </ui:UXML>
diff --git a/backend.json b/backend.json
@@ -6,15 +6,7 @@
 			]
 		}
 	},
-	"registries": {
-		"default": {
-			"local": {
-				"directory": "/Users/nathan/rivet/opengb-modules/modules"
-			}
-		}
-	},
 	"modules": {
-		"users": {},
 		"rate_limit": {},
 		"tokens": {},
 		"lobbies": {

diff --git a/scripts/copy_ffi.sh → scripts/copy_native.sh b/scripts/copy_ffi.sh → scripts/copy_native.sh
@@ -4,15 +4,23 @@ set -euf
 # Linux (x86_64)
 rm -rf ./Assets/Rivet/Editor/Native/librivet_toolchain_ffi_linux_x86_64.so
 cp -r $CLI_REPO_PATH/target/x86_64-unknown-linux-gnu/release/librivet_toolchain_ffi.so ./Assets/Rivet/Editor/Native/librivet_toolchain_ffi_linux_x86_64.so
+rm -rf ./Assets/Rivet/Editor/Native/cli/rivet-linux  
+cp -r $CLI_REPO_PATH/target/x86_64-unknown-linux-gnu/release/rivet ./Assets/Rivet/Editor/Native/cli/rivet-linux
 
 # Windows (x86_64)
 rm -rf ./Assets/Rivet/Editor/Native/rivet_toolchain_ffi_windows_x86_64.dll
 cp -r $CLI_REPO_PATH/target/x86_64-pc-windows-gnu/release/rivet_toolchain_ffi.dll ./Assets/Rivet/Editor/Native/rivet_toolchain_ffi_windows_x86_64.dll
+rm -rf ./Assets/Rivet/Editor/Native/cli/rivet-windows.exe
+cp -r $CLI_REPO_PATH/target/x86_64-pc-windows-gnu/release/rivet.exe ./Assets/Rivet/Editor/Native/cli/rivet-windows.exe
 
 # macOS (x86_64)
 rm -rf ./Assets/Rivet/Editor/Native/librivet_toolchain_ffi_macos_x86_64.dylib
 cp -r $CLI_REPO_PATH/target/x86_64-apple-darwin/release/librivet_toolchain_ffi.dylib ./Assets/Rivet/Editor/Native/librivet_toolchain_ffi_macos_x86_64.dylib
+rm -rf ./Assets/Rivet/Editor/Native/cli/rivet-x86-apple
+cp -r $CLI_REPO_PATH/target/x86_64-apple-darwin/release/rivet ./Assets/Rivet/Editor/Native/cli/rivet-x86-apple
 
 # macOS (ARM64)
 rm -rf ./Assets/Rivet/Editor/Native/librivet_toolchain_ffi_macos_arm64.dylib
-cp -r $CLI_REPO_PATH/target/aarch64-apple-darwin/release/librivet_toolchain_ffi.dylib ./Assets/Rivet/Editor/Native/librivet_toolchain_ffi_macos_arm64.dylib
+cp -r $CLI_REPO_PATH/target/aarch64-apple-darwin/release/librivet_toolchain_ffi.dylib ./Assets/Rivet/Editor/Native/librivet_toolchain_ffi_macos_arm64.dylib
+rm -rf ./Assets/Rivet/Editor/Native/cli/rivet-aarch64-apple
+cp -r $CLI_REPO_PATH/target/aarch64-apple-darwin/release/rivet ./Assets/Rivet/Editor/Native/cli/rivet-aarch64-apple
diff --git a/scripts/copy_native_dev.sh b/scripts/copy_native_dev.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+set -euf
+
+echo "TODO: Currently only supports macOS ARM64"
+
+# Build client
+(cd $CLI_REPO_PATH && cargo build)
+
+# macOS (ARM64)
+rm -rf ./Assets/Rivet/Editor/Native/librivet_toolchain_ffi_macos_arm64.dylib
+cp -r $CLI_REPO_PATH/target/debug/librivet_toolchain_ffi.dylib ./Assets/Rivet/Editor/Native/librivet_toolchain_ffi_macos_arm64.dylib
+rm -rf ./Assets/Rivet/Editor/Native/cli/rivet-aarch64-apple
+cp -r $CLI_REPO_PATH/target/debug/rivet ./Assets/Rivet/Editor/Native/cli/rivet-aarch64-apple