monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

AppImage: fix build (#589) 

* CI: build: use ARCH= for AppImage

* WebHost: pin flask-caching

until https://github.com/pallets-eco/flask-caching/pull/352 is merged or fixed otherwise
This commit is contained in:
black-sliver 2022-05-28 23:20:46 +02:00 committed by GitHub
parent 1a0bfecb5f
commit 6d3538a35b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
WebHostLib/requirements.txt
View File

@ -1,7 +1,7 @@
flask>=2.1.2 flask>=2.1.2
pony>=0.7.16 pony>=0.7.16
waitress>=2.1.1 waitress>=2.1.1
flask-caching>=1.10.1 flask-caching==1.10.1
Flask-Compress>=1.12 Flask-Compress>=1.12
Flask-Limiter>=2.4.5.1 Flask-Limiter>=2.4.5.1
bokeh>=2.4.3 bokeh>=2.4.3

3
setup.py
View File

@ -321,6 +321,7 @@ $APPDIR/$exe "$@"
self.app_id = self.app_name.lower() self.app_id = self.app_name.lower()
def run(self): def run(self):
import platform
self.dist_file.parent.mkdir(parents=True, exist_ok=True) self.dist_file.parent.mkdir(parents=True, exist_ok=True)
if self.app_dir.is_dir(): if self.app_dir.is_dir():
shutil.rmtree(self.app_dir) shutil.rmtree(self.app_dir)
@ -333,7 +334,7 @@ $APPDIR/$exe "$@"
self.write_desktop() self.write_desktop()
self.write_launcher(self.app_exec) self.write_launcher(self.app_exec)
print(f'{self.app_dir} -> {self.dist_file}') print(f'{self.app_dir} -> {self.dist_file}')
subprocess.call(f'./appimagetool -n "{self.app_dir}" "{self.dist_file}"', shell=True) subprocess.call(f'ARCH={platform.machine()} ./appimagetool -n "{self.app_dir}" "{self.dist_file}"', shell=True)
cx_Freeze.setup( cx_Freeze.setup(