Bump version number for release and no longer install to a versioned directory because the packages are not coinstallable anyway.

pull/15/head 0.18.0
Jussi Pakkanen 11 years ago
parent 5df4e62dfd
commit 182fe0d1b6
  1. 2
      coredata.py
  2. 3
      install_meson.py
  3. 2
      man/meson.1
  4. 2
      man/mesonconf.1
  5. 2
      man/mesongui.1

@ -14,7 +14,7 @@
import pickle, os, uuid import pickle, os, uuid
version = '0.18.0-research' version = '0.18.0'
# This class contains all data that must persist over multiple # This class contains all data that must persist over multiple
# invocations of Meson. It is roughly the same thing as # invocations of Meson. It is roughly the same thing as

@ -20,7 +20,6 @@
import os, sys, glob, shutil, gzip import os, sys, glob, shutil, gzip
from optparse import OptionParser from optparse import OptionParser
from coredata import version
usage_info = '%prog [--prefix PREFIX] [--destdir DESTDIR]' usage_info = '%prog [--prefix PREFIX] [--destdir DESTDIR]'
@ -41,7 +40,7 @@ if options.destdir == '':
else: else:
install_root = os.path.join(options.destdir, options.prefix[1:]) install_root = os.path.join(options.destdir, options.prefix[1:])
script_dir = os.path.join(install_root, 'share/meson-' + version) script_dir = os.path.join(install_root, 'share/meson')
bin_dir = os.path.join(install_root, 'bin') bin_dir = os.path.join(install_root, 'bin')
bin_script = os.path.join(script_dir, 'meson.py') bin_script = os.path.join(script_dir, 'meson.py')
gui_script = os.path.join(script_dir, 'mesongui.py') gui_script = os.path.join(script_dir, 'mesongui.py')

@ -1,4 +1,4 @@
.TH MESON "1" "June 2014" "meson 0.17.0" "User Commands" .TH MESON "1" "July 2014" "meson 0.18.0" "User Commands"
.SH NAME .SH NAME
meson - a high productivity build system meson - a high productivity build system
.SH DESCRIPTION .SH DESCRIPTION

@ -1,4 +1,4 @@
.TH MESONCONF "1" "June 2014" "mesonconf 0.17.0" "User Commands" .TH MESONCONF "1" "July 2014" "mesonconf 0.18.0" "User Commands"
.SH NAME .SH NAME
mesonconf - a tool to configure Meson builds mesonconf - a tool to configure Meson builds
.SH DESCRIPTION .SH DESCRIPTION

@ -1,4 +1,4 @@
.TH MESONGUI "1" "June 2014" "mesongui 0.17.0" "User Commands" .TH MESONGUI "1" "July 2014" "mesongui 0.18.0" "User Commands"
.SH NAME .SH NAME
mesongui - a gui for the Meson build system mesongui - a gui for the Meson build system
.SH DESCRIPTION .SH DESCRIPTION

Loading…
Cancel
Save