Gentoo Archives: gentoo-commits

From: Sebastian Pipping <sping@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/elogv:master commit in: /
Date: Sat, 15 Jan 2022 22:00:39
Message-Id: 1642284019.f055922742ef18f7adfef3b7caa0c908de843539.sping@gentoo
1 commit: f055922742ef18f7adfef3b7caa0c908de843539
2 Author: Montana Mendy <montana <AT> getprowl <DOT> com>
3 AuthorDate: Sat Jan 15 00:57:14 2022 +0000
4 Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
5 CommitDate: Sat Jan 15 22:00:19 2022 +0000
6 URL: https://gitweb.gentoo.org/proj/elogv.git/commit/?id=f0559227
7
8 Fixed refactor, alignment, breaks, and readibility.
9
10 Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org>
11
12 setup.py | 111 ++++++++++++++++++++++++++++++++++-----------------------------
13 1 file changed, 60 insertions(+), 51 deletions(-)
14
15 diff --git a/setup.py b/setup.py
16 index b3a24bd..048b584 100644
17 --- a/setup.py
18 +++ b/setup.py
19 @@ -7,14 +7,14 @@ from distutils.command.build import build as _build
20 from distutils.command.install import install as _install
21 from distutils.command.clean import clean as _clean
22
23 -
24 import os
25 from glob import glob
26
27 -## Snippet of code found on
28 +## Snippet of code found on
29 ## http://developer.berlios.de/snippet/detail.php?type=snippet&id=100019
30 ## Useful to handle *.po files under distutils
31
32 +
33 class messages(Command):
34
35 description = 'Extract messages from source files'
36 @@ -40,6 +40,7 @@ class messages(Command):
37 if self.merge:
38 self.run_command('merge')
39
40 +
41 class merge(Command):
42 description = 'Merge message catalogs with template'
43
44 @@ -75,14 +76,14 @@ class merge(Command):
45 class build_messages(Command):
46
47 description = 'Compile message catalogs'
48 - user_options = [('build-dir=', 'd', 'directory to build message catalogs in')]
49 + user_options = [('build-dir=', 'd',
50 + 'directory to build message catalogs in')]
51
52 def initialize_options(self):
53 self.build_dir = None
54
55 def finalize_options(self):
56 - self.set_undefined_options('build',
57 - ('build_messages', 'build_dir'))
58 + self.set_undefined_options('build', ('build_messages', 'build_dir'))
59
60 def run(self):
61 self.mkpath(self.build_dir)
62 @@ -96,6 +97,7 @@ class build_messages(Command):
63 cmd = 'msgfmt -o "%s" %s' % (out_file, f)
64 os.system(cmd)
65
66 +
67 class build(_build):
68 # integrate build_message
69 def has_messages(self):
70 @@ -108,20 +110,20 @@ class build(_build):
71 def finalize_options(self):
72 _build.finalize_options(self)
73 if self.build_messages is None:
74 - self.build_messages = os.path.join(self.build_base,
75 - 'po')
76 + self.build_messages = os.path.join(self.build_base, 'po')
77
78 - _build.user_options.append(('build-messages=', None,
79 - "build directory for messages"))
80 + _build.user_options.append(
81 + ('build-messages=', None, "build directory for messages"))
82 _build.sub_commands.append(('build_messages', has_messages))
83
84 +
85 class install_messages(Command):
86
87 description = 'Installs message catalogs'
88
89 user_options = [
90 ('install-dir=', 'd', "directory to install scripts to"),
91 - ('build-dir=','b', "build directory (where to install from)"),
92 + ('build-dir=', 'b', "build directory (where to install from)"),
93 ('skip-build', None, "skip the build steps"),
94 ]
95
96 @@ -134,11 +136,12 @@ class install_messages(Command):
97
98 def finalize_options(self):
99 self.set_undefined_options('build', ('build_messages', 'build_dir'))
100 - self.set_undefined_options('install',
101 - ('install_data', 'install_dir'),
102 - ('force', 'force'),
103 - ('skip_build', 'skip_build'),
104 - )
105 + self.set_undefined_options(
106 + 'install',
107 + ('install_data', 'install_dir'),
108 + ('force', 'force'),
109 + ('skip_build', 'skip_build'),
110 + )
111 self.install_dir = os.path.join(self.install_dir, 'share', 'locale')
112
113 def run(self):
114 @@ -150,41 +153,40 @@ class install_messages(Command):
115 base = os.path.splitext(base)[0]
116 out_dir = os.path.join(self.install_dir, base, 'LC_MESSAGES')
117 self.mkpath(out_dir)
118 - out_file = os.path.join(out_dir, '%s.mo' % self.distribution.get_name())
119 + out_file = os.path.join(out_dir,
120 + '%s.mo' % self.distribution.get_name())
121 copy_file(c, out_file)
122
123 +
124 class clean(_clean):
125 - _clean.user_options.append(('build-messages=', None,
126 - "build directory for messages (default: 'build.build-messages')"))
127 + _clean.user_options.append(
128 + ('build-messages=', None,
129 + "build directory for messages (default: 'build.build-messages')"))
130
131 def initialize_options(self):
132 _clean.initialize_options(self)
133 self.build_messages = None
134
135 def finalize_options(self):
136 - self.set_undefined_options('build',
137 - ('build_base', 'build_base'),
138 + self.set_undefined_options('build', ('build_base', 'build_base'),
139 ('build_lib', 'build_lib'),
140 ('build_scripts', 'build_scripts'),
141 ('build_temp', 'build_temp'),
142 ('build_messages', 'build_messages'))
143 - self.set_undefined_options('bdist',
144 - ('bdist_base', 'bdist_base'))
145 + self.set_undefined_options('bdist', ('bdist_base', 'bdist_base'))
146 +
147 def run(self):
148 # remove the build/temp.<plat> directory (unless it's already
149 # gone)
150 if os.path.exists(self.build_temp):
151 remove_tree(self.build_temp, dry_run=self.dry_run)
152 else:
153 - log.debug("'%s' does not exist -- can't clean it",
154 - self.build_temp)
155 + log.debug("'%s' does not exist -- can't clean it", self.build_temp)
156
157 if self.all:
158 # remove build directories
159 - for directory in (self.build_lib,
160 - self.bdist_base,
161 - self.build_scripts,
162 - self.build_messages):
163 + for directory in (self.build_lib, self.bdist_base,
164 + self.build_scripts, self.build_messages):
165 if os.path.exists(directory):
166 remove_tree(directory, dry_run=self.dry_run)
167 else:
168 @@ -200,6 +202,7 @@ class clean(_clean):
169 except OSError:
170 pass
171
172 +
173 ## Class modified to add manpages command
174 class install(_install):
175 def has_messages(self):
176 @@ -207,42 +210,47 @@ class install(_install):
177
178 def has_manpages(self):
179 return True
180 -
181 +
182 _install.sub_commands.append(('install_messages', has_messages))
183 - _install.sub_commands.append(('install_manpages', has_manpages))
184 + _install.sub_commands.append(('install_manpages', has_manpages))
185 +
186
187 ### End of snippet ###
188
189 +
190 class install_manpages(Command):
191
192 description = "Install man pages"
193 -
194 +
195 user_options = []
196 -
197 +
198 def initialize_options(self):
199 self.man_pages = man_pages
200 self.install_dir = None
201 self.root = None
202 -
203 +
204 def finalize_options(self):
205 - self.set_undefined_options('install',
206 - ('install_data', 'install_dir'),
207 - ('root', 'root'),
208 - )
209 + self.set_undefined_options(
210 + 'install',
211 + ('install_data', 'install_dir'),
212 + ('root', 'root'),
213 + )
214 +
215 def run(self):
216 for f in self.man_pages:
217 attrs = f.split(".")
218 - dest = os.path.join(self.install_dir,"share","man")
219 + dest = os.path.join(self.install_dir, "share", "man")
220 try:
221 - dest = os.path.join(dest,attrs[2])
222 + dest = os.path.join(dest, attrs[2])
223 except IndexError:
224 pass
225 - dest = os.path.join(dest,"man" + attrs[1])
226 + dest = os.path.join(dest, "man" + attrs[1])
227 self.mkpath(dest)
228 self.copy_file(f, dest)
229
230 -man_pages=glob("man/*")
231 -
232 +
233 +man_pages = glob("man/*")
234 +
235 setup(name="elogv",
236 version="0.7.9",
237 author="Luca Marturana",
238 @@ -251,12 +259,13 @@ setup(name="elogv",
239 description="Curses based utility to view elogs created by Portage",
240 url="https://gitweb.gentoo.org/proj/elogv.git/",
241 scripts=['elogv'],
242 - cmdclass={'extract_messages': messages,
243 - 'merge': merge,
244 - 'build_messages': build_messages,
245 - 'build': build,
246 - 'install_messages': install_messages,
247 - 'install_manpages': install_manpages,
248 - 'install': install,
249 - 'clean': clean}
250 -)
251 + cmdclass={
252 + 'extract_messages': messages,
253 + 'merge': merge,
254 + 'build_messages': build_messages,
255 + 'build': build,
256 + 'install_messages': install_messages,
257 + 'install_manpages': install_manpages,
258 + 'install': install,
259 + 'clean': clean
260 + })