smallsolar
/
kiwix-build
mirror of https://github.com/kiwix/kiwix-build.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[WIP] Build and publish a dev version of kiwix-desktop.

This commit is contained in:
Matthieu Gautier 2019-09-11 10:39:30 +02:00 committed by luddens
parent b68236526d
commit 8f19944ea1
5 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
appveyor.yml
View File

@ -12,7 +12,6 @@ environment:
KIWIX_DESKTOP_VERSION: '2.0.1-1' KIWIX_DESKTOP_VERSION: '2.0.1-1'
KIWIX_DESKTOP_RELEASE: 0 KIWIX_DESKTOP_RELEASE: 0
init: init:
- cmd: | - cmd: |
echo %TEST_VAR% echo %TEST_VAR%
@ -21,6 +20,7 @@ init:
mkdir C:\extra\bin mkdir C:\extra\bin
install: install:
- set QTDIR=C:\Qt\5.14.1
- cmd: | - cmd: |
cd C:\projects cd C:\projects
REM Install meson REM Install meson

7
appveyor/deploy.sh
View File

@ -12,6 +12,13 @@ then
ci@download.kiwix.org:/data/download/nightly ci@download.kiwix.org:/data/download/nightly
fi fi
if [[ "$APPVEYOR_REPO_BRANCH" != "master" ]]
then
scp -vrp -i ${SSH_KEY} -o StrictHostKeyChecking=no \
${NIGHTLY_KIWIX_ARCHIVES_DIR} \
ci@download.kiwix.org:/data/tmp/ci/${APPVEYOR_REPO_BRANCH}
fi
if [[ "$APPVEYOR_REPO_TAG" = "true" ]] if [[ "$APPVEYOR_REPO_TAG" = "true" ]]
then then
RELEASE_ARCHIVES=$(find $RELEASE_KIWIX_ARCHIVES_DIR -type f) RELEASE_ARCHIVES=$(find $RELEASE_KIWIX_ARCHIVES_DIR -type f)

5
appveyor/install_kiwix-desktop.cmd
View File

@ -2,8 +2,11 @@ REM ========================================================
REM Install kiwix-desktop REM Install kiwix-desktop
git clone https://github.com/kiwix/kiwix-desktop || exit /b 1 git clone https://github.com/kiwix/kiwix-desktop || exit /b 1
cd kiwix-desktop cd kiwix-desktop
git checkout fullscreen-menu-windows
echo "Getting fix_desktop"
curl -fsSL -O http://public.kymeria.fr/KIWIX/windows/fix_desktop_makefile.py_ || exit /b 1
echo "Running qmake" echo "Running qmake"
C:\Qt\5.12\msvc2017_64\bin\qmake.exe "CONFIG+=static" || exit /b 1 C:\Qt\5.12\msvc2017_64\bin\qmake.exe "CONFIG+=static console" || exit /b 1
echo "Running fix_desktop" echo "Running fix_desktop"
C:\Python36\Python ..\appveyor\fix_desktop_makefile.py Makefile.Release || exit /b 1 C:\Python36\Python ..\appveyor\fix_desktop_makefile.py Makefile.Release || exit /b 1
echo "Running nmake" echo "Running nmake"

1
kiwixbuild/dependencies/kiwix_desktop.py
View File

@ -10,6 +10,7 @@ class KiwixDesktop(Dependency):
class Source(GitClone): class Source(GitClone):
git_remote = "https://github.com/kiwix/kiwix-desktop.git" git_remote = "https://github.com/kiwix/kiwix-desktop.git"
git_dir = "kiwix-desktop" git_dir = "kiwix-desktop"
# git_ref = "menu-icon"
class Builder(QMakeBuilder): class Builder(QMakeBuilder):
dependencies = ["qt", "qtwebengine", "kiwix-lib", "aria2", "kiwix-tools"] dependencies = ["qt", "qtwebengine", "kiwix-lib", "aria2", "kiwix-tools"]

2
scripts/create_kiwix-desktop_appImage.sh
View File

@ -20,7 +20,7 @@ mkdir -p $APPDIR/usr/{bin,lib,share} $APPDIR/usr/share/applications $APPDIR/usr/
cp $INSTALLDIR/bin/kiwix-desktop $APPDIR/usr/bin/ cp $INSTALLDIR/bin/kiwix-desktop $APPDIR/usr/bin/
cp $INSTALLDIR/$SYSTEMLIBDIR/*.so* $APPDIR/usr/lib cp $INSTALLDIR/$SYSTEMLIBDIR/*.so* $APPDIR/usr/lib
# Remove it as it break with linuxdeployqt (should we compile without it) ? # Remove it as it break with linuxdeployqt (should we compile without it) ?
rm $APPDIR/usr/lib/libmagic.so* # rm $APPDIR/usr/lib/libmagic.so*
# Copy nss lib (to not conflict with host's ones) # Copy nss lib (to not conflict with host's ones)
cp -a /usr/$SYSTEMLIBDIR/nss $APPDIR/usr/lib cp -a /usr/$SYSTEMLIBDIR/nss $APPDIR/usr/lib
cp -a /usr/$SYSTEMLIBDIR/libstdc++.so* $APPDIR/usr/lib cp -a /usr/$SYSTEMLIBDIR/libstdc++.so* $APPDIR/usr/lib