From 921f2babb9ae3087447fc0c1286947c931480627 Mon Sep 17 00:00:00 2001
From: aunetx <aunetx@yandex.com>
Date: Mon, 15 Nov 2021 17:14:41 +0100
Subject: [PATCH] Better makefile
---
Makefile | 30 +++++++++++++++++++-----------
package-append.json | 8 +-------
2 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/Makefile b/Makefile
index a653989..55198de 100644
--- a/Makefile
+++ b/Makefile
@@ -64,30 +64,38 @@ run_flatpak:
flatpak run $(APPNAME)
-#! APPIMAGE
+#! PKGS
install_deps: prepare
# Install yarn dependencies to pack them later
yarn --cwd=app install
-build_appimage: install_deps
- # Build the AppImage package
- yarn --cwd=app run build-appimage
-
-
-#! PKGS
build_pkgs: install_deps
# Build everything
- yarn --cwd=app run build
+ yarn --cwd=app run build-rpm
+ yarn --cwd=app run build-deb
+ yarn --cwd=app run build-snap
+ yarn --cwd=app run build-appimage
+ yarn --cwd=app run build-7z
+build_deb: install_deps
+ # Build deb package
+ yarn --cwd=app run build-deb
build_rpm: install_deps
# Build rpm package
yarn --cwd=app run build-rpm
-
-build_deb: install_deps
+build_snap: install_deps
# Build deb package
- yarn --cwd=app run build-deb
+ yarn --cwd=app run build-snap
+
+build_appimage: install_deps
+ # Build the AppImage package
+ yarn --cwd=app run build-appimage
+
+build_7z: install_deps
+ # Build 7z archive
+ yarn --cwd=app run build-7z
build_pkgs_arm64: install_deps
diff --git a/package-append.json b/package-append.json
index 15de6ac..32bde08 100644
--- a/package-append.json
+++ b/package-append.json
@@ -9,8 +9,6 @@
"build-snap": "electron-builder --x64 --linux snap",
"build-appimage": "electron-builder --x64 --linux AppImage",
"build-7z": "electron-builder --x64 --linux 7z",
- "build-tar.gz": "electron-builder --x64 --linux tar.gz",
- "build-zip": "electron-builder --x64 --linux zip",
"build-arm": "electron-builder --arm64 --linux deb rpm snap AppImage 7z tar.gz zip",
"build-deb-arm": "electron-builder --arm64 --linux deb",
@@ -18,14 +16,10 @@
"build-snap-arm": "electron-builder --arm64 --linux snap",
"build-appimage-arm": "electron-builder --arm64 --linux AppImage",
"build-7z-arm": "electron-builder --arm64 --linux 7z",
- "build-tar.gz-arm": "electron-builder --arm64 --linux tar.gz",
- "build-zip-arm": "electron-builder --arm64 --linux zip",
"build-x86": "electron-builder --ia32 --linux deb",
"build-deb-x86": "electron-builder --ia32 --linux deb",
- "build-7z-x86": "electron-builder --ia32 --linux 7z",
- "build-tar.gz-x86": "electron-builder --ia32 --linux tar.gz",
- "build-zip-x86": "electron-builder --ia32 --linux zip"
+ "build-7z-x86": "electron-builder --ia32 --linux 7z"
},
"devDependencies": {
"electron": "^13.5.1",