From 88079ad98a7b781cbf1730a8974ba7e890315894 Mon Sep 17 00:00:00 2001 From: Bumsik Kim Date: Wed, 7 Nov 2018 16:56:21 +0900 Subject: [PATCH] Makefile: Added tar.gz archive --- .gitignore | 3 +++ Makefile | 12 ++++++++++-- package/debian/build.sh | 6 ++---- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index aa1cd9b..46f649e 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,9 @@ # files & folders for development use debug +# Archive file +*.tar.gz + ################################################################################ # Byte-compiled / optimized / DLL files __pycache__/ diff --git a/Makefile b/Makefile index e99d246..590ac88 100644 --- a/Makefile +++ b/Makefile @@ -8,12 +8,13 @@ DOCKER_RUN_TTY=docker run --interactive --tty -v $(shell pwd):/app $(DOCKER_NAME PKG_APPIMAGE=package/appimage/VirtScreen.AppImage PKG_DEBIAN=package/debian/virtscreen.deb +ARCHIVE=virtscreen-$(VERSION).tar.gz .ONESHELL: .PHONY: run debug run-appimage debug-appimage -all: package/pypi/*.whl $(PKG_APPIMAGE) $(PKG_DEBIAN) +all: package/pypi/*.whl $(ARCHIVE) $(PKG_APPIMAGE) $(PKG_DEBIAN) # Run script run: @@ -28,6 +29,12 @@ run-appimage: $(PKG_APPIMAGE) debug-appimage: $(PKG_APPIMAGE) QT_DEBUG_PLUGINS=1 QML_IMPORT_TRACE=1 $< --log=DEBUG +# tar.gz +.PHONY: archive + +archive $(ARCHIVE): + git archive --format=tar.gz --prefix=virtscreen-$(VERSION)/ -o $@ HEAD + # Docker tools .PHONY: docker docker-build @@ -64,7 +71,7 @@ appimage-clean: # https://www.debian.org/doc/manuals/debmake-doc/ch08.en.html#setup-py .PHONY: deb-contents deb-clean -$(PKG_DEBIAN): $(PKG_APPIMAGE) +$(PKG_DEBIAN): $(PKG_APPIMAGE) $(ARCHIVE) $(DOCKER_RUN) package/debian/build.sh $(DOCKER_RUN) mv package/debian/*.deb $@ $(DOCKER_RUN) chown -R $(shell id -u):$(shell id -u) package/debian @@ -121,3 +128,4 @@ override-version: # Clean packages clean: appimage-clean arch-clean deb-clean wheel-clean + -rm -f $(ARCHIVE) diff --git a/package/debian/build.sh b/package/debian/build.sh index 06ad577..8212035 100755 --- a/package/debian/build.sh +++ b/package/debian/build.sh @@ -11,10 +11,8 @@ ROOT=$SCRIPT_DIR/../.. # Generate necessary files for package building (generated by debmake) cd $ROOT/package/debian -wget -q https://github.com/kbumsik/VirtScreen/archive/$PKGVER.tar.gz -tar -xzmf $PKGVER.tar.gz -mv VirtScreen-$PKGVER virtscreen-$PKGVER -mv $PKGVER.tar.gz virtscreen-$PKGVER.tar.gz +cp $ROOT/virtscreen-$PKGVER.tar.gz . +tar -xzmf virtscreen-$PKGVER.tar.gz cp $ROOT/package/debian/Makefile \ $ROOT/package/debian/virtscreen-$PKGVER/Makefile cd $ROOT/package/debian/virtscreen-$PKGVER