.gitignore

@@ -22,6 +22,7 @@ source/res/VERSION
 libgraphicsmagick_c.a
 source/.DS_Store
 pixiv_down-missing.txt
+source/pd_version.d
 
 # Generate files from build scripts
 Makefile
@@ -38,4 +39,4 @@ config.status
 pixiv_down-*
 
 # Executable
-source/pixiv_down
+source/pixiv_down

ChangeLog

@@ -1,4 +1,20 @@
-2024-10-12  mio  <stigma@disroot.org>
+2024-10-13  mio  <stigma@disroot.org>
+
+	Update version strings
+
+	Include meson files with autoconf dist
+
+	Improve git version tagging across build systems
+
+	Require --public or --private (following)
+	This has been the requirement per the help messages, but wasn't enforced
+	if another argument was provided, such as --skip.
+
+	Improve message when fetching accounts (following)
+
+	Use meson on the README
+
+2024-10-13  mio  <stigma@disroot.org>
 
 	Add meson build files
 	(not tested on macOS yet)

Makefile.am

@@ -1,2 +1,2 @@
 SUBDIRS = docs source
-EXTRA_DIST = VERSION
+EXTRA_DIST = meson.build

README.md

@@ -12,7 +12,7 @@ D >= `2.076.0`
 GraphicsMagick >= `1.3.0`
 : http://www.graphicsmagick.org (only for non-macOS POSIX)
 
-You will also need either [Make] or [dub] (version 1.23.0 or newer).
+You will also need either [Meson] or [dub] (version 1.23.0 or newer).
 
 pixiv_down is only tested on Linux and macOS.
 
@@ -22,21 +22,20 @@ It is possible to build pixiv_down using dub by running `dub build`.
 
 **NOTE**: macOS only support building via dub.
 
-If you do not have `dub`, or simply don't want to use it, the typical GNU build
+If you do not have `dub`, or simply don't want to use it, the meson build
 system can be used.
 
 ```bash
-./bootstrap
-./configure
-make
+meson setup builddir
+ninja -C builddir
 ```
 
 The compiled executable can be found at `source/pixiv_down`.
 
-To install run:
+You can install the executable by running the following as root:
 
 ```bash
-make install
+ninja install
 ```
 
 ## Usage
@@ -157,5 +156,5 @@ version 3.  You can find a copy in the COPYING file, or online at
 <https://www.gnu.org/licenses/gpl-3.0.html>.
 
 [dub]: https://dub.pm
-[Make]: https://gnu.org/s/make
+[Meson]: https://mesonbuild.com
 [image-io]: https://developer.apple.com/documentation/imageio

VERSION

@@ -1 +0,0 @@
-v2024.09

configure.ac

@@ -34,10 +34,19 @@ AS_IF([test x"$DC" = x"gdc"],
 
 AM_CONDITIONAL(IS_GDC_12, test "x$GDC_VERSION_MAJOR" = "x12")
 
+VCS_TAG="release"
+AC_CHECK_PROGS([GIT], git, none)
+AS_IF([test "x$GIT" = "xnone"], [],
+	AS_IF([test -d ".git"],
+		VCS_TAG=$(git rev-parse --short HEAD)))
+AC_SUBST(VCS_TAG)
+
+
 AC_CONFIG_FILES([
 	Makefile
 	docs/Makefile
 	source/Makefile
+	source/pd_version.d
 ])
 
 AC_OUTPUT

docs/Makefile.am

@@ -10,4 +10,4 @@ man1_MANS = pixiv_down.1 \
 
 man5_MANS = pixiv_down.conf.5
 
-EXTRA_DIST = $(man1_MANS) $(man5_MANS)
+EXTRA_DIST = $(man1_MANS) $(man5_MANS) meson.build

dub.sdl

@@ -8,16 +8,15 @@ targetType "executable"
 targetPath "source"
 
 preBuildCommands `test -d source/res || mkdir source/res
+	cp source/pd_version.d.in source/pd_version.d
+	V=$$(git rev-parse --short HEAD)
 	if [ -x $$(which git) -a -d .git ]
 	then
- 		git describe --tags > source/res/VERSION
+		sed -i "s/@VCS_TAG@/$$V/" source/pd_version.d
 	else
-		pr -t VERSION > source/res/VERSION
-	fi`
-stringImportPaths "source/res"
-
-# OSX before POSIX because, while OSX is POSIX, we don't want to use GraphicsMagick
-# there. OSX will be the default for macOS while Q16 the default for other POSIX.
+		send -i 's/@VCS_TAG@/release/' source/pd_version.d
+	fi` \
+	platform="posix"
 
 configuration "macOS" {
 	platforms "osx"

source/Makefile.am

@@ -41,6 +41,13 @@ pixiv_down_SOURCES = app.d \
 	term.d \
 	util.d
 
+EXTRA_DIST = meson.build \
+	cmds/meson.build \
+	gif_writer/meson.build \
+	image_reader/meson.build \
+	imaging/meson.build \
+	mlib/meson.build
+
 # TODO: macOS support
 pixiv_down_DFLAGS = -I. -J$(top_srcdir)