Merge pull request #29 from libriscv/dockerization

Use a Docker container to compile C++ sources to a local .elf

.gitignore

@@ -7,4 +7,5 @@ program/test
 .DS_Store
 *.o
 *.os
+*.elf
 bin/addons/godot_sandbox/bin/*

CMakeLists.txt

@@ -5,14 +5,19 @@ option(SANITIZE    "Enable sanitizers" OFF)
 option(STATIC_BUILD "Build statically" OFF)
 
 set(SOURCES
-    src/gvar.cpp
+	src/cpp/resource_loader_cpp.cpp
+	src/cpp/resource_saver_cpp.cpp
+	src/cpp/script_cpp.cpp
+	src/cpp/script_language_cpp.cpp
+	src/elf/resource_loader_elf.cpp
+	src/elf/resource_saver_elf.cpp
+	src/elf/script_elf.cpp
+	src/elf/script_language_elf.cpp
+	src/gvar.cpp
     src/register_types.cpp
-    src/resource_cpp.cpp
-    src/resource_loader_cpp.cpp
-    src/resource_elf.cpp
-    src/resource_loader_elf.cpp
     src/sandbox.cpp
     src/sandbox_functions.cpp
+	src/sandbox_project_settings.cpp
 	src/syscalls.cpp
 )
 

README.md

@@ -141,5 +141,5 @@ This project provides a dockerfile for compiling cpp code locally. For usage exa
 
 ```
 cd program
-docker run -v .:/usr/src -d ghcr.io/fwsgonzo/compiler build.sh
+docker run --rm -v .:/usr/src -d ghcr.io/fwsgonzo/compiler myoutputfile.elf
 ```

program/Dockerfile

@@ -4,18 +4,24 @@ FROM ubuntu:24.04
 # docker build -t riscv64-linux-gnu .
 #
 # To run the container:
-# docker run -it -v .:/usr/src riscv64-linux-gnu
-#
-# Once inside run 'build.sh' to build the project
-# ./build.sh
+# docker run -it -v .:/usr/src riscv64-linux-gnu <my.elf>
 #
 # Install dependencies
 RUN apt-get update && apt-get install -y \
-	g++-13-riscv64-linux-gnu \
-	ninja-build \
-	cmake
+	g++-14-riscv64-linux-gnu \
+	g++ git cmake
 
+# Clone and build mold
+WORKDIR /usr/mold
+RUN git clone https://github.com/rui314/mold.git /usr/mold
+RUN mkdir -p /usr/mold/build && cd /usr/mold/build && cmake .. && make -j8
+RUN cd /usr/mold/build && make install
+RUN rm -rf /usr/mold
 
 # Enter the shared directory
 WORKDIR /usr/src
-ENTRYPOINT ["/bin/bash"]
+# Copy API files
+RUN mkdir -p /usr/api
+COPY build.sh api/* /usr/api/
+# Set the entrypoint to the build script
+ENTRYPOINT "/usr/api/build.sh" "$0" "$@"

program/build.sh

@@ -1,2 +1,2 @@
-
-riscv64-linux-gnu-g++-13 -static -O2 -std=gnu++23 test.cpp variant.cpp -o test
+echo $@
+riscv64-linux-gnu-g++-14 -static -O2 -std=gnu++23 -I/usr/api -fuse-ld=mold -Wl,--quick-exit -Wl,--execute-only /usr/api/*.cpp *.cpp -o $1

src/cpp/resource_saver_cpp.cpp

@@ -1,13 +1,25 @@
 #include "resource_saver_cpp.h"
 #include "script_cpp.h"
 #include <godot_cpp/classes/file_access.hpp>
+#include <godot_cpp/classes/os.hpp>
+#include <godot_cpp/variant/utility_functions.hpp>
 
 Error ResourceFormatSaverCPP::_save(const Ref<Resource> &p_resource, const String &p_path, uint32_t p_flags) {
 	CPPScript *script = Object::cast_to<CPPScript>(p_resource.ptr());
 	if (script != nullptr) {
 		Ref<FileAccess> handle = FileAccess::open(p_path, FileAccess::ModeFlags::WRITE);
 		if (handle.is_valid()) {
 			handle->store_string(script->_get_source_code());
+			// Get the absolute path without the file name
+			String path = handle->get_path_absolute().get_base_dir();
+			String fname = handle->get_path_absolute().get_file().get_basename() + String(".elf");
+
+			// Invoke docker to compile the file
+			godot::OS *OS = godot::OS::get_singleton();
+			PackedStringArray arguments = { "run", "--rm", "-v", path + String(":/usr/src"), "ghcr.io/libriscv/compiler", fname };
+			Array outp;
+			OS->execute("docker", arguments, outp);
+			// TODO: What now?
 			return Error::OK;
 		} else {
 			return Error::ERR_FILE_CANT_OPEN;

src/syscalls.h

@@ -1 +1 @@
-../program/syscalls.h
+../program/api/syscalls.h