mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

releasing: Revert fix and just document work-around of Xwayland path

Browse Source 
If Xwayland is not in /usr/bin, distcheck will fail without patch
023b265b, which propagates @XSERVER_PATH@ to distcheck but blocks other
use of the DISTCHECK_CONFIGURE_FLAGS env var.  Instead, revert the fix
and merely document the need for setting DISTCHECK_CONFIGURE_FLAGS
manually.

Revert "build:  Pass along any user-specified xserver path to distcheck"

This reverts commit 023b265b44.
This commit is contained in:
Bryce Harrington
2015-02-12 16:49:15 -08:00
parent b6ddf6c229
commit a9d0b6836e
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile.am
-1
View File
@@ -9,7 +9,6 @@ noinst_LTLIBRARIES =
BUILT_SOURCES = BUILT_SOURCES =
AM_DISTCHECK_CONFIGURE_FLAGS = --disable-setuid-install AM_DISTCHECK_CONFIGURE_FLAGS = --disable-setuid-install
DISTCHECK_CONFIGURE_FLAGS = --with-xserver-path='@XSERVER_PATH@'
EXTRA_DIST = weston.ini.in ivi-shell/weston.ini.in EXTRA_DIST = weston.ini.in ivi-shell/weston.ini.in
releasing.txt
+13 -6
View File
@@ -15,7 +15,14 @@ To make a release of Weston and/or Wayland, follow these steps.
$ git commit configure.ac -m "configure.ac: bump to version x.y.z for the xxx release" $ git commit configure.ac -m "configure.ac: bump to version x.y.z for the xxx release"
$ git push $ git push
2. Run the release.sh script to generate the tarballs, sign and 2. Install Xwayland, either from your distro or manually (see
http://wayland.freedesktop.org/building.html). If you install it
to a location other than /usr/bin/Xwayland, specify this in the
following env var:
export DISTCHECK_CONFIGURE_FLAGS="--with-xserver-path=<your-Xwayland-path>"
3. Run the release.sh script to generate the tarballs, sign and
upload them, and generate a release announcement template. upload them, and generate a release announcement template.
This script can be obtained from X.org's modular package: This script can be obtained from X.org's modular package:
@@ -27,26 +34,26 @@ To make a release of Weston and/or Wayland, follow these steps.
skip testsuite by specifying the --dist argument. Pass --help to skip testsuite by specifying the --dist argument. Pass --help to
see other supported options. see other supported options.
3. Compose the release announcements. The script will generate 4. Compose the release announcements. The script will generate
*.x.y.0.announce files with a list of changes and tags, one for *.x.y.0.announce files with a list of changes and tags, one for
wayland, one for weston. Prepend these with a human-readable wayland, one for weston. Prepend these with a human-readable
listing of the most notable changes. For x.y.0 releases, indicate listing of the most notable changes. For x.y.0 releases, indicate
the schedule for the x.y+1.0 release. the schedule for the x.y+1.0 release.
4. Send the release announcements to 5. Send the release announcements to
wayland-devel@lists.freedesktop.org wayland-devel@lists.freedesktop.org
5. Get your freshly posted release email URL from 6. Get your freshly posted release email URL from
http://lists.freedesktop.org/archives/wayland-devel/ http://lists.freedesktop.org/archives/wayland-devel/
6. Update releases.html in wayland-web with links to tarballs and 7. Update releases.html in wayland-web with links to tarballs and
the release email URL. the release email URL.
$ git commit releases.html -m "Add x.y.z release" $ git commit releases.html -m "Add x.y.z release"
$ git push $ git push
$ rsync -avz * wayland.freedesktop.org:/srv/wayland.freedesktop.org/www/ $ rsync -avz * wayland.freedesktop.org:/srv/wayland.freedesktop.org/www/
7. Update topic in #wayland to point to the release announcement URL 8. Update topic in #wayland to point to the release announcement URL
For x.y.0 releases, also create the x.y branch. The x.y branch is for For x.y.0 releases, also create the x.y branch. The x.y branch is for