X-Git-Url: http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=blobdiff_plain;f=gen_changelog.sh;h=b4f5bc883760e2aea2eb0002249457dd192dcace;hp=e74bd5923c6352e195bc34e3f899b6c182c78673;hb=refs%2Fheads%2Fmaster;hpb=3ffa1b284b36a27366a0b2537fb6fe669a6344a4
diff --git a/gen_changelog.sh b/gen_changelog.sh
index e74bd592..b47a1a2d 100755
--- a/gen_changelog.sh
+++ b/gen_changelog.sh
@@ -9,30 +9,44 @@
## ChangeLog.html is also created
##
+builddir="$2"
+
+cd "$1" || exit
+
[ ! -e "ChangeLog.gqview" ] && exit 1
-[ ! -x "$(command -v git)" ] && exit 0
-[ ! -d ".git" ] && exit 0
-
-LC_ALL=C git log --no-merges --no-notes --encoding=UTF-8 --no-follow --use-mailmap 1b58572cf58e9d2d4a0305108395dab5c66d3a09..HEAD > ChangeLog.$$.new && \
-cat ChangeLog.gqview >> ChangeLog.$$.new && \
-mv -f ChangeLog.$$.new ChangeLog
-
-
-echo "" >>ChangeLog.$$.old.html && \
-echo "" > ChangeLog.$$.new.html && \
-echo "
" >> ChangeLog.$$.new.html && \
-echo "" >> ChangeLog.$$.new.html && \
-echo "" >> ChangeLog.$$.new.html && \
-echo "" >> ChangeLog.$$.new.html
-[ -e ChangeLog.html ] && mv -f ChangeLog.html ChangeLog.html.bak
-mv -f ChangeLog.$$.new.html ChangeLog.html
-
-rm -f ChangeLog.$$.old.html
+[ ! -x "$(command -v git)" ] && exit 1
+[ ! -d ".git" ] && exit 1
+
+LC_ALL=C git log --no-merges --no-notes --encoding=UTF-8 --no-follow --use-mailmap 1b58572cf58e9d2d4a0305108395dab5c66d3a09..HEAD > "$builddir/ChangeLog.$$.new" && \
+cat ChangeLog.gqview >> "$builddir/ChangeLog.$$.new" && \
+mv -f "$builddir/ChangeLog.$$.new" "$builddir/ChangeLog"
+
+
+echo "" >>"$builddir/ChangeLog.$$.old.html" && \
+echo "" > "$builddir/ChangeLog.$$.new.html" && \
+echo "" >> "$builddir/ChangeLog.$$.new.html" && \
+echo "" >> "$builddir/ChangeLog.$$.new.html" && \
+echo "" >> "$builddir/ChangeLog.$$.new.html" && \
+echo "" >> "$builddir/ChangeLog.$$.new.html"
+
+rm "$builddir/ChangeLog.$$.old.html"
+mv -f "$builddir/ChangeLog.$$.new.html" "$builddir/ChangeLog.html"
+
+# Meson: distribute in tarballs. The first variable is more reliable, but requires Meson 0.58.
+# Fallback to the older one if necessary
+# shellcheck disable=SC2154
+for distdir in "$MESON_PROJECT_DIST_ROOT" "$MESON_DIST_ROOT"; do
+ if [ -n "$distdir" ]; then
+ cp -f "$builddir/ChangeLog.html" "$distdir/ChangeLog.html"
+ cp -f "$builddir/ChangeLog" "$distdir/ChangeLog"
+ break
+ fi
+done
exit 0