From 05b5914b35492ddb4076873e0b6519396dfe92de Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Mon, 12 May 2025 18:01:53 +0100 Subject: lib.sh: remove mk() i don't need it. i can use fx_ instead, on functions that previously called mk(). Signed-off-by: Leah Rowe --- include/release.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'include/release.sh') diff --git a/include/release.sh b/include/release.sh index 4741b44a..0afb777f 100644 --- a/include/release.sh +++ b/include/release.sh @@ -55,7 +55,8 @@ build_release() ( x_ cd "$relsrcdir" x_ ./mk -d coreboot - mk -b coreboot pico-serprog stm32-vserprog pcsx-redux + fx_ "x_ ./mk -b" printf \ + "coreboot\npico-serprog\nstm32-vserprog\npcsx-redux\n" fx_ mkrom_tarball x_ find bin -maxdepth 1 -type d -name "serprog_*" x_ mv bin ../roms -- cgit v1.2.1 From 92954eeb38f69ebc0cfef7b9629e96a1599667be Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Mon, 12 May 2025 19:20:50 +0100 Subject: lib.sh: remove rmgit() We don't need to call it from git.sh, because it's only being done when building a release anyway, and we already run rmgit when doing a release. The function itself is only two simple fx_ calls, so we can just do that from build_release(). Signed-off-by: Leah Rowe --- include/release.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'include/release.sh') diff --git a/include/release.sh b/include/release.sh index 0afb777f..be221d19 100644 --- a/include/release.sh +++ b/include/release.sh @@ -37,7 +37,8 @@ build_release() x_ cd "$relsrcdir" x_ ./mk -f - rmgit . + fx_ "x_ rm -Rf" x_ find . -name ".git" + fx_ "x_ rm -Rf" x_ find . -name ".gitmodules" x_ mv src/docs docs ) || err "can't create release files" -- cgit v1.2.1 From c85aff5c54e8a2b0b649882b555e704bded268a9 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Mon, 12 May 2025 19:29:58 +0100 Subject: release.sh: delete tmp/cache from the tarball Signed-off-by: Leah Rowe --- include/release.sh | 1 + 1 file changed, 1 insertion(+) (limited to 'include/release.sh') diff --git a/include/release.sh b/include/release.sh index be221d19..ecff57b3 100644 --- a/include/release.sh +++ b/include/release.sh @@ -45,6 +45,7 @@ build_release() git log --graph --pretty=format:'%Cred%h%Creset %s %Creset' \ --abbrev-commit > "$relsrcdir/CHANGELOG" || err "!log $relsrcdir" x_ rm -f "$relsrcdir/lock" + x_ rm -Rf "$relsrcdir/cache" "$relsrcdir/tmp" ( x_ cd "${relsrcdir%/*}" -- cgit v1.2.1 From f4871da9bca612fc2bcafaedc6b023863c411829 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Mon, 12 May 2025 19:49:50 +0100 Subject: release.sh: split up build_release() Signed-off-by: Leah Rowe --- include/release.sh | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) (limited to 'include/release.sh') diff --git a/include/release.sh b/include/release.sh index ecff57b3..05e872d5 100644 --- a/include/release.sh +++ b/include/release.sh @@ -24,45 +24,50 @@ release() [ -e "$vdir" ] && err "already exists: \"$vdir\"" x_ mkdir -p "$vdir" x_ git clone . "$relsrcdir" - x_ touch "$relsrcdir/lock" - build_release + prep_release src + prep_release_tarball + [ "$relmode" = "src" ] || prep_release bin + x_ rm -Rf "$relsrcdir" printf "\n\nDONE! Check release files under %s\n" "$vdir" } -build_release() +prep_release() { + x_ touch "$relsrcdir/lock" ( x_ cd "$relsrcdir" + prep_release_$1 + ) || err "can't prep release $1" +} +prep_release_src() +{ x_ ./mk -f fx_ "x_ rm -Rf" x_ find . -name ".git" fx_ "x_ rm -Rf" x_ find . -name ".gitmodules" x_ mv src/docs docs - ) || err "can't create release files" +} +prep_release_tarball() +{ git log --graph --pretty=format:'%Cred%h%Creset %s %Creset' \ --abbrev-commit > "$relsrcdir/CHANGELOG" || err "!log $relsrcdir" x_ rm -f "$relsrcdir/lock" x_ rm -Rf "$relsrcdir/cache" "$relsrcdir/tmp" - ( x_ cd "${relsrcdir%/*}" x_ mktarball "${relsrcdir##*/}" "${relsrcdir##*/}.tar.xz" - ) || err "can't create src tarball" - [ "$relmode" = "src" ] && return 0 + ) || err "can't create src tarball"; : +} - x_ touch "$relsrcdir/lock" - ( - x_ cd "$relsrcdir" +prep_release_bin() +{ x_ ./mk -d coreboot fx_ "x_ ./mk -b" printf \ "coreboot\npico-serprog\nstm32-vserprog\npcsx-redux\n" fx_ mkrom_tarball x_ find bin -maxdepth 1 -type d -name "serprog_*" x_ mv bin ../roms - ) || err "can't build rom images" - - x_ rm -Rf "$relsrcdir" } -- cgit v1.2.1 From a0105e1ab44f9021d8a89f9932ea3a53e4a02eeb Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Mon, 12 May 2025 20:07:50 +0100 Subject: release.sh: remove unnecessary mkdir command the following git clone command creates that directory Signed-off-by: Leah Rowe --- include/release.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/release.sh') diff --git a/include/release.sh b/include/release.sh index 05e872d5..640391f8 100644 --- a/include/release.sh +++ b/include/release.sh @@ -22,7 +22,7 @@ release() relsrcdir="$vdir/$src_dirname" [ -e "$vdir" ] && err "already exists: \"$vdir\"" - x_ mkdir -p "$vdir" + x_ git clone . "$relsrcdir" prep_release src -- cgit v1.2.1 From 6d3a6347c3ee93f674f129ffe1b9120741b34b00 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Mon, 12 May 2025 20:23:41 +0100 Subject: release.sh: build in tmp directory first don't move to the real directory until the work is done. that way, a re-try can be done, while analysing the old files. it is created based on the tmpdir, under XBMK_CACHE/ Signed-off-by: Leah Rowe --- include/release.sh | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) (limited to 'include/release.sh') diff --git a/include/release.sh b/include/release.sh index 640391f8..eb0d58d8 100644 --- a/include/release.sh +++ b/include/release.sh @@ -1,28 +1,32 @@ # SPDX-License-Identifier: GPL-3.0-or-later # Copyright (c) 2023-2025 Leah Rowe -eval "`setvars "" vdir src_dirname relsrcdir relmode`" +eval "`setvars "" reldir reldest vdir src_dirname relsrcdir relmode`" release() { export XBMK_RELEASE="y" - vdir="release" + reldir="release" + while getopts d:m: option; do [ -z "$OPTARG" ] && err "empty argument not allowed" case "$option" in - d) vdir="$OPTARG" ;; + d) reldir="$OPTARG" ;; m) relmode="$OPTARG" ;; *) err "invalid option '-$option'" ;; esac done - vdir="$vdir/$version" + reldest="$reldir/$version" + [ -e "$reldest" ] && \ + err "already exists: \"$reldest\"" + + vdir="$XBMK_CACHE/relpwd/${xbmktmp##*/}/$version" src_dirname="${relname}_src" relsrcdir="$vdir/$src_dirname" - [ -e "$vdir" ] && err "already exists: \"$vdir\"" - + remkdir "$vdir" x_ git clone . "$relsrcdir" prep_release src @@ -30,7 +34,10 @@ release() [ "$relmode" = "src" ] || prep_release bin x_ rm -Rf "$relsrcdir" - printf "\n\nDONE! Check release files under %s\n" "$vdir" + x_ mkdir -p "$reldir" + x_ mv "$vdir" "$reldir" + + printf "\n\nDONE! Check release files under %s\n" "$reldest" } prep_release() -- cgit v1.2.1 From d4c0479093ab33a3909d4408ad17ca740e0436a5 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Mon, 12 May 2025 20:25:03 +0100 Subject: release.sh: remove src_dirname variable Signed-off-by: Leah Rowe --- include/release.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'include/release.sh') diff --git a/include/release.sh b/include/release.sh index eb0d58d8..f34eb6df 100644 --- a/include/release.sh +++ b/include/release.sh @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later # Copyright (c) 2023-2025 Leah Rowe -eval "`setvars "" reldir reldest vdir src_dirname relsrcdir relmode`" +eval "`setvars "" reldir reldest vdir relsrcdir relmode`" release() { @@ -23,8 +23,7 @@ release() err "already exists: \"$reldest\"" vdir="$XBMK_CACHE/relpwd/${xbmktmp##*/}/$version" - src_dirname="${relname}_src" - relsrcdir="$vdir/$src_dirname" + relsrcdir="$vdir/${relname}_src" remkdir "$vdir" x_ git clone . "$relsrcdir" -- cgit v1.2.1 From 66f7ecdb2d7ef03c56bf50171911a66c92b8238a Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Mon, 12 May 2025 21:04:48 +0100 Subject: release.sh: clean up the vdir after release do this after moving the version directory within it. Signed-off-by: Leah Rowe --- include/release.sh | 1 + 1 file changed, 1 insertion(+) (limited to 'include/release.sh') diff --git a/include/release.sh b/include/release.sh index f34eb6df..9046acbf 100644 --- a/include/release.sh +++ b/include/release.sh @@ -35,6 +35,7 @@ release() x_ mkdir -p "$reldir" x_ mv "$vdir" "$reldir" + x_ rm -Rf "${vdir%"/$version"}" printf "\n\nDONE! Check release files under %s\n" "$reldest" } -- cgit v1.2.1 From 6bf24221e60cfcc21bef445274973570ace436c5 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Mon, 12 May 2025 21:11:34 +0100 Subject: release.sh: simplify release() Signed-off-by: Leah Rowe --- include/release.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'include/release.sh') diff --git a/include/release.sh b/include/release.sh index 9046acbf..fbcc5621 100644 --- a/include/release.sh +++ b/include/release.sh @@ -28,9 +28,7 @@ release() remkdir "$vdir" x_ git clone . "$relsrcdir" - prep_release src - prep_release_tarball - [ "$relmode" = "src" ] || prep_release bin + fx_ prep_release printf "src\ntarball\nbin\n" x_ rm -Rf "$relsrcdir" x_ mkdir -p "$reldir" @@ -44,7 +42,7 @@ prep_release() { x_ touch "$relsrcdir/lock" ( - x_ cd "$relsrcdir" + [ "$1" = "tarball" ] || x_ cd "$relsrcdir" prep_release_$1 ) || err "can't prep release $1" } @@ -71,6 +69,7 @@ prep_release_tarball() prep_release_bin() { + [ "$relmode" = "src" ] && return 0 x_ ./mk -d coreboot fx_ "x_ ./mk -b" printf \ "coreboot\npico-serprog\nstm32-vserprog\npcsx-redux\n" -- cgit v1.2.1 From 6089716f07caf6b4690df1e1c2f2089a27a0b514 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Tue, 13 May 2025 22:17:37 +0100 Subject: release.sh: Don't run prep_release with fx_ The result of the printf statement is sorted, making it do binaries first, which results in a lot of junk files then being present inside the source archive. Signed-off-by: Leah Rowe --- include/release.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'include/release.sh') diff --git a/include/release.sh b/include/release.sh index fbcc5621..f0799f17 100644 --- a/include/release.sh +++ b/include/release.sh @@ -28,7 +28,9 @@ release() remkdir "$vdir" x_ git clone . "$relsrcdir" - fx_ prep_release printf "src\ntarball\nbin\n" + prep_release src + prep_release tarball + prep_release bin x_ rm -Rf "$relsrcdir" x_ mkdir -p "$reldir" -- cgit v1.2.1