Fix crosslang issues with tooling and update crossvm binary for webapp

2026-02-09 01:25:45 +00:00 · 2025-09-30 22:33:29 -05:00
parent bbe0a1cefc
commit 0cd15fa351
11 changed files with 159 additions and 0 deletions
--- a/Packaging/CPKG/Wii/main.cpp
+++ b/Packaging/CPKG/Wii/main.cpp
@@ -0,0 +1,78 @@
+#include <CrossLang.hpp>
+using namespace Tesses::Framework;
+using namespace Tesses::CrossLang;
+int main(int argc, char** argv)
+{
+    TF_InitWithConsole();
+    std::string name = "boot.dol";
+    Tesses::Framework::Filesystem::VFSPath exePath=Tesses::Framework::Filesystem::LocalFS->SystemToVFSPath(name);
+    exePath.MakeAbsolute();
+    exePath.ChangeExtension(".crvm");
+
+
+    
+        
+    GC gc;
+    gc.Start();
+    GCList ls(gc);
+    TRootEnvironment* env = TRootEnvironment::Create(ls, TDictionary::Create(ls));
+    
+    TStd::RegisterStd(&gc,env);
+    env->LoadFileWithDependencies(&gc, Tesses::Framework::Filesystem::LocalFS, exePath);
+    
+   
+
+    if(env->HasVariable("WebAppMain"))
+    {
+        std::vector<std::string> argsls={"boot.dol"};
+        for(int i = 0; i < argc; i++)
+        {
+            argsls.push_back(argv[i]);
+        }
+
+        Args args(argsls);
+        int port = 4206;
+        for(auto& item : args.options)
+        {
+            if(item.first == "port")
+            {
+                port = std::stoi(item.second);
+            }
+        }
+        TList* args2 = TList::Create(ls);
+        args2->Add(exePath.ToString());
+        for(auto& item : args.positional)
+        {
+            args2->Add(item);
+        }
+
+        auto res = env->CallFunction(ls, "WebAppMain", {args2});
+        auto svr2 = Tesses::CrossLang::ToHttpServer(&gc,res);
+        if(svr2 == nullptr) return 1;
+        Tesses::Framework::Http::HttpServer svr(port,svr2);
+        svr.StartAccepting();
+        TF_RunEventLoop();
+        TDictionary* _dict;
+        TClassObject* _co;
+        if(GetObjectHeap(res,_dict))
+        {
+            _dict->CallMethod(ls,"Close",{});
+        }
+        if(GetObjectHeap(res,_co))
+        {
+            _co->CallMethod(ls,"","Close",{});
+        }
+        TF_Quit();
+    }
+    else {
+         TList* args = TList::Create(ls);
+         args->Add(exePath.ToString());
+        for(int arg=0;arg<argc;arg++)
+            args->Add(argv[arg]);
+        auto res = env->CallFunction(ls,"main",{args});
+        int64_t iresult;
+        if(GetObject(res,iresult))
+            return (int)iresult;
+    }
+    return 0;
+}