From 84456537da9a77bbfe4fe9027c9fb36111c6b38d Mon Sep 17 00:00:00 2001
From: Jussi Pakkanen <jpakkane@gmail.com>
Date: Sat, 16 Jan 2016 20:59:34 +0200
Subject: [PATCH] Fix some issues that break pypi installs and bump version to
 upload new version.

---
 .gitignore                     |  2 ++
 mesonbuild/coredata.py         |  2 +-
 mesonbuild/mesonlib.py         | 13 +++++++++++--
 mesonbuild/modules/__init__.py |  0
 mesonbuild/scripts/__init__.py |  0
 mesonbuild/wrap/__init__.py    |  0
 setup.py                       |  7 +++++--
 7 files changed, 19 insertions(+), 5 deletions(-)
 create mode 100644 mesonbuild/modules/__init__.py
 create mode 100644 mesonbuild/scripts/__init__.py
 create mode 100644 mesonbuild/wrap/__init__.py

diff --git a/.gitignore b/.gitignore
index ddd6e0e58..1e42da4ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,5 @@ packagecache
 /MANIFEST
 /build
 /dist
+/meson.egg-info
+
diff --git a/mesonbuild/coredata.py b/mesonbuild/coredata.py
index f0ace4a23..7f2254bfa 100644
--- a/mesonbuild/coredata.py
+++ b/mesonbuild/coredata.py
@@ -14,7 +14,7 @@
 
 import pickle, os, uuid
 
-version = '0.29.0.dev1'
+version = '0.29.0.dev2'
 
 build_types = ['plain', 'debug', 'debugoptimized', 'release']
 layouts = ['mirror', 'flat']
diff --git a/mesonbuild/mesonlib.py b/mesonbuild/mesonlib.py
index 2ab5ce44c..a814567ce 100644
--- a/mesonbuild/mesonlib.py
+++ b/mesonbuild/mesonlib.py
@@ -116,6 +116,15 @@ def detect_vcs(source_dir):
                 return vcs
     return None
 
+def grab_leading_numbers(vstr):
+    result = []
+    for x in vstr.split('.'):
+        try:
+            result.append(int(x))
+        except ValueError:
+            break
+    return result
+
 numpart = re.compile('[0-9.]+')
 
 def version_compare(vstr1, vstr2):
@@ -146,8 +155,8 @@ def version_compare(vstr1, vstr2):
         vstr2 = vstr2[1:]
     else:
         cmpop = operator.eq
-    varr1 = [int(x) for x in vstr1.split('.')]
-    varr2 = [int(x) for x in vstr2.split('.')]
+    varr1 = grab_leading_numbers(vstr1)
+    varr2 = grab_leading_numbers(vstr2)
     return cmpop(varr1, varr2)
 
 def default_libdir():
diff --git a/mesonbuild/modules/__init__.py b/mesonbuild/modules/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/mesonbuild/scripts/__init__.py b/mesonbuild/scripts/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/mesonbuild/wrap/__init__.py b/mesonbuild/wrap/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/setup.py b/setup.py
index 980671f46..91f686bf6 100644
--- a/setup.py
+++ b/setup.py
@@ -30,7 +30,11 @@ setup(name='meson',
       author='Jussi Pakkanen',
       author_email='jpakkane@gmail.com',
       url='http://mesonbuild.com',
-      packages=['mesonbuild'],
+      license=' Apache License, Version 2.0',
+      packages=['mesonbuild',
+                'mesonbuild.modules',
+                'mesonbuild.scripts',
+                'mesonbuild.wrap'],
       package_data={'mesonbuild': ['*.ui']},
       scripts=['meson', 'mesonconf', 'mesongui', 'mesonintrospect', 'wraptool'],
       data_files=[('share/man/man1', ['man/meson.1',
@@ -50,7 +54,6 @@ setup(name='meson',
                    'Programming Language :: Python :: 3 :: Only',
                    'Topic :: Software Development :: Build Tools',
                    ],
-      license=' Apache License, Version 2.0',
       long_description='''Meson is a cross-platform build system designed to be both as
 fast and as user friendly as possible. It supports many languages and compilers, including
 Gcc, clang and Visual Studio. Its build definitions are written in a simple non-turing