docs: Mark GLX_ARB_context_flush_control done

[mesa.git] / docs / releasing.html

diff --git a/docs/releasing.html b/docs/releasing.html
index 99707bee3f5f03f245150a63be18e0231fe997b5..66742b0bcb4bd4bc52614d9c442a64e1c8017238 100644 (file)
--- a/docs/releasing.html
+++ b/docs/releasing.html
@@ -24,7 +24,6 @@
 <li><a href="#branch">Making a branchpoint</a>
 <li><a href="#prerelease">Pre-release announcement</a>
 <li><a href="#release">Making a new release</a>
-<li><a href="#calendar">Update the calendar</a>
 <li><a href="#announce">Announce the release</a>
 <li><a href="#website">Update the mesa3d.org website</a>
 <li><a href="#bugzilla">Update Bugzilla</a>
@@ -429,6 +428,7 @@ Here is one solution that I've been using.
 </p>
 
 <pre>
+       # Set MAKEFLAGS if you haven't already
        git clean -fXd; git clean -nxd
        read # quick cross check any outstanding files
        export __version=`cat VERSION`
@@ -437,7 +437,12 @@ Here is one solution that I've been using.
        chmod 755 -fR $__build_root; rm -rf $__build_root
        mkdir -p $__build_root &amp;&amp; cd $__build_root
 
-       $__mesa_root/autogen.sh &amp;&amp; make -j2 distcheck
+       # For the native builds - such as distcheck, scons, sanity test, you
+       # may want to specify which LLVM to use:
+       # export LLVM_CONFIG=/usr/lib/llvm-3.9/bin/llvm-config
+
+       # Do a full distcheck
+       $__mesa_root/autogen.sh &amp;&amp; make distcheck
 
        # Build check the tarballs (scons, linux)
        tar -xaf mesa-$__version.tar.xz &amp;&amp; cd mesa-$__version
@@ -445,12 +450,16 @@ Here is one solution that I've been using.
        cd .. &amp;&amp; rm -rf mesa-$__version
 
        # Build check the tarballs (scons, windows/mingw)
+       # Temporary drop LLVM_CONFIG, unless you have a Windows/mingw one.
+       # save_LLVM_CONFIG=`echo $LLVM_CONFIG`; unset LLVM_CONFIG
        tar -xaf mesa-$__version.tar.xz &amp;&amp; cd mesa-$__version
        scons platform=windows toolchain=crossmingw
        cd .. &amp;&amp; rm -rf mesa-$__version
 
        # Test the automake binaries
        tar -xaf mesa-$__version.tar.xz &amp;&amp; cd mesa-$__version
+       # Restore LLVM_CONFIG, if applicable:
+       # export LLVM_CONFIG=`echo $save_LLVM_CONFIG`; unset save_LLVM_CONFIG
        ./configure \
                --with-dri-drivers=i965,swrast \
                --with-gallium-drivers=swrast \
@@ -461,24 +470,25 @@ Here is one solution that I've been using.
                --enable-gbm \
                --enable-egl \
                --with-platforms=x11,drm,wayland,surfaceless
-       make -j2 &amp;&amp; DESTDIR=`pwd`/test make -j6 install
+       make &amp;&amp; DESTDIR=`pwd`/test make install
        __glxinfo_cmd='glxinfo 2>&amp;1 | egrep -o "Mesa.*|Gallium.*|.*dri\.so"'
        __glxgears_cmd='glxgears 2>&amp;1 | grep -v "configuration file"'
        __es2info_cmd='es2_info 2>&amp;1 | egrep "GL_VERSION|GL_RENDERER|.*dri\.so"'
        __es2gears_cmd='es2gears_x11 2>&amp;1 | grep -v "configuration file"'
-       export LD_LIBRARY_PATH=`pwd`/test/usr/local/lib/
+       test "x$LD_LIBRARY_PATH" != 'x' &amp;&amp; __old_ld="$LD_LIBRARY_PATH"
+       export LD_LIBRARY_PATH=`pwd`/test/usr/local/lib/:"${__old_ld}"
        export LIBGL_DRIVERS_PATH=`pwd`/test/usr/local/lib/dri/
        export LIBGL_DEBUG=verbose
        eval $__glxinfo_cmd
        eval $__glxgears_cmd
        eval $__es2info_cmd
        eval $__es2gears_cmd
-       export LIBGL_ALWAYS_SOFTWARE=1
+       export LIBGL_ALWAYS_SOFTWARE=true
        eval $__glxinfo_cmd
        eval $__glxgears_cmd
        eval $__es2info_cmd
        eval $__es2gears_cmd
-       export LIBGL_ALWAYS_SOFTWARE=1
+       export LIBGL_ALWAYS_SOFTWARE=true
        export GALLIUM_DRIVER=softpipe
        eval $__glxinfo_cmd
        eval $__glxgears_cmd
@@ -486,6 +496,7 @@ Here is one solution that I've been using.
        eval $__es2gears_cmd
        # Smoke test DOTA2
        unset LD_LIBRARY_PATH
+       test "x$__old_ld" != 'x' &amp;&amp; export LD_LIBRARY_PATH="$__old_ld" &amp;&amp; unset __old_ld
        unset LIBGL_DRIVERS_PATH
        unset LIBGL_DEBUG
        unset LIBGL_ALWAYS_SOFTWARE
@@ -540,6 +551,8 @@ Start the release process.
 </p>
 
 <pre>
+       # For the dist/distcheck, you may want to specify which LLVM to use:
+       # export LLVM_CONFIG=/usr/lib/llvm-3.9/bin/llvm-config
        ../relative/path/to/release.sh . # append --dist if you've already done distcheck above
 </pre>
 
@@ -566,23 +579,17 @@ Something like the following steps will do the trick:
 </pre>
 
 <p>
-Also, edit docs/relnotes.html to add a link to the new release notes, and edit
-docs/index.html to add a news entry. Then commit and push:
+Also, edit docs/relnotes.html to add a link to the new release notes,
+edit docs/index.html to add a news entry, and remove the version from
+docs/release-calendar.html. Then commit and push:
 </p>
 
 <pre>
-       git commit -as -m "docs: add news item and link release notes for X.Y.Z"
+       git commit -as -m "docs: update calendar, add news item and link release notes for X.Y.Z"
        git push origin master X.Y
 </pre>
 
 
-<h1 id="calendar">Update the calendar</h1>
-
-<p>
-Remove the version from the <a href="release-calendar.html" target="_parent">calendar</a>.
-</p>
-
-
 <h1 id="announce">Announce the release</h1>
 
 <p>