diff --git a/config/aarch64/dev-redox.toml b/config/aarch64/dev-redox.toml deleted file mode 100644 index 89bba21e9..000000000 --- a/config/aarch64/dev-redox.toml +++ /dev/null @@ -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" diff --git a/config/aarch64/dev.toml b/config/aarch64/dev.toml index fc248b744..ce6a482d6 100644 --- a/config/aarch64/dev.toml +++ b/config/aarch64/dev.toml @@ -1,4 +1,4 @@ -# Configuration for non-Redox development +# Configuration for development include = ["../dev.toml"] diff --git a/config/dev-redox.toml b/config/dev-redox.toml deleted file mode 100644 index e19568f47..000000000 --- a/config/dev-redox.toml +++ /dev/null @@ -1,73 +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 = {} -exampled = {} -gdbserver = {} -libgmp = {} -libiconv = {} -liborbital = {} -libsodium = {} -libxml2 = {} -llvm18 = {} -ncurses = {} -nghttp2 = {} -openssl1 = {} -orbclient = {} -pcre = {} -ripgrep = {} -terminfo = {} -xz = {} -zlib = {} - -[[files]] -path = "/home/user/test.rs" -data = """ -fn main() { - println!("Hello, Redox!"); -} -""" - -[[files]] -path = "/home/user/test.c" -data = """ -#include - -int main(void) { - printf("Hello, Redox!\\n"); -} -""" - -[[files]] -path = "/home/user/test.cpp" -data = """ -#include - -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!") -""" diff --git a/config/dev.toml b/config/dev.toml index e19e6d346..c3fa5bf94 100644 --- a/config/dev.toml +++ b/config/dev.toml @@ -1,14 +1,55 @@ -# Configuration for non-Redox development +# Configuration for development include = ["desktop.toml"] # General settings [general] # Filesystem size in MiB -filesystem_size = 10000 +filesystem_size = 20000 # Do not prompt if settings are not defined prompt = false # Package settings [packages] -dev-essential = {} +dev-redox = {} + +[[files]] +path = "/home/user/test.rs" +data = """ +fn main() { + println!("Hello, Redox!"); +} +""" + +[[files]] +path = "/home/user/test.c" +data = """ +#include + +int main(void) { + printf("Hello, Redox!\\n"); +} +""" + +[[files]] +path = "/home/user/test.cpp" +data = """ +#include + +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!") +""" diff --git a/config/i686/dev-redox.toml b/config/i686/dev-redox.toml deleted file mode 100644 index 655a72b2f..000000000 --- a/config/i686/dev-redox.toml +++ /dev/null @@ -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 = {} \ No newline at end of file diff --git a/config/i686/dev.toml b/config/i686/dev.toml index 5234e1b3c..ecd30849a 100644 --- a/config/i686/dev.toml +++ b/config/i686/dev.toml @@ -1,4 +1,4 @@ -# Configuration for non-Redox development +# Configuration for development include = ["../dev.toml"] diff --git a/config/x86_64/dev-redox.toml b/config/x86_64/dev-redox.toml deleted file mode 100644 index 655a72b2f..000000000 --- a/config/x86_64/dev-redox.toml +++ /dev/null @@ -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 = {} \ No newline at end of file diff --git a/config/x86_64/dev.toml b/config/x86_64/dev.toml index 5234e1b3c..ecd30849a 100644 --- a/config/x86_64/dev.toml +++ b/config/x86_64/dev.toml @@ -1,4 +1,4 @@ -# Configuration for non-Redox development +# Configuration for development include = ["../dev.toml"]