root/ncdu-zig
1
0
Fork 0
mirror of https://code.blicky.net/yorhel/ncdu.git synced 2026-01-15 18:18:41 -09:00
Code Issues Projects Releases Packages Wiki Activity Actions

Version 2.0-beta2 + more convenient static binary generation

Browse source
This commit is contained in:
Yorhel 2021-07-31 07:13:50 +02:00
parent 5929bf57cc
commit 1de70064e7
3 changed files with 33 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,6 +1,12 @@
# SPDX-FileCopyrightText: 2021 Yoran Heling <projects@yorhel.nl> # SPDX-FileCopyrightText: 2021 Yoran Heling <projects@yorhel.nl>
# SPDX-License-Identifier: MIT # SPDX-License-Identifier: MIT
2.0-beta2 - 2021-07-31
- Requires Zig 0.8
- Significantly reduce memory usage for hard links
- Slightly increase memory usage for directory entries
- Fix reporting of fatal errors in the -0 and -1 scanning UIs
2.0-beta1 - 2021-07-22 2.0-beta1 - 2021-07-22
- Full release announcement: https://dev.yorhel.nl/doc/ncdu2 - Full release announcement: https://dev.yorhel.nl/doc/ncdu2
- Requires Zig 0.8 - Requires Zig 0.8

43
Makefile
View file

@ -55,34 +55,43 @@ dist: doc
# ASSUMPTION: the ncurses source tree has been extracted into ncurses/ # ASSUMPTION: the ncurses source tree has been extracted into ncurses/
static: static-%.tar.gz:
mkdir -p static-${TARGET}/nc static-${TARGET}/inst/pkg mkdir -p static-$*/nc static-$*/inst/pkg
cd static-${TARGET}/nc && ../../ncurses/configure --prefix="`pwd`/../inst"\ cd static-$*/nc && ../../ncurses/configure --prefix="`pwd`/../inst"\
--with-pkg-config-libdir="`pwd`/../inst/pkg"\ --with-pkg-config-libdir="`pwd`/../inst/pkg"\
--without-cxx --without-cxx-binding --without-ada --without-manpages --without-progs\ --without-cxx --without-cxx-binding --without-ada --without-manpages --without-progs\
--without-tests --enable-pc-files --without-pkg-config --without-shared --without-debug\ --without-tests --enable-pc-files --without-pkg-config --without-shared --without-debug\
--without-gpm --without-sysmouse --enable-widec --with-default-terminfo-dir=/usr/share/terminfo\ --without-gpm --without-sysmouse --enable-widec --with-default-terminfo-dir=/usr/share/terminfo\
--with-terminfo-dirs=/usr/share/terminfo:/lib/terminfo:/usr/local/share/terminfo\ --with-terminfo-dirs=/usr/share/terminfo:/lib/terminfo:/usr/local/share/terminfo\
--with-fallbacks="screen linux vt100 xterm xterm-256color" --host=${TARGET}\ --with-fallbacks="screen linux vt100 xterm xterm-256color" --host=$*\
CC="zig cc --target=${TARGET}"\ CC="zig cc --target=$*"\
LD="zig cc --target=${TARGET}"\ LD="zig cc --target=$*"\
AR="zig ar" RANLIB="zig ranlib"\ AR="zig ar" RANLIB="zig ranlib"\
CPPFLAGS=-D_GNU_SOURCE && make && make install.libs CPPFLAGS=-D_GNU_SOURCE && make && make install.libs
@# zig-build - cleaner approach but doesn't work, results in a dynamically linked binary. @# zig-build - cleaner approach but doesn't work, results in a dynamically linked binary.
@#cd static-${TARGET} && PKG_CONFIG_LIBDIR="`pwd`/inst/pkg" zig build -Dtarget=${TARGET} @#cd static-$* && PKG_CONFIG_LIBDIR="`pwd`/inst/pkg" zig build -Dtarget=$*
@# --build-file ../build.zig --search-prefix inst/ --cache-dir zig -Drelease-fast=true @# --build-file ../build.zig --search-prefix inst/ --cache-dir zig -Drelease-fast=true
@# Alternative approach, bypassing zig-build @# Alternative approach, bypassing zig-build
cd static-${TARGET} && zig build-exe -target ${TARGET}\ cd static-$* && zig build-exe -target $*\
-Iinst/include -Iinst/include/ncursesw -lc inst/lib/libncursesw.a\ -Iinst/include -Iinst/include/ncursesw -lc inst/lib/libncursesw.a\
--cache-dir zig-cache -static --strip -O ReleaseFast ../src/main.zig ../src/ncurses_refs.c --cache-dir zig-cache -static --strip -O ReleaseFast ../src/main.zig ../src/ncurses_refs.c
cd static-${TARGET} && mv main ncdu && tar -czf ../ncdu-${NCDU_VERSION}-$(shell echo ${TARGET} | sed s/-musl//).tar.gz ncdu cd static-$* && mv main ncdu && tar -czf ../static-$*.tar.gz ncdu
rm -rf static-${TARGET} rm -rf static-$*
static-target-%: static-linux-x86_64: static-x86_64-linux-musl.tar.gz
$(MAKE) static TARGET=$* mv $< ncdu-${NCDU_VERSION}-linux-x86_64.tar.gz
static-all:\ static-linux-i386: static-i386-linux-musl.tar.gz
static-target-x86_64-linux-musl \ mv $< ncdu-${NCDU_VERSION}-linux-i386.tar.gz
static-target-aarch64-linux-musl \
static-target-i386-linux-musl \ static-linux-aarch64: static-aarch64-linux-musl.tar.gz
static-target-arm-linux-musleabi mv $< ncdu-${NCDU_VERSION}-linux-aarch64.tar.gz
static-linux-arm: static-arm-linux-musleabi.tar.gz
mv $< ncdu-${NCDU_VERSION}-linux-arm.tar.gz
static:\
static-linux-x86_64 \
static-linux-i386 \
static-linux-aarch64 \
static-linux-arm

2
src/main.zig
View file

@ -1,7 +1,7 @@
// SPDX-FileCopyrightText: 2021 Yoran Heling <projects@yorhel.nl> // SPDX-FileCopyrightText: 2021 Yoran Heling <projects@yorhel.nl>
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
pub const program_version = "2.0-beta1"; pub const program_version = "2.0-beta2";
const std = @import("std"); const std = @import("std");
const model = @import("model.zig"); const model = @import("model.zig");