brian/bscreensaver
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove the need for rust nightly

Browse Source 
My pidfd implmentation is simple enough, and Option.contains() is not
worth requiring nightly.
This commit is contained in:
Brian Tarricone
2022-05-13 20:33:41 -07:00
parent 7e18b87707
commit f6c1020535
8 changed files with 18 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Makefile
View File

@ -44,13 +44,6 @@ RELEASE_MANPAGES := $(addprefix $(RELEASE_OUT)/,$(MANPAGES))
INSTALL ?= install
HELP2MAN ?= help2man
RUST_RELEASE_CHANNEL = nightly
ifeq ($(RUST_RELEASE_CHANNEL),nightly)
RUST_RELEASE_CHANNEL_ARG = +nightly
else
FEATURES_ARGS = --no-default-features
endif
DEV_LOG_LEVEL = debug
all: release manpages $(RELEASE_OUT)/bscreensaver-settings.desktop
@ -70,10 +63,10 @@ install: all
$(INSTALL) -m 0644 $(RELEASE_MANPAGES) $(DESTDIR)$(MANDIR)/man1
$(DEV_TARGETS): $(SOURCES)
HELPER_DIR=target/debug cargo $(RUST_RELEASE_CHANNEL_ARG) build $(FEATURES_ARGS)
HELPER_DIR=target/debug cargo build
$(RELEASE_TARGETS): $(SOURCES)
HELPER_DIR=$(HELPER_DIR) cargo $(RUST_RELEASE_CHANNEL_ARG) build $(FEATURES_ARGS) --release
HELPER_DIR=$(HELPER_DIR) cargo build --release
$(RELEASE_OUT)/%.1.gz: $(RELEASE_OUT)/%.1
mkdir -p $(dir $@)
@ -101,7 +94,7 @@ deb-pkg:
rm -rf /build/bscreensaver'
clean:
cargo $(RUST_RELEASE_CHANNEL_ARG) clean
cargo clean
uninstall:
rm -f $(addprefix $(DESTDIR)$(BINDIR),$(BINARIES)) $(addprefix $(HELPER_DIR)/,$(HELPERS))) || true
@ -118,10 +111,10 @@ run: $(DEV_TARGETS)
BSCREENSAVER_SYSTEMD_LOG=$(DEV_LOG_LEVEL) \
BSCREENSAVER_DIALOG_GTK3_LOG=$(DEV_LOG_LEVEL) \
HELPER_DIR=target/debug \
cargo $(RUST_RELEASE_CHANNEL_ARG) run $(FEATURES_ARGS) --bin bscreensaver
cargo run --bin bscreensaver
run-dialog:
RUST_BACKTRACE=1 \
BSCREENSAVER_DIALOG_GTK3_LOG=$(DEV_LOG_LEVEL) \
BSCREENSAVER_DIALOG_STANDALONE=1 \
cargo $(RUST_RELEASE_CHANNEL_ARG) run $(FEATURES_ARGS) --bin bscreensaver-dialog-gtk3
cargo run --bin bscreensaver-dialog-gtk3