Skip to content

Commit

Permalink
Revert "Support flatpak build system"
Browse files Browse the repository at this point in the history
This reverts commit 904dc2d.
  • Loading branch information
VoxelCubes committed Apr 24, 2023
1 parent 33d4c3f commit 3a05fde
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 72 deletions.
5 changes: 0 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
.env
.directory

# Flatpak
.flatpak-builder/
.flatpak/
deepqt.flatpak

# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
Expand Down
1 change: 0 additions & 1 deletion .idea/DeepQt.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 0 additions & 9 deletions DeepQt-flatpak.desktop

This file was deleted.

33 changes: 1 addition & 32 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,15 +1,7 @@
# define variables
PROJECT = deepqt
PYTHON = python
BUILD_DIR = dist/
BUILD_CACHE = deepqt.egg-info/
FLATPAK_PROJECT = com.voxel.deepqt
FLATPAK_SOURCE_DIR = .flatpak/flatpak_sources
FLATPAK_BASE_DIR = .flatpak
FLATPAK_BUILD_DIR = .flatpak/build-dir
FLATPAK_REPO_DIR = .flatpak/repo
FLATPAK_PYTHON_PACKAGE_DIR = $(FLATPAK_SOURCE_DIR)/python-packages


# default target
fresh-install: clean build install
Expand All @@ -30,28 +22,5 @@ clean:
release:
twine upload $(BUILD_DIR)*

# flatpak targets
prepare-flatpak: clean-flatpak
mkdir -p $(FLATPAK_BUILD_DIR) $(FLATPAK_REPO_DIR)
mkdir -p $(FLATPAK_SOURCE_DIR)
pip download -r requirements.txt --dest $(FLATPAK_PYTHON_PACKAGE_DIR)
# Also build the current package to the dependencies folder.
$(PYTHON) -m build --outdir $(FLATPAK_PYTHON_PACKAGE_DIR)
# Include the desktop file and the icon in the flatpak.
cp ./media/deepqt.png $(FLATPAK_SOURCE_DIR)/deepqt.png
cp ./DeepQt-flatpak.desktop $(FLATPAK_SOURCE_DIR)/DeepQt.desktop

build-flatpak: prepare-flatpak
flatpak-builder --repo=$(FLATPAK_REPO_DIR) --force-clean $(FLATPAK_BUILD_DIR) $(FLATPAK_PROJECT).yaml
@echo 'Building flatpak bundle, this may take a few minutes...'
flatpak build-bundle $(FLATPAK_REPO_DIR) $(PROJECT).flatpak $(FLATPAK_PROJECT)
rm -rf $(FLATPAK_BUILD_DIR)

install-flatpak: build-flatpak
flatpak install --user --bundle $(PROJECT).flatpak
flatpak run $(FLATPAK_PROJECT)

clean-flatpak:
rm -rf .flatpak

.PHONY: clean build install fresh-install release prepare-flatpak build-flatpak clean-flatpak
.PHONY: clean build install fresh-install release
25 changes: 0 additions & 25 deletions com.voxel.deepqt.yaml

This file was deleted.

0 comments on commit 3a05fde

Please sign in to comment.