-
Notifications
You must be signed in to change notification settings - Fork 45
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'refi64-flatpak' into flatpak-improvements
- Loading branch information
Showing
9 changed files
with
92 additions
and
92 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,9 @@ | ||
| all: | ||
| python3 ./setup.py build | ||
| .PHONY: flatpak-user-install flatpak-generate-python-modules | ||
|
|
||
| install: | ||
| python3 ./setup.py install --prefix=/app --skip-build --optimize=1 | ||
| flatpak-user-install: | ||
| cd flatpak; flatpak-builder --force-clean --install --user _build uberwriter.json | ||
|
|
||
| flatpak-generate-python-modules: | ||
| # gtkspellcheck's setup.py wants enchant to already be installed | ||
| flatpak-pip-generator --output flatpak/python3-enchant.json pyenchant | ||
| flatpak-pip-generator --output flatpak/python3-packages.json `grep -v enchant requirements.txt` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| regex | ||
| enchant | ||
| python-gtkspellcheck | ||
| pypandoc==1.4 | ||
| pyenchant | ||
| pygtkspellcheck |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,16 +2,16 @@ | |
| # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*- | ||
| ### BEGIN LICENSE | ||
| # Copyright (C) 2012, Wolf Vollprecht <[email protected]> | ||
| # This program is free software: you can redistribute it and/or modify it | ||
| # under the terms of the GNU General Public License version 3, as published | ||
| # This program is free software: you can redistribute it and/or modify it | ||
| # under the terms of the GNU General Public License version 3, as published | ||
| # by the Free Software Foundation. | ||
| # | ||
| # This program is distributed in the hope that it will be useful, but | ||
| # WITHOUT ANY WARRANTY; without even the implied warranties of | ||
| # MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR | ||
| # | ||
| # This program is distributed in the hope that it will be useful, but | ||
| # WITHOUT ANY WARRANTY; without even the implied warranties of | ||
| # MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR | ||
| # PURPOSE. See the GNU General Public License for more details. | ||
| # | ||
| # You should have received a copy of the GNU General Public License along | ||
| # | ||
| # You should have received a copy of the GNU General Public License along | ||
| # with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| ### END LICENSE | ||
|
|
||
|
|
@@ -22,26 +22,20 @@ | |
| from setuptools import setup | ||
| import os | ||
|
|
||
| def package_files(directory): | ||
| paths = [] | ||
| for (path, directories, filenames) in os.walk(directory): | ||
| def data_files(basename): | ||
| data = os.path.join('.', 'data') | ||
| root = os.path.join(data, basename) | ||
| extra_files = [] | ||
| for path, directories, filenames in os.walk(root): | ||
| paths = [] | ||
| for filename in filenames: | ||
| paths.append(os.path.join(path, filename)) | ||
| return paths | ||
| extra_files.append(('share/uberwriter/data/{}'.format(os.path.relpath(path, data)), paths)) | ||
| return extra_files | ||
|
|
||
| extra_files_ui = package_files('./data/ui') | ||
| extra_files_media_css = package_files('./data/media/css') | ||
| extra_files_media_fonts = package_files('./data/media/fonts') | ||
| extra_files_scripts = package_files('./data/lua') | ||
| from pprint import pprint | ||
| pprint(extra_files_ui) | ||
| pprint(extra_files_media_css) | ||
| pprint(extra_files_media_fonts) | ||
|
|
||
| if os.path.isfile("/.flatpak-info"): | ||
| app_prefix = '/app/' | ||
| else: | ||
| app_prefix = '/usr/' | ||
| extra_files_ui = data_files('ui') | ||
| extra_files_media = data_files('media') | ||
| extra_files_scripts = data_files('lua') | ||
|
|
||
| setup( | ||
| name='uberwriter', | ||
|
|
@@ -51,10 +45,10 @@ def package_files(directory): | |
| author_email='[email protected]', | ||
| description='A beautiful, simple and distraction free markdown editor.', | ||
| long_description="""UberWriter, beautiful distraction free writing | ||
| With UberWriter you get only one thing: An empty textbox, that is to | ||
| fill with your ideas. There are no settings, you don't have to choose a | ||
| font, it is only for writing.You can use markdown for all your markup | ||
| needs. PDF, RTF and HTML are generated with pandoc. For PDF generation it | ||
| With UberWriter you get only one thing: An empty textbox, that is to | ||
| fill with your ideas. There are no settings, you don't have to choose a | ||
| font, it is only for writing.You can use markdown for all your markup | ||
| needs. PDF, RTF and HTML are generated with pandoc. For PDF generation it | ||
| is also required that you choose to install the texlive-luatex package.""", | ||
| url='https://github.com/wolfv/uberwriter/', | ||
| # cmdclass={'install': InstallAndUpdateDataDirectory}, | ||
|
|
@@ -76,15 +70,12 @@ def package_files(directory): | |
| 'uberwriter.pylocales' : ['locales.db'], | ||
| }, | ||
| data_files=[ | ||
| (app_prefix + 'bin', ['bin/uberwriter']), | ||
| (app_prefix + 'share/glib-2.0/schemas', ['data/de.wolfvollprecht.UberWriter.gschema.xml']), | ||
| (app_prefix + 'share/icons/hicolor/scalable/apps', ['data/media/de.wolfvollprecht.UberWriter.svg']), | ||
| (app_prefix + 'share/icons/hicolor/symbolic/apps', ['data/media/de.wolfvollprecht.UberWriter-symbolic.svg']), | ||
| (app_prefix + 'share/applications', ['data/de.wolfvollprecht.UberWriter.desktop']), | ||
| (app_prefix + 'share/uberwriter/data/media', ['data/media/uberwriter_markdown.md']), | ||
| (app_prefix + 'share/uberwriter/data/ui', extra_files_ui), | ||
| (app_prefix + 'share/uberwriter/data/media/css', extra_files_media_css), | ||
| (app_prefix + 'share/uberwriter/data/media/fonts', extra_files_media_fonts), | ||
| (app_prefix + 'share/uberwriter/data/lua', extra_files_scripts) | ||
| ('bin', ['uberwriter.in']), | ||
| ('share/applications', ['data/de.wolfvollprecht.UberWriter.desktop']), | ||
| ('share/metainfo', ['data/de.wolfvollprecht.UberWriter.appdata.xml']), | ||
| ('share/icons/hicolor/scalable/apps', ['data/media/de.wolfvollprecht.UberWriter.svg']), | ||
| ('share/icons/hicolor/symbolic/apps', ['data/media/de.wolfvollprecht.UberWriter-symbolic.svg']), | ||
| ('share/glib-2.0/schemas', ['data/de.wolfvollprecht.UberWriter.gschema.xml']), | ||
| *(extra_files_ui + extra_files_media + extra_files_scripts) | ||
| ] | ||
| ) | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters