aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2016-01-16 20:09:47 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2016-01-16 20:09:47 +0200
commit2e42427d4ac17e3fce819c7d3095c354c4c3c555 (patch)
treeeb250a57bba4feaa43dbce6f8ade486312ffdc43
parent53688207ab547260dceced9159bdbed1684b039a (diff)
downloadmeson-2e42427d4ac17e3fce819c7d3095c354c4c3c555.zip
meson-2e42427d4ac17e3fce819c7d3095c354c4c3c555.tar.gz
meson-2e42427d4ac17e3fce819c7d3095c354c4c3c555.tar.bz2
Support both setuptools and distutils.
-rw-r--r--mesonbuild/coredata.py2
-rw-r--r--setup.py6
2 files changed, 6 insertions, 2 deletions
diff --git a/mesonbuild/coredata.py b/mesonbuild/coredata.py
index 5b1102c..f0ace4a 100644
--- a/mesonbuild/coredata.py
+++ b/mesonbuild/coredata.py
@@ -14,7 +14,7 @@
import pickle, os, uuid
-version = '0.29.0-research'
+version = '0.29.0.dev1'
build_types = ['plain', 'debug', 'debugoptimized', 'release']
layouts = ['mirror', 'flat']
diff --git a/setup.py b/setup.py
index 36eab6b..5885683 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-from distutils.core import setup
+try:
+ from setuptools import setup
+except ImportError:
+ from distutils.core import setup
+
from mesonbuild.coredata import version
setup(name='meson',