recipes/relibc/recipe.toml → recipes/core/relibc/recipe.toml

@@ -5,5 +5,5 @@ git = "https://gitlab.redox-os.org/redox-os/relibc.git"
 template = "custom"
 script = """
 rsync -av --delete "${COOKBOOK_SOURCE}/" ./
-"$REDOX_MAKE" CARGO="env -u CARGO cargo" -j"$($NPROC)" DESTDIR="${COOKBOOK_STAGE}" install
+"${COOKBOOK_MAKE}" CARGO="env -u CARGO cargo" -j"$($NPROC)" DESTDIR="${COOKBOOK_STAGE}" install
 """

recipes/userutils/recipe.toml → recipes/core/userutils/recipe.toml

@@ -6,8 +6,8 @@ template = "custom"
 script = """
 cookbook_cargo
 cp -rv "${COOKBOOK_SOURCE}/res" "${COOKBOOK_STAGE}/etc"
-ln -s id "${COOKBOOK_STAGE}/bin/whoami"
-chmod +s "${COOKBOOK_STAGE}/bin/passwd"
-chmod +s "${COOKBOOK_STAGE}/bin/sudo"
-chmod +s "${COOKBOOK_STAGE}/bin/su"
+ln -s id "${COOKBOOK_STAGE}/usr/bin/whoami"
+chmod +s "${COOKBOOK_STAGE}/usr/bin/passwd"
+chmod +s "${COOKBOOK_STAGE}/usr/bin/sudo"
+chmod +s "${COOKBOOK_STAGE}/usr/bin/su"
 """

recipes/uutils/recipe.toml → recipes/core/uutils/recipe.toml

 [source]
-git = "https://gitlab.redox-os.org/redox-os/uutils.git"
-branch = "redox"
+git = "https://gitlab.redox-os.org/andrey.turkin/uutils.git"
+branch = "cc-fix"
 
 [build]
 template = "custom"
 script = """
-COOKBOOK_CARGO_FLAGS+=(
-    --no-default-features
-    --features feat_os_unix_redox
-    --bin coreutils
-)
-cookbook_cargo
+cookbook_cargo --no-default-features --features feat_os_unix_redox --bin coreutils
 
 BINS=(
     base32
@@ -40,7 +35,7 @@ BINS=(
     fold
     hashsum
     head
-    install
+    #install need gid2grp
     join
     link
     ln
@@ -68,6 +63,7 @@ BINS=(
     sleep
     sort
     split
+    stat
     sum
     tac
     tail
@@ -84,6 +80,6 @@ BINS=(
 
 for bin in "${BINS[@]}"
 do
-  ln -sv coreutils "${COOKBOOK_STAGE}/bin/$bin"
+  ln -sv coreutils "${COOKBOOK_STAGE}/usr/bin/$bin"
 done
 """

recipes/cpal/recipe.sh

-GIT=https://gitlab.redox-os.org/redox-os/cpal.git
-GIT_UPSTREAM=https://github.com/tomaka/cpal.git
-BRANCH=redox
-CARGOFLAGS="--example beep"
-
-function recipe_stage {
-    dest="$(realpath $1)"
-    mkdir -pv "$dest/bin"
-    cp -v "target/${TARGET}/release/examples/beep" "$dest/bin/cpal"
-    skip=1
-}

recipes/demos/cairodemo/recipe.toml

+# source is part of cookbook
+
+[build]
+dependencies = [
+    "cairo",
+    "expat",
+    "fontconfig",
+    "freetype2",
+    "liborbital",
+    "libpng",
+    "pixman",
+    "zlib",
+]
+template = "custom"
+script = """
+export LDFLAGS="-L${COOKBOOK_SYSROOT}/lib"
+export CPPFLAGS="-I${COOKBOOK_SYSROOT}/include"
+"${CXX}" \
+    $("${PKG_CONFIG}" --cflags cairo) \
+    "${COOKBOOK_RECIPE}/cairodemo.c" \
+    -o cairodemo \
+    -static \
+    $("${PKG_CONFIG}" --libs cairo) \
+    -lorbital
+mkdir -pv "${COOKBOOK_STAGE}/bin"
+cp -v "cairodemo" "${COOKBOOK_STAGE}/bin/cairodemo"
+"""

recipes/cmatrix/recipe.sh → recipes/demos/cmatrix/recipe.sh

@@ -7,11 +7,6 @@ function recipe_version {
     skip=1
 }
 
-function recipe_update {
-    echo "skipping update"
-    skip=1
-}
-
 function recipe_build {
     sysroot="$(realpath ../sysroot)"
     export LDFLAGS="-L$sysroot/lib -static"
@@ -27,11 +22,6 @@ function recipe_build {
     skip=1
 }
 
-function recipe_test {
-    echo "skipping test"
-    skip=1
-}
-
 function recipe_clean {
     "$REDOX_MAKE" clean
     skip=1

recipes/demos/cpal/recipe.toml

+[source]
+git = "https://gitlab.redox-os.org/redox-os/cpal.git"
+branch = "redox"
+upstream = "https://github.com/tomaka/cpal.git"
+
+[build]
+template = "custom"
+script = """
+cookbook_cargo_examples beep
+"""

recipes/demos/gears/recipe.toml

+[build]
+dependencies=[
+    "liborbital",
+    "llvm18",
+    "mesa",
+    "mesa-glu",
+    "zlib",
+]
+template = "custom"
+script = """
+set -x
+"${CXX}" -O2 -I "${COOKBOOK_SYSROOT}/usr/include" -L "${COOKBOOK_SYSROOT}/usr/lib" "${COOKBOOK_RECIPE}/gears.c" -o gears -static -lorbital $("${PKG_CONFIG}" --libs glu) -lz
+set +x
+mkdir -pv "${COOKBOOK_STAGE}/usr/bin"
+cp -v "gears" "${COOKBOOK_STAGE}/usr/bin/gears"
+"""
\ No newline at end of file

recipes/demos/glutin/recipe.toml

+[source]
+git = "https://gitlab.redox-os.org/redox-os/glutin.git"
+branch = "redox-0.30"
+upstream = "https://github.com/rust-windowing/glutin.git"
+
+[build]
+template = "custom"
+dependencies = [
+    "llvm18",
+    "mesa",
+    "zlib"
+]
+script = """
+EXAMPLES=(
+    window
+)
+for example in "${EXAMPLES[@]}"
+do
+    cargo rustc \
+        --target "$TARGET" \
+        --release \
+        --manifest-path "${COOKBOOK_SOURCE}/glutin_examples/Cargo.toml" \
+        --example "${example}" \
+        -- \
+        -L "${COOKBOK_SYSROOT}/lib" \
+        -C link-args="-Wl,-Bstatic $("${TARGET}-pkg-config" --libs osmesa) -lz -lstdc++ -lc -lgcc"
+    mkdir -pv "${COOKBOOK_STAGE}/bin"
+    cp -v "target/${TARGET}/release/examples/${example}" "${COOKBOOK_STAGE}/bin/glutin_${example}"
+done
+"""

recipes/demos/iced/recipe.toml

+[source]
+git = "https://gitlab.redox-os.org/redox-os/iced.git"
+branch = "redox"
+
+[build]
+template = "custom"
+script = """
+cookbook_cargo_packages styling
+"""

recipes/demos/orbclient/recipe.toml

+[source]
+git = "https://gitlab.redox-os.org/redox-os/orbclient.git"
+
+[build]
+template = "custom"
+script = """
+cookbook_cargo_examples simple
+"""

recipes/osdemo/recipe.sh → recipes/demos/osdemo/recipe.sh

-BUILD_DEPENDS=(liborbital llvm mesa mesa_glu zlib)
+BUILD_DEPENDS=(liborbital llvm18 mesa mesa-glu zlib)
 
 function recipe_version {
     printf "1.0.0"
     skip=1
 }
 
-function recipe_update {
-    echo "skipping update"
-    skip=1
-}
-
 function recipe_prepare {
     rm -rf source
     mkdir source
@@ -24,11 +19,6 @@ function recipe_build {
     skip=1
 }
 
-function recipe_test {
-    echo "skipping test"
-    skip=1
-}
-
 function recipe_clean {
     "$REDOX_MAKE" clean
     skip=1

recipes/pixelcannon/recipe.sh → recipes/demos/pixelcannon/recipe.sh

 GIT=https://github.com/jackpot51/pixelcannon.git
-BINDIR=/ui/bin
+BINDIR=/usr/bin
 DEPENDS="orbital"
 
 function recipe_stage {