aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNiclas Moeslund Overby <noverby@prozum.dk>2018-07-03 17:50:42 +0200
committerNiclas Moeslund Overby <noverby@prozum.dk>2018-07-03 22:12:17 +0200
commit62a46a9b6ec042ab624dc3563b3c777371bb3ab6 (patch)
tree9711972d5806935893fbe0efc458d5dbcfb65e9a
parentc70a051e9352639440532ad969d9b7c215a3e699 (diff)
downloadmeson-62a46a9b6ec042ab624dc3563b3c777371bb3ab6.zip
meson-62a46a9b6ec042ab624dc3563b3c777371bb3ab6.tar.gz
meson-62a46a9b6ec042ab624dc3563b3c777371bb3ab6.tar.bz2
java: prevent creation of manifest duplicate in jar
-rw-r--r--mesonbuild/backend/ninjabackend.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py
index 88415e8..3ee543d 100644
--- a/mesonbuild/backend/ninjabackend.py
+++ b/mesonbuild/backend/ninjabackend.py
@@ -980,7 +980,7 @@ int dummy;
plain_class_path = self.generate_single_java_compile(src, target, compiler, outfile)
class_list.append(plain_class_path)
class_dep_list = [os.path.join(self.get_target_private_dir(target), i) for i in class_list]
- manifest_path = os.path.join(self.get_target_private_dir(target), 'Manifest.txt')
+ manifest_path = os.path.join(self.get_target_private_dir(target), 'META-INF', 'MANIFEST.MF')
manifest_fullpath = os.path.join(self.environment.get_build_dir(), manifest_path)
os.makedirs(os.path.dirname(manifest_fullpath), exist_ok=True)
with open(manifest_fullpath, 'w') as manifest: