diff options
| author | Konstantinos Sideris <sideris.konstantin@gmail.com> | 2017-12-31 13:19:32 +0200 |
|---|---|---|
| committer | Konstantinos Sideris <sideris.konstantin@gmail.com> | 2017-12-31 13:19:32 +0200 |
| commit | 1a3369877e940447a75ec1ec1f42776dce283f37 (patch) | |
| tree | 57c130df989a9e6144e612a565e6a240e1cad449 /Makefile | |
| parent | matrix-structs: Fix historical user ID decoding (diff) | |
| download | nheko-1a3369877e940447a75ec1ec1f42776dce283f37.tar.xz | |
Update travis
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 29 |
1 files changed, 9 insertions, 20 deletions
diff --git a/Makefile b/Makefile index 424f39ac..72476699 100644 --- a/Makefile +++ b/Makefile @@ -11,44 +11,33 @@ release: @cmake -H. -Bbuild -DCMAKE_BUILD_TYPE=RelWithDebInfo @cmake --build build -linux-appimage: - @./.ci/linux/deploy.sh - linux-install: cp -f nheko*.AppImage ~/.local/bin -macos-app: release - @./.ci/macos/deploy.sh - macos-app-install: cp -Rf build/nheko.app /Applications -run: - @./build/nheko - lint: - @./.ci/format.sh + ./.ci/format.sh image: docker build -t nheko-app-image . -docker-app-image: image - docker run \ - -e CXX=g++-7 \ - -e CC=gcc-7 \ - -v `pwd`:/build nheko-app-image make release - docker run \ - --privileged \ - -v `pwd`:/build nheko-app-image make linux-appimage +linux-deploy: + ./.ci/linux/deploy.sh + ./.ci/linux/create-packages.sh + +macos-deploy: + ./.ci/macos/deploy.sh -docker-packages: image +docker-app-image: image docker run \ -e CXX=g++-7 \ -e CC=gcc-7 \ -v `pwd`:/build nheko-app-image make release docker run \ --privileged \ - -v `pwd`:/build nheko-app-image ./.ci/linux/create-packages.sh + -v `pwd`:/build nheko-app-image make linux-deploy clean: rm -rf build |