Merge branch 'update-dev-configs' into 'master'

Unify dev variants and use dev-redox meta-package

See merge request redox-os/redox!1621
This commit is contained in:
Jeremy Soller 2025-08-01 09:12:56 -06:00
commit d4e4faead1
5 changed files with 1 additions and 155 deletions

View File

@ -1,20 +0,0 @@
# Configuration for Redox development
include = ["../dev-redox.toml"]
# Override the default settings here
# General settings
[general]
# Filesystem size in MiB
# filesystem_size = 1024
# Package settings
[packages]
# see ci.toml for error reasons
gdbserver = "ignore"
gnu-binutils = "ignore"
mesa = "ignore"
mesa-glu = "ignore"
mpc = "ignore"
strace = "ignore"

View File

@ -1,56 +0,0 @@
# Configuration for Redox development
include = ["desktop.toml"]
# General settings
[general]
# Filesystem size in MiB
filesystem_size = 20000
# Do not prompt if settings are not defined
prompt = false
# Package settings
[packages]
dev-essential = {}
redox-tests = {}
[[files]]
path = "/home/user/test.rs"
data = """
fn main() {
println!("Hello, Redox!");
}
"""
[[files]]
path = "/home/user/test.c"
data = """
#include <stdio.h>
int main(void) {
printf("Hello, Redox!\\n");
}
"""
[[files]]
path = "/home/user/test.cpp"
data = """
#include <iostream>
int main()
{
std::cout << "Hello, Redox!" << std::endl;
}
"""
[[files]]
path = "/home/user/test.py"
data = """
print("Hello, Redox!")
"""
[[files]]
path = "/home/user/test.lua"
data = """
print("Hello, Redox!")
"""

View File

@ -11,57 +11,7 @@ prompt = false
# Package settings
[packages]
acid = {}
autoconf = {}
automake = {}
cargo = {}
crates-io-index = {}
exampled = {}
gcc13 = {}
gdbserver = {}
gnu-binutils = {}
gnu-grep = {}
gnu-make = {}
libffi = {}
libgmp = {}
libiconv = {}
libjpeg = {}
libogg = {}
liborbital = {}
libpng = {}
libsodium = {}
libvorbis = {}
libxml2 = {}
llvm18 = {}
lua54 = {}
mesa = {}
mesa-glu = {}
nasm = {}
ncurses = {}
nghttp2 = {}
openssl1 = {}
orbclient = {}
patch = {}
pcre = {}
pkg-config = {}
resist = {}
ripgrep = {}
rust = {}
sdl-gfx = {}
sdl1 = {}
sdl1-image = {}
sdl1-mixer = {}
sdl1-ttf = {}
sdl2 = {}
sdl2-gears = {}
sdl2-image = {}
sdl2-mixer = {}
sdl2-ttf = {}
sed = {}
strace = {}
terminfo = {}
xz = {}
zlib = {}
dev-redox = {}
[[files]]
path = "/home/user/test.rs"

View File

@ -1,14 +0,0 @@
# Configuration for Redox development
include = ["../dev-redox.toml"]
# Override the default settings here
# General settings
[general]
# Filesystem size in MiB
# filesystem_size = 1024
# Package settings
[packages]
# example = {}

View File

@ -1,14 +0,0 @@
# Configuration for Redox development
include = ["../dev-redox.toml"]
# Override the default settings here
# General settings
[general]
# Filesystem size in MiB
# filesystem_size = 1024
# Package settings
[packages]
# example = {}