diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-01-15 21:57:10 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2016-01-15 21:57:10 +0200 |
| commit | 61cb4ae9ca5e0ee7b9864e22621fcbc44a9b407b (patch) | |
| tree | 7ef18a7a472b34356da7d949cf111e364037cde2 /meson/modules | |
| parent | a5508d3fd362ea33633d9706a6257ef0f0c2bbc0 (diff) | |
| download | meson-61cb4ae9ca5e0ee7b9864e22621fcbc44a9b407b.zip meson-61cb4ae9ca5e0ee7b9864e22621fcbc44a9b407b.tar.gz meson-61cb4ae9ca5e0ee7b9864e22621fcbc44a9b407b.tar.bz2 | |
Can compile full test suite.
Diffstat (limited to 'meson/modules')
| -rw-r--r-- | meson/modules/gnome.py | 8 | ||||
| -rw-r--r-- | meson/modules/pkgconfig.py | 4 | ||||
| -rw-r--r-- | meson/modules/qt4.py | 6 | ||||
| -rw-r--r-- | meson/modules/qt5.py | 6 | ||||
| -rw-r--r-- | meson/modules/rpm.py | 10 | ||||
| -rw-r--r-- | meson/modules/windows.py | 4 |
6 files changed, 19 insertions, 19 deletions
diff --git a/meson/modules/gnome.py b/meson/modules/gnome.py index 60c994e..70ac81b 100644 --- a/meson/modules/gnome.py +++ b/meson/modules/gnome.py @@ -15,13 +15,13 @@ '''This module provides helper functions for Gnome/GLib related functionality such as gobject-introspection and gresources.''' -import build +from .. import build import os, sys import subprocess -from coredata import MesonException -import mlog +from ..coredata import MesonException +from .. import mlog import xml.etree.ElementTree as ET -from mesonlib import File +from ..mesonlib import File girwarning_printed = False diff --git a/meson/modules/pkgconfig.py b/meson/modules/pkgconfig.py index 5fa4bd0..f18decf 100644 --- a/meson/modules/pkgconfig.py +++ b/meson/modules/pkgconfig.py @@ -12,8 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -import coredata, build -import mesonlib +from .. import coredata, build +from .. import mesonlib import os class PkgConfigModule: diff --git a/meson/modules/qt4.py b/meson/modules/qt4.py index bcf42a3..162b553 100644 --- a/meson/modules/qt4.py +++ b/meson/modules/qt4.py @@ -12,10 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -import dependencies, mlog +from .. import dependencies, mlog import os, subprocess -import build -from coredata import MesonException +from .. import build +from ..coredata import MesonException import xml.etree.ElementTree as ET class Qt4Module(): diff --git a/meson/modules/qt5.py b/meson/modules/qt5.py index 0e732a1..81edc76 100644 --- a/meson/modules/qt5.py +++ b/meson/modules/qt5.py @@ -12,10 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -import dependencies, mlog +from .. import dependencies, mlog import os, subprocess -import build -from coredata import MesonException +from .. import build +from ..coredata import MesonException import xml.etree.ElementTree as ET class Qt5Module(): diff --git a/meson/modules/rpm.py b/meson/modules/rpm.py index eebecdd..a2c0502 100644 --- a/meson/modules/rpm.py +++ b/meson/modules/rpm.py @@ -15,11 +15,11 @@ '''This module provides helper functions for RPM related functionality such as generating template RPM spec file.''' -import build -import compilers -import datetime -import mlog -import modules.gnome +from .. import build +from .. import compilers +from .. import datetime +from .. import mlog +from .. import modules.gnome import os class RPMModule: diff --git a/meson/modules/windows.py b/meson/modules/windows.py index e01b454..a785250 100644 --- a/meson/modules/windows.py +++ b/meson/modules/windows.py @@ -12,8 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mesonlib, dependencies, build -from coredata import MesonException +from .. import mesonlib, dependencies, build +from ..coredata import MesonException import os class WindowsModule: |