Clean the Makefile to make it more readable
parent
55d4d67f1c
commit
bb13ef5937
56
Makefile
56
Makefile
|
|
@ -1,14 +1,16 @@
|
|||
Appname:=$(shell cat appname.txt)
|
||||
prefix:=/usr
|
||||
temp:=/tmp/fpm-jolla
|
||||
sourcePath:=$(shell pwd)
|
||||
output:=$(sourcePath)/output
|
||||
dependencies=$(shell for file in `cat dependencies.txt`;do echo "-d "$${file};done;)
|
||||
version:=0.4.5
|
||||
iteration:=5
|
||||
version:=0.5.0
|
||||
iteration:=0
|
||||
fpmExec:=$(shell echo "$${FPM_BIN:=fpm}")
|
||||
|
||||
all: clean build-tmp rpm-i686 rpm-jolla rpm-aarch64
|
||||
|
||||
build-tmp:
|
||||
mkdir -p $(output)
|
||||
mkdir -p $(temp)/usr/share/applications
|
||||
mkdir -p $(temp)/usr/share/icons/hicolor/86x86/apps
|
||||
mkdir -p $(temp)/usr/share/$(Appname)/src
|
||||
|
|
@ -19,10 +21,10 @@ build-tmp:
|
|||
cp -ar ./dat/appicon.png $(temp)/usr/share/icons/hicolor/86x86/apps/$(Appname).png
|
||||
install -m 755 ./dat/$(Appname).sh $(temp)/usr/bin/$(Appname)
|
||||
|
||||
rpm-i686: arch:=i686
|
||||
rpm-i686: rpmname:=$(Appname)-$(version)-$(iteration).$(arch).rpm
|
||||
rpm-i686: build-tmp
|
||||
cd $(temp);fpm -f -s dir -t rpm \
|
||||
build: rpmname=$(Appname)-$(version)-$(iteration).$(arch).rpm
|
||||
build: build-tmp
|
||||
cd $(temp); \
|
||||
$(fpmExec) -f -s dir -t rpm \
|
||||
--after-install $(sourcePath)/dat/upgradeScript.sh \
|
||||
--after-remove $(sourcePath)/dat/removeScript.sh \
|
||||
--rpm-changelog $(sourcePath)/changelog.txt \
|
||||
|
|
@ -33,39 +35,17 @@ rpm-i686: build-tmp
|
|||
-p $(temp)/$(rpmname) \
|
||||
-n $(Appname) \
|
||||
-a $(arch) \
|
||||
--prefix / *
|
||||
--prefix / *; \
|
||||
mv $(temp)/*.rpm $(output)
|
||||
|
||||
rpm-jolla: arch:=armv7hl
|
||||
rpm-jolla: rpmname:=$(Appname)-$(version)-$(iteration).$(arch).rpm
|
||||
rpm-jolla: build-tmp
|
||||
cd $(temp);fpm -f -s dir -t rpm \
|
||||
--after-install $(sourcePath)/dat/upgradeScript.sh \
|
||||
--after-remove $(sourcePath)/dat/removeScript.sh \
|
||||
--rpm-changelog $(sourcePath)/changelog.txt \
|
||||
--directories "/usr/share/$(Appname)" \
|
||||
-v $(version) \
|
||||
--iteration $(iteration) \
|
||||
$(dependencies) \
|
||||
-p $(temp)/$(rpmname) \
|
||||
-n $(Appname) \
|
||||
-a $(arch) \
|
||||
--prefix / *
|
||||
rpm-i686: arch=i686
|
||||
rpm-i686: build
|
||||
|
||||
rpm-aarch64: arch:=aarch64
|
||||
rpm-aarch64: rpmname:=$(Appname)-$(version)-$(iteration).$(arch).rpm
|
||||
rpm-aarch64: build-tmp
|
||||
cd $(temp);fpm -f -s dir -t rpm \
|
||||
--after-install $(sourcePath)/dat/upgradeScript.sh \
|
||||
--after-remove $(sourcePath)/dat/removeScript.sh \
|
||||
--rpm-changelog $(sourcePath)/changelog.txt \
|
||||
--directories "/usr/share/$(Appname)" \
|
||||
-v $(version) \
|
||||
--iteration $(iteration) \
|
||||
$(dependencies) \
|
||||
-p $(temp)/$(rpmname) \
|
||||
-n $(Appname) \
|
||||
-a $(arch) \
|
||||
--prefix / *
|
||||
rpm-jolla: arch=armv7hl
|
||||
rpm-jolla: build
|
||||
|
||||
rpm-aarch64: arch=aarch64
|
||||
rpm-aarch64: build
|
||||
|
||||
clean:
|
||||
rm -rf $(temp)
|
||||
|
|
|
|||
14
README.md
14
README.md
|
|
@ -1,5 +1,7 @@
|
|||
# Muchkin icons
|
||||
|
||||
==============
|
||||
|
||||
Make your webapps icons in the app box look better with the rest of your native apps by choosing whether the corners are rounded or pointed
|
||||
|
||||
## Dependencies
|
||||
|
|
@ -12,19 +14,21 @@ Make your webapps icons in the app box look better with the rest of your native
|
|||
- [rpm-tools](http://rpm.org/)
|
||||
|
||||
## Build your own RPM package
|
||||
1. Clone the repository: `git clone https://gitlab.com/kirbylife/harbour-muchkin`
|
||||
1. Clone the repository: `git clone https://git.kirbylife.dev/kirbylife/harbour-muchkin`
|
||||
1. Go to the directory: `cd harbour-muchkin`
|
||||
1. Build the package.
|
||||
1. Build the package:
|
||||
1. armv7hl: `make rpm-jolla`
|
||||
1. i686: `make rpm-virt`
|
||||
1. i686: `make rpm-i686`
|
||||
1. aarch64: `make rpm-aarch64`
|
||||
1. the .rpm file will be on `/tmp/fpm-jolla/`
|
||||
1. (if fpm is not in `PATH` or has a different name you can set the env var "FPM_BIN" with the path to the binary).
|
||||
1. the .rpm file will be on `output/`.
|
||||
|
||||
## TO-DO
|
||||
- [x] Support to aarch64 arquitecture
|
||||
- [x] Choice non-transparent color to fill the empty spaces
|
||||
- [x] Fix the issue with sailjail
|
||||
- [ ] Make betters Make commands
|
||||
- [x] Make betters Make commands
|
||||
- [ ] Add SVG support
|
||||
- [ ] Add option to request favicon
|
||||
- [ ] Add option to restore the original icon
|
||||
- [ ] Make all icons in the main grid the same size
|
||||
|
|
|
|||
|
|
@ -4,7 +4,8 @@ X-Nemo-Application-Type=silica-qt5
|
|||
Name=Muchkin
|
||||
Icon=harbour-muchkin
|
||||
Exec=sailfish-qml harbour-muchkin
|
||||
|
||||
[X-Sailjail]
|
||||
Sandboxing=Disabled
|
||||
OrganizationName=org.kirbylife
|
||||
ApplicationName=harbour-muchkin
|
||||
OrganizationName=dev.kirbylife
|
||||
ApplicationName=harbour-muchkin
|
||||
|
|
|
|||
Loading…
Reference in New Issue