mirror of
https://github.com/kbumsik/VirtScreen.git
synced 2025-02-12 11:21:53 +00:00
Debian: upgraded to AppImage based package
This commit is contained in:
parent
7dcf8a8bde
commit
2bf8dedf9d
10 changed files with 60 additions and 72 deletions
18
Makefile
18
Makefile
|
@ -30,6 +30,7 @@ wheel-clean:
|
|||
|
||||
# For AppImage packaging, https://github.com/AppImage/AppImageKit/wiki/Creating-AppImages
|
||||
.PHONY: appimage-clean
|
||||
.SECONDARY: package/appimage/VirtScreen-x86_64.AppImage
|
||||
|
||||
package/appimage/%.AppImage:
|
||||
$(DOCKER_RUN) package/appimage/build.sh
|
||||
|
@ -38,21 +39,20 @@ package/appimage/%.AppImage:
|
|||
appimage-clean:
|
||||
-rm -rf package/appimage/virtscreen.AppDir package/appimage/VirtScreen-x86_64.AppImage
|
||||
|
||||
# For Debian packaging, https://www.debian.org/doc/manuals/debmake-doc/ch08.en.html#setup-py
|
||||
# For Debian packaging, https://www.debian.org/doc/manuals/maint-guide/index.en.html
|
||||
# https://www.debian.org/doc/manuals/debmake-doc/ch08.en.html#setup-py
|
||||
.PHONY: deb-contents deb-clean
|
||||
|
||||
package/debian/%.deb:
|
||||
$(DOCKER_RUN) package/debian/debmake.sh
|
||||
$(DOCKER_RUN) package/debian/copy_debian.sh
|
||||
$(DOCKER_RUN) package/debian/debuild.sh
|
||||
$(DOCKER_RUN) chown -R $(shell id -u):$(shell id -u) package/debian/build
|
||||
cp package/debian/build/virtscreen*.deb package/debian
|
||||
package/debian/%.deb: package/appimage/VirtScreen-x86_64.AppImage
|
||||
$(DOCKER_RUN) package/debian/build.sh
|
||||
$(DOCKER_RUN) chown -R $(shell id -u):$(shell id -u) package/debian
|
||||
|
||||
deb-contents:
|
||||
$(DOCKER_RUN) dpkg -c package/debian/*.deb
|
||||
|
||||
deb-clean:
|
||||
rm -rf package/debian/build package/debian/*.deb
|
||||
rm -rf package/debian/build package/debian/*.deb package/debian/*.buildinfo \
|
||||
package/debian/*.changes
|
||||
|
||||
# For AUR: https://wiki.archlinux.org/index.php/Python_package_guidelines
|
||||
# and: https://wiki.archlinux.org/index.php/Creating_packages
|
||||
|
@ -95,7 +95,7 @@ override-version:
|
|||
package/archlinux/PKGBUILD
|
||||
# Debian
|
||||
perl -pi -e "s/PKGVER=\d+\.\d+\.\d+/PKGVER=$(VERSION)/" \
|
||||
package/debian/_common.sh
|
||||
package/debian/build.sh
|
||||
|
||||
# Clean packages
|
||||
clean: appimage-clean arch-clean deb-clean wheel-clean
|
||||
|
|
|
@ -1,13 +0,0 @@
|
|||
#!/bin/sh
|
||||
# This script is only for isolated miniconda environment
|
||||
# Used in Debian & AppImage package
|
||||
ENV=/usr/share/virtscreen/env
|
||||
|
||||
export PYTHONPATH=$ENV/lib/python3.6
|
||||
export LD_LIBRARY_PATH=$ENV/lib
|
||||
export QT_PLUGIN_PATH=$ENV/lib/python3.6/site-packages/PyQt5/Qt/plugins
|
||||
export QML2_IMPORT_PATH=$ENV/lib/python3.6/site-packages/PyQt5/Qt/qml
|
||||
# export QT_QPA_FONTDIR=/usr/share/fonts
|
||||
# export QT_XKB_CONFIG_ROOT=/usr/share/X11/xkb
|
||||
|
||||
$ENV/bin/python3 $ENV/bin/virtscreen
|
|
@ -4,7 +4,6 @@
|
|||
SCRIPTDIR=$(dirname $0)
|
||||
ENV=$SCRIPTDIR/usr/share/virtscreen/env
|
||||
|
||||
echo $SCRIPTDIR
|
||||
export PYTHONPATH=$ENV/lib/python3.6
|
||||
export LD_LIBRARY_PATH=$ENV/lib
|
||||
export QT_PLUGIN_PATH=$ENV/lib/python3.6/site-packages/PyQt5/Qt/plugins
|
||||
|
|
3
package/debian/.gitignore
vendored
Normal file
3
package/debian/.gitignore
vendored
Normal file
|
@ -0,0 +1,3 @@
|
|||
*.deb
|
||||
*.buildinfo
|
||||
*.changes
|
|
@ -5,21 +5,9 @@ all:
|
|||
|
||||
SHELL = /bin/bash
|
||||
install:
|
||||
# Create virtualenv
|
||||
install -d $(DESTDIR)$(prefix)/share/virtscreen
|
||||
source $(HOME)/miniconda/bin/activate && \
|
||||
conda create -y --copy --prefix $(DESTDIR)$(prefix)/share/virtscreen/env python=3.6
|
||||
# Install VirtScreen using pip
|
||||
source $(HOME)/miniconda/bin/activate && \
|
||||
source activate $(DESTDIR)$(prefix)/share/virtscreen/env && \
|
||||
pip install .
|
||||
# Fix hashbang and move executable
|
||||
sed -i "1s:.*:#!$(prefix)/share/virtscreen/env/bin/python3:" \
|
||||
$(DESTDIR)$(prefix)/share/virtscreen/env/bin/virtscreen
|
||||
install -D launch_env.sh \
|
||||
mkdir -p $(DESTDIR)$(prefix)/bin
|
||||
install -m 755 VirtScreen-x86_64.AppImage \
|
||||
$(DESTDIR)$(prefix)/bin/virtscreen
|
||||
# Delete unnecessary installed files done by setup.py
|
||||
rm -rf $(DESTDIR)$(prefix)/share/virtscreen/env/lib/python3.6/site-packages/usr
|
||||
# Copy desktop entry and icon
|
||||
install -m 644 -D virtscreen.desktop \
|
||||
$(DESTDIR)$(prefix)/share/applications/virtscreen.desktop
|
||||
|
|
|
@ -1,7 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
PKGVER=0.2.4
|
||||
# Required for debmake
|
||||
DEBEMAIL="k.bumsik@gmail.com"
|
||||
DEBFULLNAME="Bumsik Kim"
|
||||
export PKGVER DEBEMAIL DEBFULLNAME
|
46
package/debian/build.sh
Executable file
46
package/debian/build.sh
Executable file
|
@ -0,0 +1,46 @@
|
|||
#!/bin/bash
|
||||
|
||||
PKGVER=0.2.4
|
||||
# Required for debmake
|
||||
DEBEMAIL="k.bumsik@gmail.com"
|
||||
DEBFULLNAME="Bumsik Kim"
|
||||
export PKGVER DEBEMAIL DEBFULLNAME
|
||||
|
||||
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||
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/package/debian/Makefile \
|
||||
$ROOT/package/debian/virtscreen-$PKGVER/Makefile
|
||||
cd $ROOT/package/debian/virtscreen-$PKGVER
|
||||
debmake -b':sh'
|
||||
|
||||
# copy files to build
|
||||
# debmake files
|
||||
mkdir -p $ROOT/package/debian/build
|
||||
cp -R $ROOT/package/debian/virtscreen-$PKGVER/debian \
|
||||
$ROOT/package/debian/build/debian
|
||||
cp $ROOT/package/debian/Makefile \
|
||||
$ROOT/package/debian/build/
|
||||
cp $ROOT/package/debian/{control,README.Debian} \
|
||||
$ROOT/package/debian/build/debian/
|
||||
# binary and data files
|
||||
cp $ROOT/package/appimage/VirtScreen-x86_64.AppImage \
|
||||
$ROOT/package/debian/build/
|
||||
cp $ROOT/virtscreen.desktop \
|
||||
$ROOT/package/debian/build/
|
||||
cp -R $ROOT/data \
|
||||
$ROOT/package/debian/build/
|
||||
|
||||
# Build .deb package
|
||||
cd $ROOT/package/debian/build
|
||||
dpkg-buildpackage -b
|
||||
|
||||
# cleanup
|
||||
rm -rf $ROOT/package/debian/virtscreen-$PKGVER \
|
||||
$ROOT/package/debian/*.tar.gz
|
|
@ -1,6 +0,0 @@
|
|||
#!/bin/bash
|
||||
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||
source $DIR/_common.sh
|
||||
|
||||
cp -f $DIR/control $DIR/build/virtscreen-$PKGVER/debian/
|
||||
cp -f $DIR/README.Debian $DIR/build/virtscreen-$PKGVER/debian/
|
|
@ -1,15 +0,0 @@
|
|||
#!/bin/bash
|
||||
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||
source $DIR/_common.sh
|
||||
|
||||
mkdir -p package/debian/build
|
||||
cd package/debian/build
|
||||
# Download, rename, and copy files
|
||||
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
|
||||
cd virtscreen-$PKGVER
|
||||
cp -f ../../Makefile Makefile
|
||||
# call debmake
|
||||
debmake -b':sh'
|
|
@ -1,7 +0,0 @@
|
|||
#!/bin/bash
|
||||
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||
source $DIR/_common.sh
|
||||
|
||||
cd package/debian/build
|
||||
cd virtscreen-$PKGVER
|
||||
dpkg-buildpackage -b
|
Loading…
Reference in a new issue