Skip to content

Commit

Permalink
Minimal attempt to fix pyproject for windows build
Browse files Browse the repository at this point in the history
  • Loading branch information
kaiw committed Jul 13, 2024
1 parent 3ee7b24 commit 0ec6186
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 7 deletions.
10 changes: 5 additions & 5 deletions meld/build_helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ def __init__(self, *args, **kwargs):
class build_data(distutils.cmd.Command):

gschemas = [
('share/glib-2.0/schemas', ['data/org.gnome.meld.gschema.xml'])
('share/glib-2.0/schemas', ['data/org.gnome.Meld.gschema.xml'])
]

frozen_gschemas = [
Expand Down Expand Up @@ -367,12 +367,12 @@ def run(self):
# Meson-based initial variable templating in distutils.
import shutil
shutil.copyfile(
'data/org.gnome.meld.desktop.in.in',
'data/org.gnome.meld.desktop.in',
'data/org.gnome.Meld.desktop.in.in',
'data/org.gnome.Meld.desktop.in',
)
shutil.copyfile(
'data/org.gnome.meld.appdata.xml.in.in',
'data/org.gnome.meld.appdata.xml.in',
'data/org.gnome.Meld.appdata.xml.in.in',
'data/org.gnome.Meld.appdata.xml.in',
)

self._rebuild_po()
Expand Down
5 changes: 5 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ requires = [

[project]
name = "Meld"
dynamic = ["version"]
license = {file = "COPYING"}
description = """
Meld is a visual diff and merge tool targeted at developers. Meld helps you
Expand Down Expand Up @@ -34,6 +35,10 @@ classifiers = [
"Topic :: Software Development",
"Topic :: Software Development :: Version Control",
]
keywords=[
"diff",
"merge",
]

[project.urls]
homepage = "https://meld.app/"
Expand Down
2 changes: 0 additions & 2 deletions setup_win32.py
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,6 @@ def get_non_python_libs():
name="Meld",
version=meld.conf.__version__,
description='Visual diff and merge tool',
author='The Meld project',
author_email='[email protected]',
maintainer='Kai Willadsen',
url='https://meld.app',
license='GPLv2+',
Expand Down

0 comments on commit 0ec6186

Please sign in to comment.