aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mesonbuild/minit.py2
-rw-r--r--mesonbuild/modules/unstable_icestorm.py5
-rwxr-xr-xmsi/createmsi.py1
-rwxr-xr-xrun_unittests.py4
4 files changed, 4 insertions, 8 deletions
diff --git a/mesonbuild/minit.py b/mesonbuild/minit.py
index 69dd516..4459a05 100644
--- a/mesonbuild/minit.py
+++ b/mesonbuild/minit.py
@@ -269,7 +269,6 @@ ninja -C builddir
def create_exe_c_sample(project_name, project_version):
lowercase_token = re.sub(r'[^a-z0-9]', '_', project_name.lower())
- uppercase_token = lowercase_token.upper()
source_name = lowercase_token + '.c'
open(source_name, 'w').write(hello_c_template.format(project_name=project_name))
open('meson.build', 'w').write(hello_c_meson_template.format(project_name=project_name,
@@ -304,7 +303,6 @@ def create_lib_c_sample(project_name, version):
def create_exe_cpp_sample(project_name, project_version):
lowercase_token = re.sub(r'[^a-z0-9]', '_', project_name.lower())
- uppercase_token = lowercase_token.upper()
source_name = lowercase_token + '.cpp'
open(source_name, 'w').write(hello_cpp_template.format(project_name=project_name))
open('meson.build', 'w').write(hello_cpp_meson_template.format(project_name=project_name,
diff --git a/mesonbuild/modules/unstable_icestorm.py b/mesonbuild/modules/unstable_icestorm.py
index c880bf5..1f548b6 100644
--- a/mesonbuild/modules/unstable_icestorm.py
+++ b/mesonbuild/modules/unstable_icestorm.py
@@ -33,7 +33,6 @@ class IceStormModule(ExtensionModule):
def project(self, interpreter, state, args, kwargs):
if not self.yosys_bin:
self.detect_binaries(interpreter)
- result = []
if not len(args):
raise mesonlib.MesonException('Project requires at least one argument, which is the project name.')
proj_name = args[0]
@@ -75,10 +74,10 @@ class IceStormModule(ExtensionModule):
'command': [self.icepack_bin, '@INPUT@', '@OUTPUT@'],
'build_by_default': True})
- up_target = interpreter.func_run_target(None, [upload_name], {
+ interpreter.func_run_target(None, [upload_name], {
'command': [self.iceprog_bin, bin_target]})
- time_target = interpreter.func_run_target(None, [time_name], {
+ interpreter.func_run_target(None, [time_name], {
'command': [self.icetime_bin, bin_target]})
def initialize():
diff --git a/msi/createmsi.py b/msi/createmsi.py
index c709745..499f4b0 100755
--- a/msi/createmsi.py
+++ b/msi/createmsi.py
@@ -223,7 +223,6 @@ class PackageGenerator:
})
self.component_num += 1
for f in cur_node.files:
- file_source = os.path.join(current_dir, f).replace('\\', '\\\\')
file_id = os.path.join(current_dir, f).replace('\\', '_').replace('#', '_').replace('-', '_')
ET.SubElement(comp_xml_node, 'File', {
'Id': file_id,
diff --git a/run_unittests.py b/run_unittests.py
index 4eb5d4c..3e5da22 100755
--- a/run_unittests.py
+++ b/run_unittests.py
@@ -1984,8 +1984,8 @@ class FailureTests(BasePlatformTests):
env = Environment('', self.builddir, self.meson_command,
get_fake_options(self.prefix), [])
try:
- objc = env.detect_objc_compiler(False)
- objcpp = env.detect_objcpp_compiler(False)
+ env.detect_objc_compiler(False)
+ env.detect_objcpp_compiler(False)
except EnvironmentException:
code = "add_languages('objc')\nadd_languages('objcpp')"
self.assertMesonRaises(code, "Unknown compiler")