diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index fe974d85..00000000 --- a/appveyor.yml +++ /dev/null @@ -1,69 +0,0 @@ -image: Visual Studio 2019 -version: '0.1.{build}' -environment: - EXTRA_DIR: 'C:\extra' - MINGW64_EXTRA_DIR: '/c/extra' - PATH: 'C:\\Python312\\Scripts;%PATH%;%EXTRA_DIR%\bin;C:\\Program Files (x86)\\Windows Kits\\10\\bin\\%platform%' - PKG_CONFIG_PATH: '%EXTRA_DIR%\lib\pkgconfig' - MSYS2_PATH_TYPE: 'inherit' - MSYS2_ARG_CONV_EXCL: '-Tp' - MINGW64_RUN: 'C:\msys64\usr\bin\bash.exe --login -c' - MSYSTEM: 'MINGW64' - KIWIX_DESKTOP_VERSION: '2.3.1-3' - KIWIX_DESKTOP_RELEASE: 0 - - -init: - - cmd: | - echo %TEST_VAR% - REM Set VC 2019 - "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat" - mkdir C:\extra\bin - -install: - - cmd: | - cd C:\projects - REM Install meson - C:\Python312\Scripts\pip install meson - - REM Install ninja - curl -o ninja-win.zip -L https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-win.zip - 7z e ninja-win.zip -o%EXTRA_DIR%\bin - - REM Install pkg-config-lite - curl -o pkg-config-lite-0.28-1.zip -L https://deac-fra.dl.sourceforge.net/project/pkgconfiglite/0.28-1/pkg-config-lite-0.28-1_bin-win32.zip - 7z e pkg-config-lite-0.28-1.zip -o%EXTRA_DIR%\bin pkg-config-lite-0.28-1/bin/pkg-config.exe - cd kiwix-build - - REM Install openssh (scp) for deployement - choco install openssh openssl.light - - - cmd: openssl enc -d -aes-256-cbc -md sha256 -pass pass:%ENC_PASSWD% -in appveyor\nightlybot_id_key.enc -out appveyor\nightlybot_id_key - - - -build_script: - - IF "%USE_CACHE%" EQU "1" appveyor\setup_from_cache.cmd - - IF "%USE_CACHE%" NEQ "1" appveyor\install_zlib.cmd - - IF "%USE_CACHE%" NEQ "1" appveyor\install_lzma.cmd - - IF "%USE_CACHE%" NEQ "1" appveyor\install_zstd.cmd - - IF "%USE_CACHE%" NEQ "1" appveyor\install_libcurl.cmd - - IF "%USE_CACHE%" NEQ "1" appveyor\install_pthread.cmd - - IF "%USE_CACHE%" NEQ "1" appveyor\install_dirent.cmd - - IF "%USE_CACHE%" NEQ "1" appveyor\install_xapian.cmd - - IF "%USE_CACHE%" NEQ "1" appveyor\install_icu.cmd - - IF "%USE_CACHE%" NEQ "1" appveyor\install_pugixml.cmd - - IF "%USE_CACHE%" NEQ "1" appveyor\install_aria2.cmd - - IF "%USE_CACHE%" NEQ "1" appveyor\install_mustache.cmd - - IF "%USE_CACHE%" NEQ "1" appveyor\install_libmicrohttpd.cmd - - IF "%USE_CACHE%" NEQ "1" %MINGW64_RUN% "cd /c/projects/kiwix-build && appveyor/create_cache.sh" - - appveyor\install_libzim.cmd - - appveyor\install_libkiwix.cmd - - appveyor\install_kiwix-desktop.cmd - -before_deploy: - - cmd: openssl enc -d -pbkdf2 -aes-256-cbc -md sha256 -pass pass:%win_certificate_secret% -in appveyor\kiwix.pfx.enc -out appveyor\kiwix.pfx - - cmd: '%MINGW64_RUN% "cd /c/projects/kiwix-build && appveyor/package_kiwix-desktop.sh"' - -deploy_script: - - cmd: '%MINGW64_RUN% "cd /c/projects/kiwix-build && appveyor/deploy.sh"' diff --git a/appveyor/build_xapian.sh b/appveyor/build_xapian.sh deleted file mode 100644 index 9d4ad577..00000000 --- a/appveyor/build_xapian.sh +++ /dev/null @@ -1,16 +0,0 @@ - -XAPIAN_SOURCE=$(pwd)/.. - -$XAPIAN_SOURCE/configure \ - CC="cl -nologo" \ - CXX="$XAPIAN_SOURCE/compile cl -nologo" \ - CXXFLAGS="-EHsc -MD" AR=lib \ - CPPFLAGS="-I${MINGW64_EXTRA_DIR}/include" \ - LDFLAGS="-L${MINGW64_EXTRA_DIR}/lib" \ - --disable-backend-remote \ - --disable-documentation \ - --prefix=${MINGW64_EXTRA_DIR} - -make -j2 - -make install diff --git a/appveyor/create_cache.sh b/appveyor/create_cache.sh deleted file mode 100644 index 9c1c1339..00000000 --- a/appveyor/create_cache.sh +++ /dev/null @@ -1,11 +0,0 @@ - -set -e - -ARCHIVE_NAME="deps_windows_windows.zip" -SSH_KEY=C:\\projects\\kiwix-build\\appveyor\\nightlybot_id_key - -7z a -tzip $ARCHIVE_NAME $MINGW64_EXTRA_DIR -scp -P 30022 -vrp -i ${SSH_KEY} -o StrictHostKeyChecking=no \ - ${ARCHIVE_NAME} \ - ci@tmp.kiwix.org:/data/tmp/ci - diff --git a/appveyor/deploy.sh b/appveyor/deploy.sh deleted file mode 100755 index a8a9a64e..00000000 --- a/appveyor/deploy.sh +++ /dev/null @@ -1,21 +0,0 @@ -set -e - -NIGHTLY_DATE=$(date +%Y-%m-%d) -NIGHTLY_KIWIX_ARCHIVES_DIR=/c/projects/NIGHTLY_KIWIX_ARCHIVES/${NIGHTLY_DATE} -RELEASE_KIWIX_ARCHIVES_DIR=/c/projects/RELEASE_KIWIX_ARCHIVES -SSH_KEY=C:\\projects\\kiwix-build\\appveyor\\nightlybot_id_key - -if [[ "$APPVEYOR_SCHEDULED_BUILD" = "True" ]] -then - scp -P 30022 -vrp -i ${SSH_KEY} -o StrictHostKeyChecking=no \ - ${NIGHTLY_KIWIX_ARCHIVES_DIR} \ - ci@master.download.kiwix.org:/data/download/nightly -fi - -if [[ "$APPVEYOR_REPO_TAG" = "true" ]] -then - RELEASE_ARCHIVES=$(find $RELEASE_KIWIX_ARCHIVES_DIR -type f) - scp -P 30022 -vrp -i ${SSH_KEY} -o StrictHostKeyChecking=no \ - ${RELEASE_ARCHIVES} \ - ci@master.download.kiwix.org:/data/download/release/kiwix-desktop -fi diff --git a/appveyor/fix_desktop_makefile.py b/appveyor/fix_desktop_makefile.py deleted file mode 100644 index 509abbd0..00000000 --- a/appveyor/fix_desktop_makefile.py +++ /dev/null @@ -1,29 +0,0 @@ -import re, sys, os - -makefile = sys.argv[-1] -print("Patching '{}'".format(makefile)) - -with open(makefile, 'r') as f: - lines = f.readlines() - -with open(makefile, 'w') as f: - for line in lines: -# if "/SUBSYSTEM:WINDOWS" in line: -# line = line.replace("/SUBSYSTEM:WINDOWS", "/SUBSYSTEM:CONSOLE") -# f.write(line) -# continue - if not line.startswith('LIBS '): - f.write(line) - continue - print("-- INPUT : {}".format(line)) - for lib in ('kiwix', 'zim', 'pugixml', 'z', 'zstd'): - line = line.replace('{}.lib'.format(lib), 'lib{}.a'.format(lib)) - for lib in ('lzma', 'curl'): - line = line.replace('lib{}.lib'.format(lib), 'lib{}.a'.format(lib)) - line = line.strip() -# line += " pthreadVC2.lib" -# line += " icuin.lib icudt.lib icuuc.lib" - line += " Rpcrt4.lib Ws2_32.lib winmm.lib Shlwapi.lib" - line += os.linesep - print("++ OUTPUT : {}".format(line)) - f.write(line) diff --git a/appveyor/install_aria2.cmd b/appveyor/install_aria2.cmd deleted file mode 100644 index 8517c1ca..00000000 --- a/appveyor/install_aria2.cmd +++ /dev/null @@ -1,4 +0,0 @@ -REM ======================================================== -REM Install aria2 -curl -fsSL -O https://github.com/aria2/aria2/releases/download/release-1.36.0/aria2-1.36.0-win-64bit-build1.zip || exit /b 1 -7z e aria2-1.36.0-win-64bit-build1.zip -o%EXTRA_DIR% aria2-1.36.0-win-64bit-build1\aria2c.exe || exit /b 1 diff --git a/appveyor/install_dirent.cmd b/appveyor/install_dirent.cmd deleted file mode 100644 index ed5b17e0..00000000 --- a/appveyor/install_dirent.cmd +++ /dev/null @@ -1,3 +0,0 @@ -REM ======================================================== -REM Install dirent.h -curl -fsSL -o%EXTRA_DIR%\include\dirent.h https://raw.githubusercontent.com/tronkko/dirent/master/include/dirent.h || exit /b 1 diff --git a/appveyor/install_git_ninja_pkgconfig.cmd b/appveyor/install_git_ninja_pkgconfig.cmd deleted file mode 100644 index ecaf7028..00000000 --- a/appveyor/install_git_ninja_pkgconfig.cmd +++ /dev/null @@ -1,14 +0,0 @@ -REM Set VC 2017 -"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat" -mkdir C:\extra\bin -cd C:\projects -C:\Python36\Scripts\pip install meson || exit /b 1 - -REM Set ninja -curl -fsSL -o ninja-win.zip https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-win.zip || exit /b 1 -7z e ninja-win.zip -o%EXTRA_DIR%\bin || exit /b 1 - -REM Set pkg-config-lit -curl --insecure -fsSL -o pkg-config-lite-0.28-1.zip https://netix.dl.sourceforge.net/project/pkgconfiglite/0.28-1/pkg-config-lite-0.28-1_bin-win32.zip || exit /b 1 -7z e pkg-config-lite-0.28-1.zip -o%EXTRA_DIR%\bin pkg-config-lite-0.28-1/bin/pkg-config.exe || exit /b 1 -cd kiwix-build diff --git a/appveyor/install_icu.cmd b/appveyor/install_icu.cmd deleted file mode 100644 index e681e55d..00000000 --- a/appveyor/install_icu.cmd +++ /dev/null @@ -1,7 +0,0 @@ -REM ======================================================== -REM Install icu -curl -SL -O http://public.kymeria.fr/KIWIX/windows/icu4c-62_1-Win64-MSVC2017.zip || exit /b 1 -7z x icu4c-62_1-Win64-MSVC2017.zip -o%EXTRA_DIR% -r include || exit /b 1 -7z e icu4c-62_1-Win64-MSVC2017.zip -o%EXTRA_DIR%\lib lib64\* || exit /b 1 -7z e icu4c-62_1-Win64-MSVC2017.zip -o%EXTRA_DIR%\bin bin64\*.dll || exit /b 1 -curl -fsSL -o%PKG_CONFIG_PATH%\icu-i18n.pc http://public.kymeria.fr/KIWIX/windows/icu-i18n.pc || exit /b 1 diff --git a/appveyor/install_kiwix-desktop.cmd b/appveyor/install_kiwix-desktop.cmd deleted file mode 100644 index 4a331f9a..00000000 --- a/appveyor/install_kiwix-desktop.cmd +++ /dev/null @@ -1,22 +0,0 @@ -REM ======================================================== -REM Install kiwix-desktop -git clone https://github.com/kiwix/kiwix-desktop || exit /b 1 -cd kiwix-desktop -echo "Running qmake" -SET _WITH_CONSOLE=1 -IF %KIWIX_DESKTOP_RELEASE% EQU 1 ( - IF %APPVEYOR_REPO_TAG% == true ( - SET _WITH_CONSOLE=0 - ) -) -IF %_WITH_CONSOLE% EQU 1 ( - C:\Qt\5.15\msvc2019_64\bin\qmake.exe "CONFIG+=static console" || exit /b 1 -) else ( - C:\Qt\5.15\msvc2019_64\bin\qmake.exe "CONFIG+=static" || exit /b 1 -) - -echo "Running fix_desktop" -C:\Python312\Python ..\appveyor\fix_desktop_makefile.py Makefile.Release || exit /b 1 -echo "Running nmake" -nmake || exit /b 1 -cd .. diff --git a/appveyor/install_libcurl.cmd b/appveyor/install_libcurl.cmd deleted file mode 100644 index 91f88545..00000000 --- a/appveyor/install_libcurl.cmd +++ /dev/null @@ -1,14 +0,0 @@ -REM ======================================================== -REM Install libcurl -curl -fsSL -O https://curl.haxx.se/download/curl-7.61.1.zip || exit /b 1 -7z x curl-7.61.1.zip || exit /b 1 -cd curl-7.61.1\winbuild -nmake /f Makefile.vc mode=static MACHINE=x64 DEBUG=no VC=15 ENABLE_IDN=no || exit /b 1 -mkdir %EXTRA_DIR%\include\curl -copy ..\builds\libcurl-vc15-x64-release-static-ipv6-sspi-winssl\include\curl\*.h %EXTRA_DIR%\include\curl -copy ..\builds\libcurl-vc15-x64-release-static-ipv6-sspi-winssl\lib\libcurl_a.lib %EXTRA_DIR%\lib -move %EXTRA_DIR%\lib\libcurl_a.lib %EXTRA_DIR%\lib\libcurl.a -dir %EXTRA_DIR%\include\curl -dir %EXTRA_DIR%\lib -curl -fsSl -o%PKG_CONFIG_PATH%\libcurl.pc http://public.kymeria.fr/KIWIX/windows/libcurl.pc || exit /b 1 -cd ..\.. diff --git a/appveyor/install_libkiwix.cmd b/appveyor/install_libkiwix.cmd deleted file mode 100644 index dc357e7c..00000000 --- a/appveyor/install_libkiwix.cmd +++ /dev/null @@ -1,10 +0,0 @@ -REM ======================================================== -REM Install libkiwix -git clone https://github.com/kiwix/libkiwix.git || exit /b 1 -cd libkiwix -set CPPFLAGS="-I%EXTRA_DIR%/include" -meson . build --prefix %EXTRA_DIR% --default-library static --buildtype release || exit /b 1 -cd build -ninja || exit /b 1 -ninja install || exit /b 1 -cd ..\.. diff --git a/appveyor/install_libmicrohttpd.cmd b/appveyor/install_libmicrohttpd.cmd deleted file mode 100644 index 4e4d6a52..00000000 --- a/appveyor/install_libmicrohttpd.cmd +++ /dev/null @@ -1,11 +0,0 @@ -REM ======================================================== -REM Install libmicrohttpd -curl -fsSL -O https://ftpmirror.gnu.org/libmicrohttpd/libmicrohttpd-latest-w32-bin.zip || exit /b 1 -7z e libmicrohttpd-latest-w32-bin.zip -o%EXTRA_DIR%/include libmicrohttpd-*-w32-bin/x86_64/VS2019/Release-static/microhttpd.h || exit /b 1 -7z e libmicrohttpd-latest-w32-bin.zip -o%EXTRA_DIR%/lib libmicrohttpd-*-w32-bin/x86_64/VS2019/Release-static/libmicrohttpd.lib || exit /b 1 -7z e libmicrohttpd-latest-w32-bin.zip -o%EXTRA_DIR%/lib/pkgconfig libmicrohttpd-*-w32-bin/x86_64/MinGW/static/mingw64/lib/pkgconfig/* || exit /b 1 - -rename %EXTRA_DIR%\lib\libmicrohttpd.lib microhttpd.lib -dir %EXTRA_DIR% -dir %EXTRA_DIR%\lib -dir %EXTRA_DIR%\lib\pkgconfig diff --git a/appveyor/install_libzim.cmd b/appveyor/install_libzim.cmd deleted file mode 100644 index 18e42d6d..00000000 --- a/appveyor/install_libzim.cmd +++ /dev/null @@ -1,9 +0,0 @@ -REM ======================================================== -REM Install libzim -git clone https://github.com/openzim/libzim.git || exit /b 1 -cd libzim -meson . build --prefix %EXTRA_DIR% --default-library static --buildtype release || exit /b 1 -cd build -ninja || exit /b 1 -ninja install || exit /b 1 -cd ..\.. diff --git a/appveyor/install_lzma.cmd b/appveyor/install_lzma.cmd deleted file mode 100644 index 48f4d0a7..00000000 --- a/appveyor/install_lzma.cmd +++ /dev/null @@ -1,6 +0,0 @@ -REM ======================================================== -REM Install lzma -curl -fsSL -O https://tukaani.org/xz/xz-5.2.4-windows.zip || exit /b 1 -7z x xz-5.2.4-windows.zip -o%EXTRA_DIR% -r include || exit /b 1 -7z e xz-5.2.4-windows.zip -o%EXTRA_DIR%\lib bin_x86-64\liblzma.a || exit /b 1 -curl -fsSL -o%PKG_CONFIG_PATH%\liblzma.pc http://public.kymeria.fr/KIWIX/windows/liblzma.pc || exit /b 1 diff --git a/appveyor/install_mustache.cmd b/appveyor/install_mustache.cmd deleted file mode 100644 index 59b2b301..00000000 --- a/appveyor/install_mustache.cmd +++ /dev/null @@ -1,3 +0,0 @@ -REM ======================================================== -REM Install mustache.hpp -curl -fsSL -o%EXTRA_DIR%\include\mustache.hpp https://raw.githubusercontent.com/kainjow/mustache/v3.2.1/mustache.hpp || exit /b 1 diff --git a/appveyor/install_pthread.cmd b/appveyor/install_pthread.cmd deleted file mode 100644 index d17e5a51..00000000 --- a/appveyor/install_pthread.cmd +++ /dev/null @@ -1,14 +0,0 @@ -REM ======================================================== -REM Install pthread -curl -fsSL -O ftp://sourceware.org/pub/pthreads-win32/pthreads-w32-2-9-1-release.zip || exit /b 1 -7z x pthreads-w32-2-9-1-release.zip -r pthreads.2 || exit /b 1 -cd pthreads.2 -REM Patch is pthread_timespec.patch -curl -fsSL -O http://public.kymeria.fr/KIWIX/windows/pthread.h || exit /b 1 -nmake clean VC-inlined || exit /b 1 -copy pthread.h %EXTRA_DIR%\include -copy sched.h %EXTRA_DIR%\include -copy pthreadVC2.lib %EXTRA_DIR%\lib -copy pthreadVC2.dll %EXTRA_DIR%\bin -curl -fsSL -o%PKG_CONFIG_PATH%\libpthreadVC2.pc http://public.kymeria.fr/KIWIX/windows/libpthreadVC2.pc || exit /b 1 -cd .. diff --git a/appveyor/install_pugixml.cmd b/appveyor/install_pugixml.cmd deleted file mode 100644 index e005d91c..00000000 --- a/appveyor/install_pugixml.cmd +++ /dev/null @@ -1,10 +0,0 @@ -REM ======================================================== -REM Install pugixml -curl -fsSL -O http://public.kymeria.fr/KIWIX/windows/pugixml-1.2-meson.zip || exit /b 1 -7z x pugixml-1.2-meson.zip -o. || exit /b 1 -cd pugixml-1.2-meson -meson . build --prefix %EXTRA_DIR% --default-library static --buildtype release || exit /b 1 -cd build -ninja || exit /b 1 -ninja install || exit /b 1 -cd ..\.. diff --git a/appveyor/install_xapian.cmd b/appveyor/install_xapian.cmd deleted file mode 100644 index b0b448ae..00000000 --- a/appveyor/install_xapian.cmd +++ /dev/null @@ -1,9 +0,0 @@ -REM ======================================================== -REM Install xapian -curl -fsSL -O http://mirror.download.kiwix.org/dev/kiwix-build/xapian-core-1.4.18.zip || exit /b 1 -7z x xapian-core-1.4.18.zip || exit /b 1 -cd xapian-core-1.4.18 -mkdir build -cd build -%MINGW64_RUN% "cd /c/Projects/kiwix-build/xapian-core-1.4.18/build && /c/Projects/kiwix-build/appveyor/build_xapian.sh" > build_xapian.log || exit /b 1 -cd ..\.. diff --git a/appveyor/install_zlib.cmd b/appveyor/install_zlib.cmd deleted file mode 100644 index fd14aaab..00000000 --- a/appveyor/install_zlib.cmd +++ /dev/null @@ -1,10 +0,0 @@ -REM ======================================================== -REM Install zlib -curl -fsSL -O http://mirror.download.kiwix.org/dev/kiwix-build/zlib-1.2.12.meson.zip || exit /b 1 -7z x zlib-1.2.12.meson.zip || exit /b 1 -cd zlib-1.2.12 -meson . build --prefix %EXTRA_DIR% --default-library static --buildtype release || exit /b 1 -cd build -ninja || exit /b 1 -ninja install || exit /b 1 -cd ..\.. diff --git a/appveyor/install_zstd.cmd b/appveyor/install_zstd.cmd deleted file mode 100644 index 3339cbcd..00000000 --- a/appveyor/install_zstd.cmd +++ /dev/null @@ -1,10 +0,0 @@ -REM ======================================================== -REM Install zstd -curl -fsSL -o zstd-v1.5.2.zip https://github.com/facebook/zstd/archive/refs/tags/v1.5.2.zip || exit /b 1 -7z x zstd-v1.5.2.zip || exit /b 1 -cd zstd-1.5.2/build/meson -meson . builddir --prefix %EXTRA_DIR% --default-library static --buildtype release -Dbin_programs=false -Dbin_contrib=false || exit /b 1 -cd builddir -ninja || exit /b 1 -ninja install || exit /b 1 -cd ..\..\..\.. diff --git a/appveyor/kiwix.pfx.enc b/appveyor/kiwix.pfx.enc deleted file mode 100644 index 4ab45d5d..00000000 Binary files a/appveyor/kiwix.pfx.enc and /dev/null differ diff --git a/appveyor/nightlybot_id_key.enc b/appveyor/nightlybot_id_key.enc deleted file mode 100644 index ad85d7bd..00000000 Binary files a/appveyor/nightlybot_id_key.enc and /dev/null differ diff --git a/appveyor/package_kiwix-desktop.sh b/appveyor/package_kiwix-desktop.sh deleted file mode 100644 index e26f1973..00000000 --- a/appveyor/package_kiwix-desktop.sh +++ /dev/null @@ -1,35 +0,0 @@ - -set -e - -if [[ "$APPVEYOR_REPO_TAG" = "false" ]] -then - NIGHTLY_DATE=$(date +%Y-%m-%d) - KIWIX_ARCHIVES_DIR=/c/projects/NIGHTLY_KIWIX_ARCHIVES/${NIGHTLY_DATE} - KIWIX_DIR=kiwix-desktop_windows_x64_$NIGHTLY_DATE -else - if [ $KIWIX_DESKTOP_RELEASE -eq 1 ] - then - KIWIX_ARCHIVES_DIR=/c/projects/RELEASE_KIWIX_ARCHIVES - KIWIX_DIR=kiwix-desktop_windows_x64_${KIWIX_DESKTOP_VERSION} - fi -fi - -if [[ "$KIWIX_DIR" ]] -then - KIWIX_ARCH_NAME=${KIWIX_DIR}.zip - - mkdir $KIWIX_DIR - mkdir -p KIWIX_ARCHIVES_DIR - - cp /c/projects/kiwix-build/kiwix-desktop/Release/kiwix-desktop.exe $KIWIX_DIR -/c/Qt/5.15/msvc2019_64/bin/windeployqt --compiler-runtime $KIWIX_DIR - - cp $MINGW64_EXTRA_DIR/aria2c.exe $KIWIX_DIR - cp $MINGW64_EXTRA_DIR/bin/*.dll $KIWIX_DIR - cp /c/OpenSSL-v111-Win64/bin/libcrypto-1_1-x64.dll $KIWIX_DIR - cp /c/OpenSSL-v111-Win64/bin/libssl-1_1-x64.dll $KIWIX_DIR - - signtool.exe sign -f appveyor/kiwix.pfx -p $win_certificate_password -t http://timestamp.digicert.com -d "Kiwix-desktop application" -fd SHA256 $KIWIX_DIR/kiwix-desktop.exe - - 7z a -tzip $KIWIX_ARCHIVES_DIR/$KIWIX_ARCH_NAME $KIWIX_DIR -fi diff --git a/appveyor/setup_from_cache.cmd b/appveyor/setup_from_cache.cmd deleted file mode 100644 index ced71b6c..00000000 --- a/appveyor/setup_from_cache.cmd +++ /dev/null @@ -1,4 +0,0 @@ -REM ======================================================== -REM Setup from cache -curl -fsSL -O http://tmp.kiwix.org/ci/deps_windows_windows.zip || exit /b 1 -7z x deps_windows_windows.zip -oc: -aoa || exit /b 1 diff --git a/kiwixbuild/versions.py b/kiwixbuild/versions.py index a1d41932..87124d14 100644 --- a/kiwixbuild/versions.py +++ b/kiwixbuild/versions.py @@ -5,7 +5,7 @@ "libkiwix": "13.1.0", "kiwix-tools": "3.7.0", "zim-tools": "3.4.2", - "kiwix-desktop": "2.3.1", # Also change KIWIX_DESKTOP_VERSION and KIWIX_DESKTOP_RELEASE in appveyor.yml + "kiwix-desktop": "2.3.1", } # This dictionnary specify what we need to build at each release process. @@ -22,12 +22,6 @@ # `(was ...)`. # - Else, increment the value. If no value was present, see `(was ...)`. -# For kiwix-desktop, if this is not None: -# - set KIWIX_DESKTOP_RELEASE to 1 -# - set KIWIX_DESKTOP_VERSION to the version of the release (including release_versions) -# If this is None: -# - set KIWIX_DESKTOP_RELEASE to 0 - release_versions = { "libzim": 1, # Depends of base deps (was 0) "libkiwix": None, # Depends of libzim (was 4)