diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/init.sh | 7 | ||||
| -rw-r--r-- | include/lib.sh | 1 | ||||
| -rw-r--r-- | include/rom.sh | 25 |
3 files changed, 5 insertions, 28 deletions
diff --git a/include/init.sh b/include/init.sh index b515cebc..1b8432ce 100644 --- a/include/init.sh +++ b/include/init.sh @@ -161,14 +161,13 @@ xbmk_set_env() xbmk_set_version() { - for fv in version versiondate; do - eval "[ ! -f \"\.$fv\" ] || read -r $fv < \"\.$fv\" || :" - done + [ ! -f ".version" ] || read -r version < ".version" || :; : + [ ! -f ".versiondate" ] || read -r versiondate < ".versiondate" || :; : [ -e ".git" ] || [ -f ".version" ] || printf "unknown\n" > ".version" \ || $err "Cannot generate unknown .version file" [ -e ".git" ] || [ -f ".versiondate" ] || printf "1716415872\n" > \ - .versiondate || $err "Cannot generate unknown .versiondate file"; : + ".versiondate" || $err "Can't generate unknown versiondate file"; : version_="$version" [ ! -e ".git" ] || version="$(git describe --tags HEAD 2>&1)" || \ diff --git a/include/lib.sh b/include/lib.sh index 5e88fa54..7a5f2621 100644 --- a/include/lib.sh +++ b/include/lib.sh @@ -24,6 +24,7 @@ mkrom_tarball() mktarball() { + printf "Creating tar archive '%s' from directory '%s'\n" "$2" "$1" [ "${2%/*}" = "$2" ] || x_ mkdir -p "${2%/*}" x_ tar -c "$1" | xz -T$XBMK_THREADS -9e > "$2" || $err "mktarball2, $1" } diff --git a/include/rom.sh b/include/rom.sh index 68c61936..f74912af 100644 --- a/include/rom.sh +++ b/include/rom.sh @@ -9,25 +9,13 @@ grubdata="config/data/grub" mkserprog() { - [ $# -lt 1 ] && $err "mkserprog: no arguments provided" [ "$_f" = "-d" ] && return 0 # dry run - - [ "$1" = "pico" ] && mkpicotool - basename -as .h "$serdir/"*.h > "$xbmktmp/ser" || \ $err "!mk $1 $xbmktmp" while read -r sertarget; do - [ "$1" = "pico" ] && - x_ rm -rf "$sersrc/build" \ - && (pt=$(x_ grep "pico_cmake_set" \ - "$picosdk/src/boards/include/boards/$sertarget.h" \ - | grep "PICO_PLATFORM" | cut -d= -f2 | tr -d [:blank:]) - mkdir -p "$sersrc/build_$pt" - ln -srf "$sersrc/build_$pt/" "$sersrc/build") \ - && x_ cmake -DPICO_BOARD="$sertarget" \ + [ "$1" = "pico" ] && x_ cmake -DPICO_BOARD="$sertarget" \ -DPICO_SDK_PATH="$picosdk" -B "$sersrc/build" "$sersrc" \ - -Dpicotool_DIR="$picotool/picotool" \ && x_ cmake --build "$sersrc/build" [ "$1" = "stm32" ] && x_ make -C "$sersrc" \ libopencm3-just-make BOARD=$sertarget && x_ make -C \ @@ -39,17 +27,6 @@ mkserprog() [ "$XBMK_RELEASE" = "y" ] && mkrom_tarball "bin/serprog_$1"; : } -mkpicotool() -{ - rm -Rf "$picotool" || $err "Can't remove picotool builddir" - ( - x_ cd src/picotool - x_ cmake -DCMAKE_INSTALL_PREFIX=xbmkbin -DPICOTOOL_FLAT_INSTALL=1 \ - -DPICO_SDK_PATH=../pico-sdk - x_ make install - ) || $err "Can't build picotool"; : -} - copyps1bios() { x_ rm -Rf bin/playstation |