Skip to content

Commit

Permalink
Converted compilers.py to a sub-package
Browse files Browse the repository at this point in the history
  • Loading branch information
astavale committed Jun 22, 2017
1 parent e555990 commit d71da5b
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 6 deletions.
15 changes: 15 additions & 0 deletions mesonbuild/compilers/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Copyright 2017 The Meson development team

# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at

# http://www.apache.org/licenses/LICENSE-2.0

# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

from .compilers import *
10 changes: 5 additions & 5 deletions mesonbuild/compilers.py → mesonbuild/compilers/compilers.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@

import contextlib, os.path, re, shutil, subprocess, tempfile

from .linkers import StaticLinker
from . import coredata
from . import mlog
from . import mesonlib
from .mesonlib import EnvironmentException, MesonException, version_compare, Popen_safe
from ..linkers import StaticLinker
from .. import coredata
from .. import mlog
from .. import mesonlib
from ..mesonlib import EnvironmentException, MesonException, version_compare, Popen_safe

"""This file contains the data files of all compilers Meson knows
about. To support a new compiler, add its information below.
Expand Down
2 changes: 1 addition & 1 deletion mesonbuild/environment.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

import configparser, os, platform, re, shlex, shutil
import configparser, os, platform, re, shlex, shutil, subprocess

from .compilers import *
from .linkers import ArLinker, VisualStudioLinker
Expand Down

0 comments on commit d71da5b

Please sign in to comment.