luke
/
magic
mirror of https://github.com/RTimothyEdwards/magic.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Makefile cleanup, dockerignore

This commit is contained in:
Donn 2022-04-20 17:17:23 +02:00 committed by Tim Edwards
parent 2820aa49e2
commit b9f1ebd439
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.dockerignore Normal file
View File

@ -0,0 +1 @@
./appimage

25
appimage/Makefile
View File

@ -1,28 +1,24 @@
all: appimage
RESOURCES = $(shell find rsc/ -type f)
ARCH = $(shell uname -i)
ARCH = $(shell uname -m)
APPIMAGE = Magic-$(ARCH).AppImage
prefix.tar.gz: Dockerfile
all: $(APPIMAGE)
.PHONY: prefix/bin/magic
prefix/bin/magic: Dockerfile Makefile
rm -rf prefix
docker build -t magic_build -f ./Dockerfile ..
id=$$(docker create magic_build) ; \
docker cp $$id:/prefix.tar.gz ./prefix.tar.gz ; \
docker cp $$id:/prefix ./prefix ; \
docker rm -v $$id
prefix: prefix.tar.gz Makefile
rm -rf $@
mkdir -p $@
tar -xf $< -C $@ .
mkdir -p $@/lib/tcl8.6.12
cp -r $@/lib/tcl8.6 $@/lib/tcl8.6.12/library
mkdir -p prefix/lib/tcl8.6.12
cp -r prefix/lib/tcl8.6 prefix/lib/tcl8.6.12/library
appimagetool:
curl -L https://github.com/AppImage/AppImageKit/releases/download/13/appimagetool-x86_64.AppImage > ./appimagetool
chmod +x ./appimagetool
appimage: $(APPIMAGE)
$(APPIMAGE): prefix appimagetool $(RESOURCES)
$(APPIMAGE): prefix/bin/magic appimagetool $(RESOURCES)
cp $(RESOURCES) ./prefix
./appimagetool prefix
@ -32,5 +28,6 @@ install:
.PHONY: clean
clean:
rm -f *.AppImage
rm -f prefix.tar.gz
rm -rf prefix