Skip to content
This repository has been archived by the owner on Mar 15, 2020. It is now read-only.

Commit

Permalink
Fixing linux build
Browse files Browse the repository at this point in the history
  • Loading branch information
rupor-github committed Mar 28, 2018
1 parent b6ff423 commit 3c6d80f
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
4 changes: 4 additions & 0 deletions build-release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,10 @@ for _mingw in ${ARCH_INSTALLS}; do
if [ -z ${_msystem} ]; then
${_python} setup-cli.linux.cx_freeze.py build_exe -b ${_dist}
if [ $? -eq 0 ]; then
# some PIL files are copied twice
for file in ${_dist}/lib/.libs/*; do
rm ${_dist}/lib/`basename $file`
done
[ -f fb2mobi_cli_${_arch}_glibc_${_glibc}.tar.xz ] && rm fb2mobi_cli_${_arch}_glibc_${_glibc}.tar.xz
tar --directory ${_dist} --create --xz --file fb2mobi_cli_${_arch}_glibc_${_glibc}.tar.xz .
fi
Expand Down
7 changes: 2 additions & 5 deletions setup-cli.linux.cx_freeze.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,24 +39,21 @@
(os.path.join(base_dir, 'default_cover.jpg'), 'default_cover.jpg'),
(os.path.join(base_dir, 'spaces.xsl'), 'spaces.xsl'),
(os.path.join(base_dir, 'kindlegen'), 'kindlegen'),
(os.path.join(PIL.__path__[0], '.libs'), 'lib/python3.6/.libs'),
# (os.path.join(base_dir, 'ui/locale/qtbase_ru.qm'), 'ui/locale/qtbase_ru.qm'),
# (os.path.join(base_dir, 'ui/locale/fb2mobi_ru.qm'), 'ui/locale/fb2mobi_ru.qm')
(os.path.join(PIL.__path__[0], '.libs'), 'lib/.libs'),
]

setup(
name = "fb2mobi",
version = version.VERSION,
options={
'build_exe': {
# 'silent': 1,
# 'build_exe': 'dist',
'zip_exclude_packages': '',
'zip_include_packages': '*',
'packages': 'json,lxml,PIL',
'include_files': data_files,
'includes': includes,
'excludes': excludes,
'replace_paths': [('*','library.zip/')],
}
},
executables = [
Expand Down
2 changes: 1 addition & 1 deletion version.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@

WINDOWS = platform.system().lower() == "windows"

VERSION = u'3.6.53'
VERSION = u'3.6.54'

0 comments on commit 3c6d80f

Please sign in to comment.