aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'mesonbuild/scripts')
-rw-r--r--mesonbuild/scripts/meson_exe.py3
-rw-r--r--mesonbuild/scripts/meson_install.py2
-rw-r--r--mesonbuild/scripts/regen_checker.py1
-rw-r--r--mesonbuild/scripts/scanbuild.py2
-rw-r--r--mesonbuild/scripts/symbolextractor.py4
-rw-r--r--mesonbuild/scripts/yelphelper.py5
6 files changed, 6 insertions, 11 deletions
diff --git a/mesonbuild/scripts/meson_exe.py b/mesonbuild/scripts/meson_exe.py
index 938ec87..5c5c317 100644
--- a/mesonbuild/scripts/meson_exe.py
+++ b/mesonbuild/scripts/meson_exe.py
@@ -17,9 +17,8 @@ import sys
import argparse
import pickle
import platform
-import subprocess
-from ..mesonlib import MesonException, Popen_safe
+from ..mesonlib import Popen_safe
options = None
diff --git a/mesonbuild/scripts/meson_install.py b/mesonbuild/scripts/meson_install.py
index 0df79e3..11dd320 100644
--- a/mesonbuild/scripts/meson_install.py
+++ b/mesonbuild/scripts/meson_install.py
@@ -16,7 +16,7 @@ import sys, pickle, os, shutil, subprocess, gzip, platform
from glob import glob
from . import depfixer
from . import destdir_join
-from ..mesonlib import MesonException, Popen_safe
+from ..mesonlib import Popen_safe
install_log_file = None
diff --git a/mesonbuild/scripts/regen_checker.py b/mesonbuild/scripts/regen_checker.py
index 6f7ff79..4125f40 100644
--- a/mesonbuild/scripts/regen_checker.py
+++ b/mesonbuild/scripts/regen_checker.py
@@ -32,7 +32,6 @@ def need_regen(regeninfo, regen_timestamp):
return False
def regen(regeninfo, mesonscript, backend):
- scriptdir = os.path.split(__file__)[0]
cmd = [sys.executable,
mesonscript,
'--internal',
diff --git a/mesonbuild/scripts/scanbuild.py b/mesonbuild/scripts/scanbuild.py
index 2ef22bd..e17d2ad 100644
--- a/mesonbuild/scripts/scanbuild.py
+++ b/mesonbuild/scripts/scanbuild.py
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-import sys, os
+import os
import subprocess
import shutil
import tempfile
diff --git a/mesonbuild/scripts/symbolextractor.py b/mesonbuild/scripts/symbolextractor.py
index 9272495..bfd629f 100644
--- a/mesonbuild/scripts/symbolextractor.py
+++ b/mesonbuild/scripts/symbolextractor.py
@@ -20,9 +20,9 @@
# This file is basically a reimplementation of
# http://cgit.freedesktop.org/libreoffice/core/commit/?id=3213cd54b76bc80a6f0516aac75a48ff3b2ad67c
-import os, sys, subprocess
+import os, sys
from .. import mesonlib
-from ..mesonlib import MesonException, Popen_safe
+from ..mesonlib import Popen_safe
import argparse
parser = argparse.ArgumentParser()
diff --git a/mesonbuild/scripts/yelphelper.py b/mesonbuild/scripts/yelphelper.py
index 7431a81..76366a4 100644
--- a/mesonbuild/scripts/yelphelper.py
+++ b/mesonbuild/scripts/yelphelper.py
@@ -12,12 +12,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-import sys, os
+import os
import subprocess
import shutil
import argparse
from .. import mlog
-from ..mesonlib import MesonException
from . import destdir_join
parser = argparse.ArgumentParser()
@@ -82,7 +81,6 @@ def install_help(srcdir, blddir, sources, media, langs, install_dir, destdir, pr
os.makedirs(os.path.dirname(outfile), exist_ok=True)
os.symlink(srcfile, outfile)
continue
- symfile = os.path.join(install_dir, m)
mlog.log('Installing %s to %s.' %(infile, outfile))
if '/' in m or '\\' in m:
os.makedirs(os.path.dirname(outfile), exist_ok=True)
@@ -114,4 +112,3 @@ def run(args):
merge_translations(build_subdir, abs_sources, langs)
install_help(src_subdir, build_subdir, sources, media, langs, install_dir,
destdir, options.project_id, options.symlinks)
-