From 0cd15fa3514a518da9358a750bc09c4a73054891 Mon Sep 17 00:00:00 2001 From: Mike Nolan Date: Tue, 30 Sep 2025 22:33:29 -0500 Subject: [PATCH] Fix crosslang issues with tooling and update crossvm binary for webapp --- Packaging/CPKG/ConsoleOrServer/main.cpp | 10 ++++ Packaging/CPKG/Wii/CMakeLists.txt | 26 +++++++++ Packaging/CPKG/Wii/main.cpp | 78 +++++++++++++++++++++++++ src/crossarchivecreate.cpp | 1 + src/crossarchiveextract.cpp | 1 + src/crossasmcli.cpp | 1 + src/crossdisasmcli.cpp | 2 + src/crosslangdump.cpp | 1 + src/crosslangvm.cpp | 37 ++++++++++++ src/crossmergecli.cpp | 1 + src/crossthumbnailer.cpp | 1 + 11 files changed, 159 insertions(+) create mode 100644 Packaging/CPKG/Wii/CMakeLists.txt create mode 100644 Packaging/CPKG/Wii/main.cpp diff --git a/Packaging/CPKG/ConsoleOrServer/main.cpp b/Packaging/CPKG/ConsoleOrServer/main.cpp index 738ea7d..ab5cd87 100644 --- a/Packaging/CPKG/ConsoleOrServer/main.cpp +++ b/Packaging/CPKG/ConsoleOrServer/main.cpp @@ -45,6 +45,16 @@ int main(int argc, char** argv) 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 { diff --git a/Packaging/CPKG/Wii/CMakeLists.txt b/Packaging/CPKG/Wii/CMakeLists.txt new file mode 100644 index 0000000..2faa465 --- /dev/null +++ b/Packaging/CPKG/Wii/CMakeLists.txt @@ -0,0 +1,26 @@ +cmake_minimum_required(VERSION 3.16) + +project(CrossLangWii) + + +set(TESSESFRAMEWORK_ENABLE_RPATH OFF CACHE INTERNAL "For TessesFramework" FORCE) +set(TESSESFRAMEWORK_ENABLE_STATIC ON CACHE INTERNAL "For TessesFramework" FORCE) +set(TESSESFRAMEWORK_ENABLE_EXAMPLES OFF CACHE INTERNAL "For TessesFramework" FORCE) +set(TESSESFRAMEWORK_ENABLE_APPS OFF CACHE INTERNAL "For TessesFramework" FORCE) +set(TESSESFRAMEWORK_ENABLE_SHARED OFF CACHE INTERNAL "For TessesFramework" FORCE) +set(CROSSLANG_ENABLE_BINARIES OFF CACHE INTERNAL "For CrossLang" FORCE) +set(MBEDTLS_DIR "/opt/devkitpro/portlibs/wii" CACHE INTERNAL "For TessesFramework" FORCE) + +include(FetchContent) + +FetchContent_Declare( + TessesCrossLang + GIT_REPOSITORY https://onedev.site.tesses.net/crosslang.git +) + +FetchContent_MakeAvailable(TessesCrossLang) + + + +add_executable(boot main.cpp) +target_link_libraries(boot PUBLIC crosslang_static) diff --git a/Packaging/CPKG/Wii/main.cpp b/Packaging/CPKG/Wii/main.cpp new file mode 100644 index 0000000..1aa1792 --- /dev/null +++ b/Packaging/CPKG/Wii/main.cpp @@ -0,0 +1,78 @@ +#include +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 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;argAdd(argv[arg]); + auto res = env->CallFunction(ls,"main",{args}); + int64_t iresult; + if(GetObject(res,iresult)) + return (int)iresult; + } + return 0; +} \ No newline at end of file diff --git a/src/crossarchivecreate.cpp b/src/crossarchivecreate.cpp index d7630ff..f35cc76 100644 --- a/src/crossarchivecreate.cpp +++ b/src/crossarchivecreate.cpp @@ -17,6 +17,7 @@ void Help(const char* filename) } int main(int argc, char** argv) { + Tesses::Framework::TF_Init(); std::string name="out"; std::string info="{}"; TVMVersion version; diff --git a/src/crossarchiveextract.cpp b/src/crossarchiveextract.cpp index 46064ed..61ee23d 100644 --- a/src/crossarchiveextract.cpp +++ b/src/crossarchiveextract.cpp @@ -6,6 +6,7 @@ using namespace Tesses::Framework::Streams; int main(int argc, char** argv) { + Tesses::Framework::TF_Init(); if(argc < 3) { printf("USAGE: %s \n", argv[0]); diff --git a/src/crossasmcli.cpp b/src/crossasmcli.cpp index 7d402f6..4100c22 100644 --- a/src/crossasmcli.cpp +++ b/src/crossasmcli.cpp @@ -6,6 +6,7 @@ int main(int argc, char** argv) using namespace Tesses::Framework::Streams; using namespace Tesses::Framework::Filesystem; using namespace Tesses::CrossLang; + TF_Init(); if(argc > 1 && strcmp(argv[1],"--help")) { std::cout << "Run this command in directory you want to assemble (with the crossasm.json)" << std::endl; diff --git a/src/crossdisasmcli.cpp b/src/crossdisasmcli.cpp index 60d4dd1..f121c80 100644 --- a/src/crossdisasmcli.cpp +++ b/src/crossdisasmcli.cpp @@ -12,10 +12,12 @@ void help(char* program) } int main(int argc, char** argv) { + using namespace Tesses::Framework; using namespace Tesses::Framework::Streams; using namespace Tesses::Framework::Filesystem; using namespace Tesses::CrossLang; + TF_Init(); std::string file; Tesses::Framework::Filesystem::VFSPath path = VFSPath::GetAbsoluteCurrentDirectory(); diff --git a/src/crosslangdump.cpp b/src/crosslangdump.cpp index 2ae7080..7b845fc 100644 --- a/src/crosslangdump.cpp +++ b/src/crosslangdump.cpp @@ -265,6 +265,7 @@ void DumpFile(std::filesystem::path p) } int main(int argc, char** argv) { + Tesses::Framework::TF_Init(); for(int i = 1; i < argc; i++) { DumpFile(argv[i]); diff --git a/src/crosslangvm.cpp b/src/crosslangvm.cpp index f51ac90..c42c973 100644 --- a/src/crosslangvm.cpp +++ b/src/crosslangvm.cpp @@ -18,6 +18,42 @@ int main(int argc, char** argv) TStd::RegisterStd(&gc,env); env->LoadFileWithDependencies(&gc, Tesses::Framework::Filesystem::LocalFS, Tesses::Framework::Filesystem::LocalFS->SystemToVFSPath(argv[1])); + if(env->HasVariable("WebAppMain")) + { + Args args(argc, argv); + int port = 4206; + for(auto& item : args.options) + { + if(item.first == "port") + { + port = std::stoi(item.second); + } + } + TList* args2 = TList::Create(ls); + 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); for(int arg=1;argAdd(std::string(argv[arg])); @@ -26,5 +62,6 @@ int main(int argc, char** argv) int64_t iresult; if(GetObject(res,iresult)) return (int)iresult; + } return 0; } \ No newline at end of file diff --git a/src/crossmergecli.cpp b/src/crossmergecli.cpp index c9b4b7a..24deb19 100644 --- a/src/crossmergecli.cpp +++ b/src/crossmergecli.cpp @@ -11,6 +11,7 @@ int main(int argc, char** argv) using namespace Tesses::Framework::Streams; using namespace Tesses::Framework::Filesystem; using namespace Tesses::CrossLang; + TF_Init(); if(argc < 3) { diff --git a/src/crossthumbnailer.cpp b/src/crossthumbnailer.cpp index 784e545..951ba40 100644 --- a/src/crossthumbnailer.cpp +++ b/src/crossthumbnailer.cpp @@ -8,6 +8,7 @@ #include int main(int argc,char** argv) { + Tesses::Framework::TF_Init(); std::string p = argv[0]; auto emptyThumb =Tesses::Framework::Platform::Environment::GetRealExecutablePath(p).GetParent().GetParent() / "share" / "icons" / "crosslang.png";