forks
/
tg2sip
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feature/appimage' of https://github.com/Infactum/tg2sip into feature/appimage

This commit is contained in:
infactum 2019-03-01 23:54:04 +05:00
parent e21fd4da62 b3d7b9859d
commit ce25cf6665
5 changed files with 33 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
appveyor.yml
View File

@ -37,7 +37,7 @@ install:
build_script: build_script:
- sh: >- - sh: >-
if [ "$target_name" = "AppImage" ] ; then exit 0; fi ; if [ "$target_name" != "AppImage" ] ; then
mkdir build; mkdir build;
docker run --rm -v "$(pwd)":/src "$docker_image":"$docker_tag" /bin/bash -c " docker run --rm -v "$(pwd)":/src "$docker_image":"$docker_tag" /bin/bash -c "
mkdir build && cd build; mkdir build && cd build;
@ -48,9 +48,10 @@ build_script:
cp tg2sip /src/build; cp tg2sip /src/build;
cp gen_db /src/build;" cp gen_db /src/build;"
7z a tg2sip.zip ./build/tg2sip ./build/gen_db ./settings.ini; 7z a tg2sip.zip ./build/tg2sip ./build/gen_db ./settings.ini;
fi;
- sh: >- - sh: >-
if [ "$target_name" != "AppImage" ] ; then exit 0; fi ; if [ "$target_name" = "AppImage" ] ; then
mkdir build; mkdir build;
docker run --rm -v "$(pwd)":/src "$docker_image":"$docker_tag" /bin/bash -c " docker run --rm -v "$(pwd)":/src "$docker_image":"$docker_tag" /bin/bash -c "
mkdir build && cd build; mkdir build && cd build;
@ -59,16 +60,18 @@ build_script:
chmod +x tg2sip; chmod +x tg2sip;
chmod +x gen_db; chmod +x gen_db;
linuxdeploy --appdir /src/build/tg2sip -e tg2sip; linuxdeploy --appdir /src/build/tg2sip -e tg2sip;
linuxdeploy --appdir /src/build/tg2sip -e gen_db;" linuxdeploy --appdir /src/build/gen_db -e gen_db;"
wget https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage -O appimagetool.AppImage; wget https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage -O appimagetool.AppImage;
chmod +x appimagetool.AppImage; chmod +x appimagetool.AppImage;
wget https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage -O chmod +x linuxdeploy.AppImage; wget https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage -O linuxdeploy.AppImage;
chmod +x linuxdeploy.AppImage; chmod +x linuxdeploy.AppImage;
./linuxdeploy.AppImage --appdir ./build/tg2sip -d ./buildenv/app.desktop -i ./buildenv/icon.svg; sudo chown -R "$(id -u)":"$(id -g)" ./build;
./linuxdeploy.AppImage --appdir ./build/gen_db -d ./buildenv/app.desktop -i ./buildenv/icon.svg; ./linuxdeploy.AppImage --appdir ./build/tg2sip -d ./buildenv/tg2sip.desktop -i ./buildenv/icon.svg;
./appimagetool.AppImage tg2sip; ./linuxdeploy.AppImage --appdir ./build/gen_db -d ./buildenv/gen_db.desktop -i ./buildenv/icon.svg;
./appimagetool.AppImage gen_db; ./appimagetool.AppImage ./build/tg2sip;
7z a tg2sip.zip ./build/tg2sip-x86_64.AppImage ./build/gen_db-x86_64.AppImage ./settings.ini; ./appimagetool.AppImage ./build/gen_db;
7z a tg2sip.zip ./tg2sip-x86_64.AppImage ./gen_db-x86_64.AppImage ./settings.ini;
fi;
after_build: after_build:
- sh: docker push "$docker_image":"$docker_tag" - sh: docker push "$docker_image":"$docker_tag"

7
buildenv/Dockerfile.centos6
View File

@ -5,14 +5,15 @@ RUN yum -y install centos-release-scl yum-utils \
&& yum-config-manager --enable rhel-server-rhscl-7-rpms \ && yum-config-manager --enable rhel-server-rhscl-7-rpms \
&& yum install -y devtoolset-7-gcc devtoolset-7-gcc-c++ && yum install -y devtoolset-7-gcc devtoolset-7-gcc-c++
RUN yum install -y \ RUN set -xe \
&& yum install -y \
make \ make \
git wget \ git wget \
zlib-devel openssl-devel gperf \ zlib-devel openssl-devel gperf \
pkgconfig ccache gperf unzip \ pkgconfig ccache gperf unzip \
libpng-devel libjpeg-devel patchelf \ libpng-devel libjpeg-devel \
epel-release \ epel-release \
&& yum install -y opus-devel && yum install -y opus-devel patchelf
RUN wget https://cmake.org/files/v3.9/cmake-3.9.6-Linux-x86_64.sh \ RUN wget https://cmake.org/files/v3.9/cmake-3.9.6-Linux-x86_64.sh \
&& sh cmake-3.9.6-Linux-x86_64.sh --prefix=/usr --exclude-subdir && sh cmake-3.9.6-Linux-x86_64.sh --prefix=/usr --exclude-subdir

7
buildenv/app.desktop
View File

@ -1,7 +0,0 @@
[Desktop Entry]
Name=
Exec=
Terminal=true
Type=Application
Icon=icon
Categories=AudioVideo;

8
buildenv/gen_db.desktop Normal file
View File

@ -0,0 +1,8 @@
[Desktop Entry]
Name=gen_db
Exec=gen_db
Comment=TG2SIP DB generator
Terminal=true
Type=Application
Icon=icon
Categories=AudioVideo;

8
buildenv/tg2sip.desktop Normal file
View File

@ -0,0 +1,8 @@
[Desktop Entry]
Name=tg2sip
Exec=tg2sip
Comment=TG2SIP Voice Gateway
Terminal=true
Type=Application
Icon=icon
Categories=AudioVideo;