assets folder + emoji drawer #254
|
@ -26,6 +26,7 @@ pipeline:
|
||||||
- go mod vendor
|
- go mod vendor
|
||||||
- qtdeploy -ldflags "-X main.buildVer=$VERSION -X main.buildDate=$BUILDDATE" build linux
|
- qtdeploy -ldflags "-X main.buildVer=$VERSION -X main.buildDate=$BUILDDATE" build linux
|
||||||
- cp README.md deploy/linux
|
- cp README.md deploy/linux
|
||||||
|
- cp -R assets deploy/linux/
|
||||||
- export FILENAME=cwtch-linux-$BUILDDATE.tar.gz
|
- export FILENAME=cwtch-linux-$BUILDDATE.tar.gz
|
||||||
- cd deploy
|
- cd deploy
|
||||||
- mv linux cwtch
|
- mv linux cwtch
|
||||||
|
@ -56,7 +57,9 @@ pipeline:
|
||||||
- export BUILDDATE=`date +%G-%m-%d-%H-%M`
|
- export BUILDDATE=`date +%G-%m-%d-%H-%M`
|
||||||
- go mod vendor
|
- go mod vendor
|
||||||
- qtsetup generate android
|
- qtsetup generate android
|
||||||
|
- mv assets android/
|
||||||
- qtdeploy -ldflags "-X main.buildVer=$VERSION -X main.buildDate=$BUILDDATE" build android
|
- qtdeploy -ldflags "-X main.buildVer=$VERSION -X main.buildDate=$BUILDDATE" build android
|
||||||
|
- mv android/assets assets
|
||||||
- cd deploy
|
- cd deploy
|
||||||
- export FILENAME=cwtch-android-$BUILDDATE.apk
|
- export FILENAME=cwtch-android-$BUILDDATE.apk
|
||||||
- cp android/build-debug.apk $FILENAME
|
- cp android/build-debug.apk $FILENAME
|
||||||
|
@ -84,6 +87,7 @@ pipeline:
|
||||||
- go mod vendor
|
- go mod vendor
|
||||||
- qtdeploy -ldflags "-X main.buildVer=$VERSION -X main.buildDate=$BUILDDATE" build windows
|
- qtdeploy -ldflags "-X main.buildVer=$VERSION -X main.buildDate=$BUILDDATE" build windows
|
||||||
- cp README.md deploy/windows
|
- cp README.md deploy/windows
|
||||||
|
- cp -R assets deploy/windows/
|
||||||
- cp -r windows/* deploy/windows
|
- cp -r windows/* deploy/windows
|
||||||
- cd deploy
|
- cd deploy
|
||||||
- mv windows cwtch
|
- mv windows cwtch
|
||||||
|
|
57
Makefile
|
@ -1,19 +1,48 @@
|
||||||
.PHONY: linux android
|
.PHONY: all clean linux windows android
|
||||||
|
all: clean linux windows android
|
||||||
default: linux
|
default: linux
|
||||||
|
|
||||||
all: clean linux android
|
|
||||||
|
|
||||||
linux:
|
|
||||||
go mod download
|
|
||||||
qtdeploy build linux | pv
|
|
||||||
|
|
||||||
android:
|
|
||||||
go mod download
|
|
||||||
go mod vendor
|
|
||||||
qtdeploy -docker build android | pv
|
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -r vendor || true
|
rm -r vendor || true
|
||||||
find -iname "moc*" | xargs rm
|
find -type f -iname "moc*" | xargs rm
|
||||||
find -iname "rcc*" | xargs rm
|
find -iname "rcc*" | xargs rm
|
||||||
|
|
||||||
|
linux:
|
||||||
|
$(MAKE) linux_build || $(MAKE) linux_clean
|
||||||
|
|
||||||
|
windows:
|
||||||
|
$(MAKE) windows_build || $(MAKE) windows_clean
|
||||||
|
|
||||||
|
android:
|
||||||
|
$(MAKE) android_build || $(MAKE) android_clean
|
||||||
|
|
||||||
|
linux_build:
|
||||||
|
date
|
||||||
|
qtdeploy -qt_version "5.13.0" build linux 2>&1 | tee qtdeploy.log | pv
|
||||||
|
date
|
||||||
|
cp -R assets deploy/linux/
|
||||||
|
$(MAKE) linux_clean
|
||||||
|
|
||||||
|
linux_clean:
|
||||||
|
#ntd
|
||||||
|
|
||||||
|
windows_build:
|
||||||
|
date
|
||||||
|
qtdeploy -qt_version "5.13.0" build windows 2>&1 | tee qtdeploy.log | pv
|
||||||
|
date
|
||||||
|
cp -R assets deploy/windows/
|
||||||
|
$(MAKE) linux_clean
|
||||||
|
|
||||||
|
windows_clean:
|
||||||
|
#ntd
|
||||||
|
|
||||||
|
android_build:
|
||||||
|
mv assets android/
|
||||||
|
date
|
||||||
|
qtdeploy -docker build android 2>&1 | tee qtdeploy.log | pv
|
||||||
|
date
|
||||||
|
$(MAKE) android_clean
|
||||||
|
|
||||||
|
android_clean:
|
||||||
|
mv android/assets assets
|
||||||
|
|
||||||
|
|
Before Width: | Height: | Size: 860 B After Width: | Height: | Size: 860 B |
Before Width: | Height: | Size: 960 B After Width: | Height: | Size: 960 B |
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 1.0 KiB |
Before Width: | Height: | Size: 630 B After Width: | Height: | Size: 630 B |
Before Width: | Height: | Size: 624 B After Width: | Height: | Size: 624 B |
Before Width: | Height: | Size: 633 B After Width: | Height: | Size: 633 B |
Before Width: | Height: | Size: 630 B After Width: | Height: | Size: 630 B |
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 1.0 KiB |
Before Width: | Height: | Size: 894 B After Width: | Height: | Size: 894 B |
Before Width: | Height: | Size: 479 B After Width: | Height: | Size: 479 B |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 900 B After Width: | Height: | Size: 900 B |
Before Width: | Height: | Size: 691 B After Width: | Height: | Size: 691 B |
Before Width: | Height: | Size: 795 B After Width: | Height: | Size: 795 B |
Before Width: | Height: | Size: 890 B After Width: | Height: | Size: 890 B |
Before Width: | Height: | Size: 594 B After Width: | Height: | Size: 594 B |
Before Width: | Height: | Size: 635 B After Width: | Height: | Size: 635 B |
Before Width: | Height: | Size: 633 B After Width: | Height: | Size: 633 B |
Before Width: | Height: | Size: 633 B After Width: | Height: | Size: 633 B |
Before Width: | Height: | Size: 632 B After Width: | Height: | Size: 632 B |
Before Width: | Height: | Size: 993 B After Width: | Height: | Size: 993 B |
Before Width: | Height: | Size: 826 B After Width: | Height: | Size: 826 B |
Before Width: | Height: | Size: 745 B After Width: | Height: | Size: 745 B |
Before Width: | Height: | Size: 477 B After Width: | Height: | Size: 477 B |
Before Width: | Height: | Size: 702 B After Width: | Height: | Size: 702 B |
Before Width: | Height: | Size: 649 B After Width: | Height: | Size: 649 B |
Before Width: | Height: | Size: 673 B After Width: | Height: | Size: 673 B |
Before Width: | Height: | Size: 985 B After Width: | Height: | Size: 985 B |
Before Width: | Height: | Size: 607 B After Width: | Height: | Size: 607 B |
Before Width: | Height: | Size: 978 B After Width: | Height: | Size: 978 B |
Before Width: | Height: | Size: 763 B After Width: | Height: | Size: 763 B |
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 838 B After Width: | Height: | Size: 838 B |
Before Width: | Height: | Size: 833 B After Width: | Height: | Size: 833 B |
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 1.0 KiB |
Before Width: | Height: | Size: 764 B After Width: | Height: | Size: 764 B |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 617 B After Width: | Height: | Size: 617 B |
Before Width: | Height: | Size: 843 B After Width: | Height: | Size: 843 B |
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.4 KiB |
Before Width: | Height: | Size: 819 B After Width: | Height: | Size: 819 B |
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 913 B After Width: | Height: | Size: 913 B |
Before Width: | Height: | Size: 755 B After Width: | Height: | Size: 755 B |
Before Width: | Height: | Size: 1021 B After Width: | Height: | Size: 1021 B |
Before Width: | Height: | Size: 929 B After Width: | Height: | Size: 929 B |
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 917 B After Width: | Height: | Size: 917 B |
Before Width: | Height: | Size: 722 B After Width: | Height: | Size: 722 B |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 775 B After Width: | Height: | Size: 775 B |
Before Width: | Height: | Size: 829 B After Width: | Height: | Size: 829 B |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 549 B After Width: | Height: | Size: 549 B |
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 1.0 KiB |
Before Width: | Height: | Size: 994 B After Width: | Height: | Size: 994 B |
Before Width: | Height: | Size: 672 B After Width: | Height: | Size: 672 B |
Before Width: | Height: | Size: 552 B After Width: | Height: | Size: 552 B |
Before Width: | Height: | Size: 3.2 KiB After Width: | Height: | Size: 3.2 KiB |
Before Width: | Height: | Size: 786 B After Width: | Height: | Size: 786 B |
Before Width: | Height: | Size: 843 B After Width: | Height: | Size: 843 B |
Before Width: | Height: | Size: 970 B After Width: | Height: | Size: 970 B |
Before Width: | Height: | Size: 691 B After Width: | Height: | Size: 691 B |
Before Width: | Height: | Size: 967 B After Width: | Height: | Size: 967 B |
Before Width: | Height: | Size: 965 B After Width: | Height: | Size: 965 B |
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 1.0 KiB |
Before Width: | Height: | Size: 1007 B After Width: | Height: | Size: 1007 B |
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.6 KiB |
Before Width: | Height: | Size: 1015 B After Width: | Height: | Size: 1015 B |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.5 KiB |
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 1.0 KiB |
Before Width: | Height: | Size: 966 B After Width: | Height: | Size: 966 B |
Before Width: | Height: | Size: 787 B After Width: | Height: | Size: 787 B |
Before Width: | Height: | Size: 1020 B After Width: | Height: | Size: 1020 B |
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.4 KiB |
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.4 KiB |
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.4 KiB |
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.6 KiB |
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.6 KiB |
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 787 B After Width: | Height: | Size: 787 B |
Before Width: | Height: | Size: 735 B After Width: | Height: | Size: 735 B |
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 792 B After Width: | Height: | Size: 792 B |
Before Width: | Height: | Size: 778 B After Width: | Height: | Size: 778 B |
Before Width: | Height: | Size: 928 B After Width: | Height: | Size: 928 B |