Philipp Hörist pushed to branch master at gajim / gajim
Commits:
83d36352 by André Apitzsch at 2017-10-07T17:24:37+02:00
Update setup.py and .gitignore
- - - - -
249e26fe by Philipp Hörist at 2017-10-08T00:42:56+02:00
Merge branch 'gitignore' into 'master'
Update setup.py and .gitignore
See merge request !142
- - - - -
2 changed files:
- .gitignore
- setup.py
Changes:
=====================================
.gitignore
=====================================
--- a/.gitignore
+++ b/.gitignore
@@ -12,12 +12,16 @@ data/org.gajim.Gajim.appdata.xml
data/org.gajim.Gajim.desktop
libtool
po/.intltool-merge-cache
+data/gajim-remote.desktop
po/gajim.pot
po/POTFILES
po/stamp-it
stamp-h1
Makefile
__pycache__/
+build/
+dist/
+gajim.egg-info/
src/gtk/
win/_build_root
=====================================
setup.py
=====================================
--- a/setup.py
+++ b/setup.py
@@ -56,7 +56,7 @@ def build_trans(build_cmd):
data_files = build_cmd.distribution.data_files
for lang in ALL_LINGUAS:
po_file = os.path.join('po', lang + '.po')
- mo_file = os.path.join(cwd, 'mo', lang, 'LC_MESSAGES', 'gajim.mo')
+ mo_file = os.path.join(cwd, 'build', 'mo', lang, 'LC_MESSAGES',
'gajim.mo')
mo_dir = os.path.dirname(mo_file)
if not (os.path.isdir(mo_dir) or os.path.islink(mo_dir)):
os.makedirs(mo_dir)
@@ -84,7 +84,7 @@ def build_man(build_cmd):
data_files = build_cmd.distribution.data_files
for man in ['gajim.1', 'gajim-history-manager.1', 'gajim-remote.1']:
filename = os.path.join('data', man)
- newdir = os.path.join(cwd, 'man')
+ newdir = os.path.join(cwd, 'build', 'man')
if not (os.path.isdir(newdir) or os.path.islink(newdir)):
os.makedirs(newdir)
@@ -103,9 +103,8 @@ def build_man(build_cmd):
f_out.writelines(f_in)
log.info('Compiling %s >> %s', filename, man_file_gz)
- src = cwd + '/man' + '/' + man + '.gz'
target = 'share/man/man1'
- data_files.append((target, [src]))
+ data_files.append((target, [man_file_gz]))
def build_intl(build_cmd):
View it on GitLab:
https://dev.gajim.org/gajim/gajim/compare/c4c08ad64546617ec411fa6661f785e5c3e23580...249e26feac8caeb458f9e9d3c006eb471103fd90
---
View it on GitLab:
https://dev.gajim.org/gajim/gajim/compare/c4c08ad64546617ec411fa6661f785e5c3e23580...249e26feac8caeb458f9e9d3c006eb471103fd90
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list
[email protected]
https://lists.gajim.org/cgi-bin/listinfo/commits
