From be64fe04fb2276b9ac24d34c95a58661f16209f7 Mon Sep 17 00:00:00 2001 From: Cory McWilliams Date: Wed, 22 May 2024 20:35:48 -0400 Subject: [PATCH] Auto-update all the versions. --- GNUmakefile | 8 ++++++-- default.nix | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index 3b6583d9..4e698f00 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -616,7 +616,7 @@ $(IOS_TARGETS) $(IOSSIM_TARGETS): LDFLAGS += \ unix: debug release win: windebug winrelease -all: $(BUILD_TYPES) +all: $(BUILD_TYPES) default.nix .PHONY: all win unix ALL_APP_OBJS := \ @@ -673,6 +673,10 @@ src/android/AndroidManifest.xml : $(firstword $(MAKEFILE_LIST)) -e 's/android:targetSdkVersion="[[:digit:]]*"/android:targetSdkVersion="$(ANDROID_TARGET_SDK_VERSION)"/' \ $@ +default.nix : $(firstword $(MAKEFILE_LIST)) + @echo "[version] $@" + @sed -i -e 's/version = ".*";/version = "$(VERSION_NUMBER)"/' $@ + # Android support. out/res/layout_activity_main.xml.flat: src/android/res/layout/activity_main.xml @mkdir -p $(dir $@) @@ -858,7 +862,7 @@ clean: rm -rf $(BUILD_DIR) .PHONY: clean -dist: release-apk iosrelease-ipa $(if $(HAVE_WIN), out/winrelease/tildefriends.standalone.exe) +dist: release-apk iosrelease-ipa $(if $(HAVE_WIN), out/winrelease/tildefriends.standalone.exe) default.nix @echo [archive] dist/tildefriends-$(VERSION_NUMBER).tar.xz @rm -rf out/tildefriends-$(VERSION_NUMBER) @mkdir -p dist/ out/tildefriends-$(VERSION_NUMBER) diff --git a/default.nix b/default.nix index 0c8ba3a3..544edb4b 100644 --- a/default.nix +++ b/default.nix @@ -24,7 +24,7 @@ }: pkgs.stdenv.mkDerivation rec { pname = "tildefriends"; - version = "0.0.19"; + version = "0.0.19-wip" src = pkgs.fetchFromGitea { domain = "dev.tildefriends.net";