summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancesco Turco <fturco fastmail fm>2018-08-22 11:43:21 +0000
committerSimon McVittie <smcv@collabora.com>2018-08-29 17:57:43 +0100
commitb805744029e6c497b0b92051199a304636e82fcd (patch)
tree22db09e0bbe9e28ba06c4da102d832ccb1494d20
parente93b421137493710cb6b81420d15928eb13014e3 (diff)
downloaddbus-b805744029e6c497b0b92051199a304636e82fcd.tar.gz
Distribute source code using .tar.xz archives
This saves around 32% of the size of the archive. [smcv: Rebased onto current master] Signed-off-by: Simon McVittie <smcv@collabora.com> Reviewed-by: Philip Withnall <withnall@endlessm.com> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=107630
-rw-r--r--CONTRIBUTING2
-rw-r--r--configure.ac2
-rw-r--r--doc/.gitignore2
-rw-r--r--doc/Makefile.am6
4 files changed, 6 insertions, 6 deletions
diff --git a/CONTRIBUTING b/CONTRIBUTING
index a0d1db98..6d96b820 100644
--- a/CONTRIBUTING
+++ b/CONTRIBUTING
@@ -195,7 +195,7 @@ To make a release of D-Bus, do the following:
git push origin master dbus-X.Y dbus-X.Y.Z
- scp your tarball to freedesktop.org server and copy it to
- dbus.freedesktop.org:/srv/dbus.freedesktop.org/www/releases/dbus/dbus-X.Y.Z.tar.gz.
+ dbus.freedesktop.org:/srv/dbus.freedesktop.org/www/releases/dbus/dbus-X.Y.Z.tar.xz.
This should be possible if you're in group "dbus"
- Update the online documentation with `make -C doc maintainer-upload-docs`.
diff --git a/configure.ac b/configure.ac
index e97443e2..8c96e74d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,7 @@ AC_CANONICAL_HOST
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE([1.13 tar-ustar -Wno-portability subdir-objects foreign])
+AM_INIT_AUTOMAKE([1.13 tar-ustar no-dist-gzip dist-xz -Wno-portability subdir-objects foreign])
GETTEXT_PACKAGE=dbus-1
AC_SUBST(GETTEXT_PACKAGE)
diff --git a/doc/.gitignore b/doc/.gitignore
index 6bc82863..3f0dba88 100644
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -16,7 +16,7 @@ dbus-test-plan.html
dbus-tutorial.html
dbus-faq.html
dbus-docs
-dbus-docs.tar.gz
+dbus-docs.tar.xz
doxygen.stamp
dbus-api-design.page
dbus-api-design.html
diff --git a/doc/Makefile.am b/doc/Makefile.am
index f509f6fd..24a4e2b0 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -171,7 +171,7 @@ dbus-docs: $(STATIC_DOCS) $(dist_dtd_DATA) $(MAN_XML_FILES) $(dist_doc_DATA) $(d
$(AM_V_at)cp -r api/html @abs_builddir@/$@.tmp/api
$(AM_V_at)mv $@.tmp $@
-dbus-docs.tar.gz: dbus-docs
+dbus-docs.tar.xz: dbus-docs
$(AM_V_GEN)tar czf $@ $<
DOC_SERVER = dbus.freedesktop.org
@@ -180,8 +180,8 @@ DOC_WWW_DIR = /srv/dbus.freedesktop.org/www
SPECIFICATION_SERVER = specifications.freedesktop.org
SPECIFICATION_PATH = /srv/specifications.freedesktop.org/www/dbus/1.0
-maintainer-upload-docs: dbus-docs.tar.gz dbus-docs
- scp dbus-docs.tar.gz $(DOC_SERVER):$(DOC_WWW_DIR)/
+maintainer-upload-docs: dbus-docs.tar.xz dbus-docs
+ scp dbus-docs.tar.xz $(DOC_SERVER):$(DOC_WWW_DIR)/
rsync -rpvzP --chmod=Dg+s,ug+rwX,o=rX \
dbus-docs/ $(DOC_SERVER):$(DOC_WWW_DIR)/doc/
cd $(srcdir) && scp -p $(dist_dtd_DATA) $(SPECIFICATION_SERVER):$(SPECIFICATION_PATH)/