dilim/meson
1
0
Fork 0
mirror of https://github.com/mesonbuild/meson.git synced 2026-06-30 19:57:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

misc formatting lint fixes, drop unneeded f-string

Browse Source
This commit is contained in:
Eli Schwartz
2021-06-15 19:28:25 -04:00
parent ead4ba7777
commit 409aae51d6
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
packaging/createpkg.py
View File

@@ -34,7 +34,7 @@ class PkgGenerator:
self.identifier = 'com.mesonbuild.meson'
self.version = coredata.version.replace('dev', '')
self.mesonstashdir = os.path.join(self.sharedir, f'meson-{self.version}')
self.pkgname = f'meson.pkg'
self.pkgname = 'meson.pkg'
self.productname = f'meson-{self.version}.pkg'
self.distribution_file = 'meson-distribution.xml'
self.resourcedir = 'packaging/macpages'
@@ -51,7 +51,7 @@ class PkgGenerator:
for m in get_modules():
pyinst_cmd += ['--hidden-import', m]
pyinst_cmd += ['meson.py']
subprocess.check_call(pyinst_cmd )
subprocess.check_call(pyinst_cmd)
tmpdir = os.path.join(self.pkg_dir, 'meson')
shutil.move(tmpdir, self.mesonstashdir)
os.makedirs(self.bindir)
@@ -64,11 +64,11 @@ class PkgGenerator:
def build_package(self):
subprocess.check_call(['pkgbuild',
'--root',
self.pkg_dir,
'--identifier',
self.identifier,
self.pkgname])
'--root',
self.pkg_dir,
'--identifier',
self.identifier,
self.pkgname])
self.generate_distribution()
subprocess.check_call(['productbuild',
'--distribution',
@@ -96,7 +96,7 @@ class PkgGenerator:
choice = ET.SubElement(root, 'choice', {'id': self.identifier, 'visible': 'false'})
ET.SubElement(choice, 'pkg-ref', {'id': self.identifier})
ET.SubElement(root, 'pkg-ref', {'id': self.identifier,
'version': '0',#self.version,
'version': '0', # self.version,
'onConclusion': 'none'}).text = self.pkgname
ET.ElementTree(root).write(self.distribution_file, encoding='utf-8', xml_declaration=True)
# ElementTree can not do prettyprinting so do it manually