[meld/windows-build-style-scheme: 1/3] build_helpers: Use a global check for the Windows build logic
- From: Kai Willadsen <kaiw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld/windows-build-style-scheme: 1/3] build_helpers: Use a global check for the Windows build logic
- Date: Fri, 10 Jan 2020 23:43:39 +0000 (UTC)
commit c9425254bf3d846c6060cc1d675135d54767bc67
Author: Kai Willadsen <kai willadsen gmail com>
Date: Sat Jan 11 09:35:47 2020 +1000
build_helpers: Use a global check for the Windows build logic
This makes it easier to read, but also easier to test some of the logic
when developing on Linux.
meld/build_helpers.py | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/meld/build_helpers.py b/meld/build_helpers.py
index c862942e..227f2cf8 100644
--- a/meld/build_helpers.py
+++ b/meld/build_helpers.py
@@ -40,9 +40,11 @@ except ImportError:
'Missing build requirement "distro" Python module; '
'install paths may be incorrect', file=sys.stderr)
+windows_build = os.name == 'nt'
+
def has_help(self):
- return "build_help" in self.distribution.cmdclass and os.name != 'nt'
+ return "build_help" in self.distribution.cmdclass and not windows_build
def has_icons(self):
@@ -50,7 +52,7 @@ def has_icons(self):
def has_i18n(self):
- return "build_i18n" in self.distribution.cmdclass and os.name != 'nt'
+ return "build_i18n" in self.distribution.cmdclass and not windows_build
def has_data(self):
@@ -117,7 +119,7 @@ class build_data(distutils.cmd.Command):
data_files.append(('share/meld', [target]))
- if os.name == 'nt':
+ if windows_build:
gschemas = self.frozen_gschemas
else:
gschemas = self.gschemas
@@ -231,7 +233,7 @@ class build_icons(distutils.cmd.Command):
pass
def run(self):
- target_dir = self.frozen_target if os.name == 'nt' else self.target
+ target_dir = self.frozen_target if windows_build else self.target
data_files = self.distribution.data_files
for theme in glob.glob(os.path.join(self.icon_dir, "*")):
@@ -286,7 +288,7 @@ class build_i18n(distutils.cmd.Command):
# If we're on Windows, assume we're building frozen and make a bunch
# of insane assumptions.
- if os.name == 'nt':
+ if windows_build:
msgfmt = "C:\\Python27\\Tools\\i18n\\msgfmt"
else:
msgfmt = "msgfmt"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]