mirror of
https://github.com/kbumsik/VirtScreen.git
synced 2025-02-12 11:21:53 +00:00
Remove versions in packages name
This commit is contained in:
parent
a3e65b8270
commit
4a2e7d0c54
7 changed files with 29 additions and 21 deletions
|
@ -16,16 +16,16 @@ before_deploy: |
|
|||
VERSION=$TRAVIS_TAG make override_version
|
||||
fi
|
||||
make package/pypi/*.whl
|
||||
make package/appimage/*.AppImage
|
||||
make package/debian/*.deb
|
||||
make package/appimage/VirtScreen.AppImage
|
||||
make package/debian/virtscreen.deb
|
||||
|
||||
deploy:
|
||||
- provider: releases
|
||||
api_key:
|
||||
secure: zFbsCIKcsvWU/Yc+9k294Qj8QY48VlkV8DSScP5gz6dQegeUSaSHI/YafherkFQ0B03bIY8yc7roMtDo7HAkEnPptjFhdUiOFI11+xDVb3s7Y8Ek2nV3znQzdtR4CR/94l3in6R3DH+eNA6+6Je/NIWLdVcvRX07RBSfBVdPmnsAyAD9KNTsl8Q4c20HgtLNxfWv2s5eCyD+heCTLYrErEZKZ5vYeeANmWomHvT2ED/4QerpBP8wkh59QXD1S79CF7oyq6X173ZJUQVxdBP+OSXt/mDBAoqf+TV6okawRZn48JluvCWAJ7BceX7t9emd1rVI/s8t3wCP+eMcmNn5g/6UJaCPnTJ5YplTuUWRc63UFSkE0AY8WYcRlrz+/OiXYgQ8LMXfN23aWgarHCbS2vHR3Afu9gpLCoKucr36hKhs3zfjJzVLFFW16mnbaTFcBzfDDRpkvOANB1aZwGVRFpTIWIMjkn0+lxWTC/moIJvQlfRPsC4dN5cDAilRQlguHzayebtGE8X0PuIe9A8bkET3V/y+KPnQiSJ7J+5PNoDSdqRAE4IKvVOLEyHtlqBVkvIHKnugUnWPIZ21gm5RemMEj9/YGa8Efwz7PIKtJJ3kFMGDYKVlIKyB+rg/TFWNdo6jjevnWM6y4SfVI3kFyjA+mp31o6nshrQy0zVQpd8=
|
||||
file:
|
||||
- package/debian/*.deb
|
||||
- package/appimage/*.AppImage
|
||||
- package/debian/virtscreen.deb
|
||||
- package/appimage/VirtScreen.AppImage
|
||||
skip_cleanup: true
|
||||
on:
|
||||
tags: true
|
||||
|
|
23
Makefile
23
Makefile
|
@ -6,10 +6,15 @@ DOCKER_NAME=kbumsik/virtscreen
|
|||
DOCKER_RUN=docker run --interactive --tty -v $(shell pwd):/app $(DOCKER_NAME)
|
||||
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
|
||||
|
||||
.ONESHELL:
|
||||
|
||||
.PHONY: run debug run-appimage debug-appimage
|
||||
|
||||
all: package/pypi/*.whl $(PKG_APPIMAGE) $(PKG_DEBIAN)
|
||||
|
||||
# Run script
|
||||
run:
|
||||
python3 -m virtscreen
|
||||
|
@ -17,10 +22,10 @@ run:
|
|||
debug:
|
||||
QT_DEBUG_PLUGINS=1 QML_IMPORT_TRACE=1 python3 -m virtscreen --log=DEBUG
|
||||
|
||||
run-appimage: package/appimage/VirtScreen-x86_64.AppImage
|
||||
run-appimage: $(PKG_APPIMAGE)
|
||||
$<
|
||||
|
||||
debug-appimage: package/appimage/VirtScreen-x86_64.AppImage
|
||||
debug-appimage: $(PKG_APPIMAGE)
|
||||
QT_DEBUG_PLUGINS=1 QML_IMPORT_TRACE=1 $< --log=DEBUG
|
||||
|
||||
# Docker tools
|
||||
|
@ -45,25 +50,27 @@ wheel-clean:
|
|||
|
||||
# For AppImage packaging, https://github.com/AppImage/AppImageKit/wiki/Creating-AppImages
|
||||
.PHONY: appimage-clean
|
||||
.SECONDARY: package/appimage/VirtScreen-x86_64.AppImage
|
||||
.SECONDARY: $(PKG_APPIMAGE)
|
||||
|
||||
package/appimage/VirtScreen-x86_64.AppImage:
|
||||
$(PKG_APPIMAGE):
|
||||
$(DOCKER_RUN) package/appimage/build.sh
|
||||
$(DOCKER_RUN) mv package/appimage/VirtScreen-x86_64.AppImage $@
|
||||
$(DOCKER_RUN) chown -R $(shell id -u):$(shell id -u) package/appimage
|
||||
|
||||
appimage-clean:
|
||||
-rm -rf package/appimage/virtscreen.AppDir package/appimage/VirtScreen-x86_64.AppImage
|
||||
-rm -rf package/appimage/virtscreen.AppDir $(PKG_APPIMAGE)
|
||||
|
||||
# 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: package/appimage/VirtScreen-x86_64.AppImage
|
||||
$(PKG_DEBIAN): $(PKG_APPIMAGE)
|
||||
$(DOCKER_RUN) package/debian/build.sh
|
||||
$(DOCKER_RUN) mv package/debian/*.deb $@
|
||||
$(DOCKER_RUN) chown -R $(shell id -u):$(shell id -u) package/debian
|
||||
|
||||
deb-contents:
|
||||
$(DOCKER_RUN) dpkg -c package/debian/*.deb
|
||||
deb-contents: $(PKG_DEBIAN)
|
||||
$(DOCKER_RUN) dpkg -c $<
|
||||
|
||||
deb-clean:
|
||||
rm -rf package/debian/build package/debian/*.deb package/debian/*.buildinfo \
|
||||
|
|
10
README.md
10
README.md
|
@ -38,7 +38,7 @@ VirtScreen is based on [PyQt5](https://www.riverbankcomputing.com/software/pyqt/
|
|||
|
||||
### CLI-only option
|
||||
|
||||
You can run VirtScreen with `virtscreen` (or `./VirtScreen-x86_64.AppImage` if you use the AppImage package) with additional arguments.
|
||||
You can run VirtScreen with `virtscreen` (or `./VirtScreen.AppImage` if you use the AppImage package) with additional arguments.
|
||||
|
||||
```bash
|
||||
usage: virtscreen [-h] [--auto] [--left] [--right] [--above] [--below]
|
||||
|
@ -83,10 +83,10 @@ virtscreen --below --portrait --hipdi # Below, portrait, HiDPI mode.
|
|||
Download a `.AppImage` package from [releases page](https://github.com/kbumsik/VirtScreen/releases). Then make it executable:
|
||||
|
||||
```shell
|
||||
chmod a+x VirtScreen-x86_64.AppImage
|
||||
chmod a+x VirtScreen.AppImage
|
||||
```
|
||||
|
||||
Then you can run it by double click the file or `./VirtScreen-x86_64.AppImage` in terminal.
|
||||
Then you can run it by double click the file or `./VirtScreen.AppImage` in terminal.
|
||||
|
||||
### Debian (Ubuntu)
|
||||
|
||||
|
@ -95,8 +95,8 @@ Download a `.deb` package from [releases page](https://github.com/kbumsik/VirtSc
|
|||
```shell
|
||||
sudo apt-get update
|
||||
sudo apt-get install x11vnc
|
||||
sudo dpkg -i virtscreen_0.2.4-1_all.deb
|
||||
rm virtscreen_0.2.4-1_all.deb
|
||||
sudo dpkg -i virtscreen.deb
|
||||
rm virtscreen.deb
|
||||
```
|
||||
|
||||
### Arch Linux (AUR)
|
||||
|
|
4
package/appimage/.gitignore
vendored
4
package/appimage/.gitignore
vendored
|
@ -1,2 +1,2 @@
|
|||
VirtScreen-x86_64.AppImage
|
||||
virtscreen.AppDir
|
||||
*.AppImage
|
||||
*.AppDir
|
||||
|
|
|
@ -6,7 +6,7 @@ all:
|
|||
SHELL = /bin/bash
|
||||
install:
|
||||
mkdir -p $(DESTDIR)$(prefix)/bin
|
||||
install -m 755 VirtScreen-x86_64.AppImage \
|
||||
install -m 755 VirtScreen.AppImage \
|
||||
$(DESTDIR)$(prefix)/bin/virtscreen
|
||||
# Copy desktop entry and icon
|
||||
install -m 644 -D virtscreen.desktop \
|
||||
|
|
|
@ -30,7 +30,7 @@ cp $ROOT/package/debian/Makefile \
|
|||
cp $ROOT/package/debian/{control,README.Debian} \
|
||||
$ROOT/package/debian/build/debian/
|
||||
# binary and data files
|
||||
cp $ROOT/package/appimage/VirtScreen-x86_64.AppImage \
|
||||
cp $ROOT/package/appimage/VirtScreen.AppImage \
|
||||
$ROOT/package/debian/build/
|
||||
cp $ROOT/virtscreen.desktop \
|
||||
$ROOT/package/debian/build/
|
||||
|
|
1
package/pypi/.gitignore
vendored
1
package/pypi/.gitignore
vendored
|
@ -1 +1,2 @@
|
|||
virtscreen*.whl
|
||||
*.tar.gz
|
||||
|
|
Loading…
Reference in a new issue