Separate language into docker and project folders

libriscv · Nov 21, 2024 · c3589b7 · c3589b7
1 parent 2ded4cb
commit c3589b7
Show file tree

Hide file tree

Showing 87 changed files with 73 additions and 3 deletions.
diff --git a/.github/workflows/build_docker.yml b/.github/workflows/build_docker.yml
@@ -38,6 +38,6 @@ jobs:
         with:
           platforms: linux/amd64,linux/arm64
           registry: ${{ env.REGISTRY }}
-          context: program/${{ matrix.compiler }}
+          context: program/${{ matrix.compiler }}/docker
           push: true
           tags: ghcr.io/libriscv/${{ matrix.compiler }}_compiler:latest
diff --git a/program/cpp/cmake/api b/program/cpp/cmake/api
@@ -1 +1 @@
-../api
+../docker/api
diff --git a/program/cpp/Dockerfile → program/cpp/docker/Dockerfile b/program/cpp/Dockerfile → program/cpp/docker/Dockerfile
diff --git a/program/cpp/api/api.cpp → program/cpp/docker/api/api.cpp b/program/cpp/api/api.cpp → program/cpp/docker/api/api.cpp
diff --git a/program/cpp/api/api.hpp → program/cpp/docker/api/api.hpp b/program/cpp/api/api.hpp → program/cpp/docker/api/api.hpp
diff --git a/program/cpp/api/api_inline.hpp → program/cpp/docker/api/api_inline.hpp b/program/cpp/api/api_inline.hpp → program/cpp/docker/api/api_inline.hpp
diff --git a/program/cpp/api/array.cpp → program/cpp/docker/api/array.cpp b/program/cpp/api/array.cpp → program/cpp/docker/api/array.cpp
diff --git a/program/cpp/api/array.hpp → program/cpp/docker/api/array.hpp b/program/cpp/api/array.hpp → program/cpp/docker/api/array.hpp
diff --git a/program/cpp/api/basis.cpp → program/cpp/docker/api/basis.cpp b/program/cpp/api/basis.cpp → program/cpp/docker/api/basis.cpp
diff --git a/program/cpp/api/basis.hpp → program/cpp/docker/api/basis.hpp b/program/cpp/api/basis.hpp → program/cpp/docker/api/basis.hpp
diff --git a/program/cpp/api/callable.hpp → program/cpp/docker/api/callable.hpp b/program/cpp/api/callable.hpp → program/cpp/docker/api/callable.hpp
diff --git a/program/cpp/api/canvas_item.hpp → program/cpp/docker/api/canvas_item.hpp b/program/cpp/api/canvas_item.hpp → program/cpp/docker/api/canvas_item.hpp
diff --git a/program/cpp/api/color.hpp → program/cpp/docker/api/color.hpp b/program/cpp/api/color.hpp → program/cpp/docker/api/color.hpp
diff --git a/program/cpp/api/dictionary.cpp → program/cpp/docker/api/dictionary.cpp b/program/cpp/api/dictionary.cpp → program/cpp/docker/api/dictionary.cpp
diff --git a/program/cpp/api/dictionary.hpp → program/cpp/docker/api/dictionary.hpp b/program/cpp/api/dictionary.hpp → program/cpp/docker/api/dictionary.hpp
diff --git a/program/cpp/api/function.hpp → program/cpp/docker/api/function.hpp b/program/cpp/api/function.hpp → program/cpp/docker/api/function.hpp
diff --git a/program/cpp/api/native.cpp → program/cpp/docker/api/native.cpp b/program/cpp/api/native.cpp → program/cpp/docker/api/native.cpp
diff --git a/program/cpp/api/node.cpp → program/cpp/docker/api/node.cpp b/program/cpp/api/node.cpp → program/cpp/docker/api/node.cpp
diff --git a/program/cpp/api/node.hpp → program/cpp/docker/api/node.hpp b/program/cpp/api/node.hpp → program/cpp/docker/api/node.hpp
diff --git a/program/cpp/api/node2d.cpp → program/cpp/docker/api/node2d.cpp b/program/cpp/api/node2d.cpp → program/cpp/docker/api/node2d.cpp
diff --git a/program/cpp/api/node2d.hpp → program/cpp/docker/api/node2d.hpp b/program/cpp/api/node2d.hpp → program/cpp/docker/api/node2d.hpp
diff --git a/program/cpp/api/node3d.cpp → program/cpp/docker/api/node3d.cpp b/program/cpp/api/node3d.cpp → program/cpp/docker/api/node3d.cpp
diff --git a/program/cpp/api/node3d.hpp → program/cpp/docker/api/node3d.hpp b/program/cpp/api/node3d.hpp → program/cpp/docker/api/node3d.hpp
diff --git a/program/cpp/api/object.cpp → program/cpp/docker/api/object.cpp b/program/cpp/api/object.cpp → program/cpp/docker/api/object.cpp
diff --git a/program/cpp/api/object.hpp → program/cpp/docker/api/object.hpp b/program/cpp/api/object.hpp → program/cpp/docker/api/object.hpp
diff --git a/program/cpp/api/packed_array.cpp → program/cpp/docker/api/packed_array.cpp b/program/cpp/api/packed_array.cpp → program/cpp/docker/api/packed_array.cpp
diff --git a/program/cpp/api/packed_array.hpp → program/cpp/docker/api/packed_array.hpp b/program/cpp/api/packed_array.hpp → program/cpp/docker/api/packed_array.hpp
diff --git a/program/cpp/api/plane.hpp → program/cpp/docker/api/plane.hpp b/program/cpp/api/plane.hpp → program/cpp/docker/api/plane.hpp
diff --git a/program/cpp/api/quaternion.cpp → program/cpp/docker/api/quaternion.cpp b/program/cpp/api/quaternion.cpp → program/cpp/docker/api/quaternion.cpp
diff --git a/program/cpp/api/quaternion.hpp → program/cpp/docker/api/quaternion.hpp b/program/cpp/api/quaternion.hpp → program/cpp/docker/api/quaternion.hpp
diff --git a/program/cpp/api/rect2.hpp → program/cpp/docker/api/rect2.hpp b/program/cpp/api/rect2.hpp → program/cpp/docker/api/rect2.hpp
diff --git a/program/cpp/api/rect2i.hpp → program/cpp/docker/api/rect2i.hpp b/program/cpp/api/rect2i.hpp → program/cpp/docker/api/rect2i.hpp
diff --git a/program/cpp/api/rid.hpp → program/cpp/docker/api/rid.hpp b/program/cpp/api/rid.hpp → program/cpp/docker/api/rid.hpp
diff --git a/program/cpp/api/string.cpp → program/cpp/docker/api/string.cpp b/program/cpp/api/string.cpp → program/cpp/docker/api/string.cpp
diff --git a/program/cpp/api/string.hpp → program/cpp/docker/api/string.hpp b/program/cpp/api/string.hpp → program/cpp/docker/api/string.hpp
diff --git a/program/cpp/api/syscalls.h → program/cpp/docker/api/syscalls.h b/program/cpp/api/syscalls.h → program/cpp/docker/api/syscalls.h
diff --git a/program/cpp/api/syscalls_fwd.hpp → program/cpp/docker/api/syscalls_fwd.hpp b/program/cpp/api/syscalls_fwd.hpp → program/cpp/docker/api/syscalls_fwd.hpp
diff --git a/program/cpp/api/timer.cpp → program/cpp/docker/api/timer.cpp b/program/cpp/api/timer.cpp → program/cpp/docker/api/timer.cpp
diff --git a/program/cpp/api/timer.hpp → program/cpp/docker/api/timer.hpp b/program/cpp/api/timer.hpp → program/cpp/docker/api/timer.hpp
diff --git a/program/cpp/api/transform2d.cpp → program/cpp/docker/api/transform2d.cpp b/program/cpp/api/transform2d.cpp → program/cpp/docker/api/transform2d.cpp
diff --git a/program/cpp/api/transform2d.hpp → program/cpp/docker/api/transform2d.hpp b/program/cpp/api/transform2d.hpp → program/cpp/docker/api/transform2d.hpp
diff --git a/program/cpp/api/transform3d.cpp → program/cpp/docker/api/transform3d.cpp b/program/cpp/api/transform3d.cpp → program/cpp/docker/api/transform3d.cpp
diff --git a/program/cpp/api/transform3d.hpp → program/cpp/docker/api/transform3d.hpp b/program/cpp/api/transform3d.hpp → program/cpp/docker/api/transform3d.hpp
diff --git a/program/cpp/api/variant.cpp → program/cpp/docker/api/variant.cpp b/program/cpp/api/variant.cpp → program/cpp/docker/api/variant.cpp
diff --git a/program/cpp/api/variant.hpp → program/cpp/docker/api/variant.hpp b/program/cpp/api/variant.hpp → program/cpp/docker/api/variant.hpp
diff --git a/program/cpp/api/vector.cpp → program/cpp/docker/api/vector.cpp b/program/cpp/api/vector.cpp → program/cpp/docker/api/vector.cpp
diff --git a/program/cpp/api/vector.hpp → program/cpp/docker/api/vector.hpp b/program/cpp/api/vector.hpp → program/cpp/docker/api/vector.hpp
diff --git a/program/cpp/api/vector2.hpp → program/cpp/docker/api/vector2.hpp b/program/cpp/api/vector2.hpp → program/cpp/docker/api/vector2.hpp
diff --git a/program/cpp/api/vector2i.hpp → program/cpp/docker/api/vector2i.hpp b/program/cpp/api/vector2i.hpp → program/cpp/docker/api/vector2i.hpp
diff --git a/program/cpp/api/vector3.hpp → program/cpp/docker/api/vector3.hpp b/program/cpp/api/vector3.hpp → program/cpp/docker/api/vector3.hpp
diff --git a/program/cpp/api/vector3i.hpp → program/cpp/docker/api/vector3i.hpp b/program/cpp/api/vector3i.hpp → program/cpp/docker/api/vector3i.hpp
diff --git a/program/cpp/api/vector4.hpp → program/cpp/docker/api/vector4.hpp b/program/cpp/api/vector4.hpp → program/cpp/docker/api/vector4.hpp
diff --git a/program/cpp/api/vector4i.hpp → program/cpp/docker/api/vector4i.hpp b/program/cpp/api/vector4i.hpp → program/cpp/docker/api/vector4i.hpp
diff --git a/program/cpp/build.sh → program/cpp/docker/build.sh b/program/cpp/build.sh → program/cpp/docker/build.sh
diff --git a/program/cpp/container_build.sh → program/cpp/docker/container_build.sh b/program/cpp/container_build.sh → program/cpp/docker/container_build.sh
diff --git a/program/cpp/docker.sh → program/cpp/docker/docker.sh b/program/cpp/docker.sh → program/cpp/docker/docker.sh
diff --git a/program/cpp/start.sh → program/cpp/docker/start.sh b/program/cpp/start.sh → program/cpp/docker/start.sh
diff --git a/program/cpp/stop_and_remove.sh → program/cpp/docker/stop_and_remove.sh b/program/cpp/stop_and_remove.sh → program/cpp/docker/stop_and_remove.sh
diff --git a/program/cpp/test_local_compiler.sh → program/cpp/docker/test_local_compiler.sh b/program/cpp/test_local_compiler.sh → program/cpp/docker/test_local_compiler.sh
diff --git a/program/rust/.cargo/config.toml → program/rust/docker/.cargo/config.toml b/program/rust/.cargo/config.toml → program/rust/docker/.cargo/config.toml
diff --git a/program/rust/.gitignore → program/rust/docker/.gitignore b/program/rust/.gitignore → program/rust/docker/.gitignore
diff --git a/program/rust/Cargo.toml → program/rust/docker/Cargo.toml b/program/rust/Cargo.toml → program/rust/docker/Cargo.toml
diff --git a/program/rust/Dockerfile → program/rust/docker/Dockerfile b/program/rust/Dockerfile → program/rust/docker/Dockerfile
diff --git a/program/rust/build.sh → program/rust/docker/build.sh b/program/rust/build.sh → program/rust/docker/build.sh
@@ -34,6 +34,12 @@ if [ -z "$output" ]; then
 	usage
 fi
 
+if [ "$locally" = true ]; then
+	cargo +nightly build --release # --color never
+	cp target/riscv64gc-unknown-linux-gnu/release/rust_program $output
+	exit
+fi
+
 # We are in /usr/src now, so what we need to do is copy the input files to the project directory
 # The project is in /usr/project
 cp $@ /usr/project/src/

diff --git a/program/rust/container_build.sh → program/rust/docker/container_build.sh b/program/rust/container_build.sh → program/rust/docker/container_build.sh
diff --git a/program/rust/src/godot/api.rs → program/rust/docker/src/godot/api.rs b/program/rust/src/godot/api.rs → program/rust/docker/src/godot/api.rs
diff --git a/program/rust/src/godot/mod.rs → program/rust/docker/src/godot/mod.rs b/program/rust/src/godot/mod.rs → program/rust/docker/src/godot/mod.rs
diff --git a/program/rust/src/godot/node.rs → program/rust/docker/src/godot/node.rs b/program/rust/src/godot/node.rs → program/rust/docker/src/godot/node.rs
diff --git a/program/rust/src/godot/sysalloc.rs → program/rust/docker/src/godot/sysalloc.rs b/program/rust/src/godot/sysalloc.rs → program/rust/docker/src/godot/sysalloc.rs
diff --git a/program/rust/src/godot/variant.rs → program/rust/docker/src/godot/variant.rs b/program/rust/src/godot/variant.rs → program/rust/docker/src/godot/variant.rs
diff --git a/program/rust/start.sh → program/rust/docker/start.sh b/program/rust/start.sh → program/rust/docker/start.sh
diff --git a/program/rust/stop_and_remove.sh → program/rust/docker/stop_and_remove.sh b/program/rust/stop_and_remove.sh → program/rust/docker/stop_and_remove.sh
diff --git a/program/rust/project/.cargo/config.toml b/program/rust/project/.cargo/config.toml
@@ -0,0 +1,6 @@
+[build]
+target = "riscv64gc-unknown-linux-gnu"
+
+[target.riscv64gc-unknown-linux-gnu]
+linker = "riscv64-linux-gnu-gcc-12"
+rustflags = ["-C", "target-feature=+crt-static","-Zexport-executable-symbols", "-C", "link_args=-Wl,--wrap=memcpy,--wrap=memmove,--wrap=memset,--wrap=memcmp"]
diff --git a/program/rust/project/.gitignore b/program/rust/project/.gitignore
@@ -0,0 +1,4 @@
+# Rust ignore
+Cargo.lock
+target/
+*.elf
diff --git a/program/rust/project/Cargo.toml b/program/rust/project/Cargo.toml
@@ -0,0 +1,8 @@
+[package]
+name = "rust_program"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
diff --git a/program/rust/project/build.sh b/program/rust/project/build.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+set -e
+
+usage() {
+	echo "Usage: $0 [--api] [-o output] -- [input...]"
+	echo "  --api        Instead of compiling, copy the API files to the output."
+	echo "   -o output   Compile sources into an output ELF file, including API and inputs."
+	echo "  --debug      Compile with debug information."
+	echo "  --version    Print the current version of the API."
+	echo "   -v          Verbose output."
+	echo "  --           Separate options from input files."
+	exit 1
+}
+
+verbose=false
+current_version=5
+output="rust.elf"
+
+while [[ "$#" -gt 0 ]]; do
+	case $1 in
+		--api) cp -r /usr/api $1; exit ;;
+		-o) shift; output="$1"; shift; break ;;
+		--debug) shift ;;
+		--version) shift; echo "$current_version"; exit ;;
+		-v) verbose=true; shift ;;
+		--) shift; break ;;
+		*) usage ;;
+	esac
+done
+
+cargo +nightly build --release # --color never
+cp target/riscv64gc-unknown-linux-gnu/release/rust_program $output
diff --git a/program/rust/project/src/godot b/program/rust/project/src/godot
@@ -0,0 +1 @@
+../../docker/src/godot
diff --git a/program/rust/project/src/main.rs b/program/rust/project/src/main.rs
@@ -0,0 +1,12 @@
+mod godot;
+use godot::variant::*;
+
+pub fn main() {
+}
+
+#[no_mangle]
+pub fn public_function() -> Variant {
+	print1(&Variant::new_string("Hello from Rust!"));
+
+	return Variant::new_float(3.14);
+}
diff --git a/program/zig/.gitignore → program/zig/docker/.gitignore b/program/zig/.gitignore → program/zig/docker/.gitignore
diff --git a/program/zig/Dockerfile → program/zig/docker/Dockerfile b/program/zig/Dockerfile → program/zig/docker/Dockerfile
diff --git a/program/zig/api/api.zig → program/zig/docker/api/api.zig b/program/zig/api/api.zig → program/zig/docker/api/api.zig
diff --git a/program/zig/build.sh → program/zig/docker/build.sh b/program/zig/build.sh → program/zig/docker/build.sh
diff --git a/program/zig/container_build.sh → program/zig/docker/container_build.sh b/program/zig/container_build.sh → program/zig/docker/container_build.sh
diff --git a/program/zig/start.sh → program/zig/docker/start.sh b/program/zig/start.sh → program/zig/docker/start.sh
diff --git a/program/zig/stop_and_remove.sh → program/zig/docker/stop_and_remove.sh b/program/zig/stop_and_remove.sh → program/zig/docker/stop_and_remove.sh
diff --git a/program/zig/project/api b/program/zig/project/api
@@ -0,0 +1 @@
+../docker/api
diff --git a/src/syscalls.h b/src/syscalls.h
@@ -1 +1 @@
-../program/cpp/api/syscalls.h
+../program/cpp/docker/api/syscalls.h
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		../program/cpp/api/syscalls.h
		../program/cpp/docker/api/syscalls.h