Commits October 2022

commits@lists.geany.org

1 participants
25 discussions

[geany/infrastructure] 6241c7: CI: Add workflow to build geany-mingw64-ci Docker image
by Enrico Tröger 17 Oct '22

17 Oct '22

Branch: refs/heads/add_ci_builders Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Mon, 17 Oct 2022 21:45:25 UTC Commit: 6241c776bee06fa520ea0480ce3db7d0fe339852 https://github.com/geany/infrastructure/commit/6241c776bee06fa520ea0480ce3d… Log Message: ----------- CI: Add workflow to build geany-mingw64-ci Docker image Modified Paths: -------------- .github/workflows/docker.yml Modified: .github/workflows/docker.yml 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -5,6 +5,7 @@ name: Build CI Docker Images on: + push: workflow_dispatch: # schedule: # # Run weekly on Friday -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/infrastructure] 7f07a6: CI: Add workflow to build geany-mingw64-ci Docker image
by Enrico Tröger 17 Oct '22

17 Oct '22

Branch: refs/heads/add_ci_builders Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Mon, 17 Oct 2022 21:43:51 UTC Commit: 7f07a62e42326f0a7b96facfeb5c3fd6a02b1f59 https://github.com/geany/infrastructure/commit/7f07a62e42326f0a7b96facfeb5c… Log Message: ----------- CI: Add workflow to build geany-mingw64-ci Docker image Modified Paths: -------------- .github/workflows/docker.yml Modified: .github/workflows/docker.yml 5 lines changed, 2 insertions(+), 3 deletions(-) =================================================================== @@ -4,9 +4,8 @@ name: Build CI Docker Images -on: push -#on: -# workflow_dispatch: +on: + workflow_dispatch: # schedule: # # Run weekly on Friday # - cron: '34 5 * * FRI' -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/infrastructure] b24701: CI: Add workflow to build geany-mingw64-ci Docker image
by Enrico Tröger 17 Oct '22

17 Oct '22

Branch: refs/heads/add_ci_builders Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Mon, 17 Oct 2022 21:27:27 UTC Commit: b24701987e4b03a896956741a7f906b4e82b37d0 https://github.com/geany/infrastructure/commit/b24701987e4b03a896956741a7f9… Log Message: ----------- CI: Add workflow to build geany-mingw64-ci Docker image Modified Paths: -------------- .github/workflows/docker.yml builders/README.md Modified: .github/workflows/docker.yml 45 lines changed, 45 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,45 @@ +# +# Copyright: 2022, The Geany contributors +# License: GNU GPL v2 or later + +name: Build CI Docker Images + +on: push +#on: +# workflow_dispatch: +# schedule: +# # Run weekly on Friday +# - cron: '34 5 * * FRI' + +# cancel already running builds of the same branch or pull request +concurrency: + group: ci-${{ github.head_ref }} || concat(${{ github.ref }} + cancel-in-progress: true + +jobs: + mingw64: + name: Build Docker image for mingw664 CI builds + runs-on: ubuntu-22.04 + + env: + DOCKER_REGISTRY: "ghcr.io" + DOCKER_IMAGE_NAME: "geany-mingw64-ci" + DOCKER_IMAGE_TAG: "ghcr.io/geany/geany-mingw64-ci:latest" + + steps: + - name: Checkout Build Scripts + uses: actions/checkout@v3 + + - name: Log In To The Container Registry + uses: docker/login-action@v2 + with: + registry: ${{ env.DOCKER_REGISTRY }} + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Build And Push Docker Image + run: | + cd builders + bash start_build.sh --log-to-stdout --mingw64 --rebuild-images + docker tag ${{ env.DOCKER_IMAGE_NAME }} ${{ env.DOCKER_IMAGE_TAG }} + docker push ${{ env.DOCKER_IMAGE_TAG }} Modified: builders/README.md 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -125,6 +125,10 @@ The Docker image for the Windows build is based on a Debian image but has the fu for cross-compiling to mingw64 included. Additionally, the image contains a self-compiled Pacman package manager to install packages from the MSYS2 repositories. +A Github Action workflow is configured in this repository to build and push the image +to the Github Docker image registry as ghcr.io/geany/geany-mingw64-ci:latest. The workflow +is triggered once a week automatically. + ### Code sign certificate If the directory `certificates` contains the two files `cert.pem` and `key.pem`, -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/infrastructure] 38abbc: Move Geany and Geany-Plugins specific build scripts
by Enrico Tröger 16 Oct '22

16 Oct '22

Branch: refs/heads/add_ci_builders Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sun, 16 Oct 2022 13:52:46 UTC Commit: 38abbcc1f4998c434d87f667a8204e2ecacb3c22 https://github.com/geany/infrastructure/commit/38abbcc1f4998c434d87f667a820… Log Message: ----------- Move Geany and Geany-Plugins specific build scripts Modified Paths: -------------- builders/README.md builders/scripts/build_mingw64_geany.sh builders/scripts/build_mingw64_geany_plugins.sh builders/start_build.sh Modified: builders/README.md 11 lines changed, 6 insertions(+), 5 deletions(-) =================================================================== @@ -4,7 +4,7 @@ CI / Nightly-Builders ## About Scripts and Dockerfiles for Geany and Geany-Plugins nightly builds. -`start_nightly_build.sh` will create (if missing) Docker images for +`start_build.sh` will create (if missing) Docker images for Debian stable and unstable as well as a Docker image for Mingw-w64 cross-compilaton to Windows. For the created Debian packages repositories for the distributions @@ -32,8 +32,6 @@ For the created Debian packages repositories for the distributions ├── scripts -> Build scripts to be executed within Docker containers │ ├── build_debian_geany.sh -> Build Geany Debian packages │ ├── build_debian_geany_plugins.sh -> Build Geany-Plugins Debian packages - │ ├── build_mingw64_geany.sh -> Build Geany Windows installer - │ ├── build_mingw64_geany_plugins.sh -> Build Geany-Plugins Windows installer │ └── update_debian_repositories.sh -> Build repositories for Debian packages │ └── start_build.sh -> Run Debian and Windows build containers and start builds @@ -57,7 +55,9 @@ the builds of Geany and Geany-Plugins for the various targets. can be specified multiple times -f, --force-rebuild Force rebuilding of immages even if not necessary -g, --geany Build Geany + --geany-script Path to the script to be executed to build Geany --geany-source Path to a Geany source directory (optional, cloned from GIT if missing) + --geany-plugins-script Path to the script to be executed to build Geany-Plugins --geany-plugins-source Path to a Geany-Plugins source directory (optional, cloned from GIT if missing) -h Show this help screen -l, --log-to-stdout Log build output additionally to stdout @@ -114,7 +114,8 @@ runtime with all necessary dependencies. The created installer for Geany-Plugins will contain all necessary dependencies for the plugins to work. -For more details, see the scripts `build_mingw64_geany.sh` and `build_mingw64_geany_plugins.sh` +For more details, see the scripts `scripts/ci_mingw64_geany.sh` and `build/ci_mingw64_geany_plugins.sh` +in the Geany resp. Geany-Plugins repository. In theory, it is also possible to create release installers with this method. @@ -126,7 +127,7 @@ Pacman package manager to install packages from the MSYS2 repositories. ### Code sign certificate -If the directory `certificates` contains the two files `cert.pem` and `key.pem `, +If the directory `certificates` contains the two files `cert.pem` and `key.pem`, then they will be used to digitally sign all created binary files (all built `.exe` and `.dll` files). Modified: builders/scripts/build_mingw64_geany.sh 327 lines changed, 0 insertions(+), 327 deletions(-) =================================================================== @@ -1,327 +0,0 @@ -#!/bin/bash -# -# Copyright 2022 The Geany contributors -# License: GPLv2 -# -# Helper script to build Geany for Windows in a Docker container. -# The following steps are performed: -# - clone Geany repository if necessary (i.e. if it is not bind-mounted into the container) -# - cross-compile Geany for Windows 64bit and GTK3 -# - sign all binaries and installer (if /certificates exist and contains cert.pem and key.pem) -# - download Geany-Themes for bundling -# - create GTK3 bundle with all dependencies (including grep and sort) -# - create the NSIS installer in ${OUTPUT_DIRECTORY} -# - test the created NSIS installer and compiled Geany -# - test uninstaller and check there is nothing left after uninstalling -# -# This script has to be executed within the Docker container. -# The Docker container should have a bind-mount for ${OUTPUT_DIRECTORY} -# where the resulting installer binary is stored. -# -# To test the installer and Geany binary "wine" is used. -# Please note that we need to use wine32 and wine64 as the -# created installer and uninstaller binaries are 32bit whereas the created -# Geany binary is 64bit. -# - -GEANY_VERSION= # will be set below from configure.ac -GEANY_GIT_REVISION= # will be set below from configure.ac -OUTPUT_DIRECTORY="/output" -GEANY_GIT_REPOSITORY="https://github.com/geany/geany.git" -GEANY_THEMES_REPOSITORY="https://github.com/geany/geany-themes.git" - -# rather static values, unlikely to be changed -GTK_BUNDLE_DIR="/build/gtk-bundle" -GEANY_SOURCE_DIR="/geany-source" -GEANY_BUILD_DIR="/build/geany-build" -GEANY_RELEASE_DIR="/build/geany-release" -GEANY_INSTALLER_FILENAME= # will be set below -GEANY_INSTALLATION_DIR_WIN="C:\\geany_install" -GEANY_INSTALLATION_DIR=$(winepath --unix ${GEANY_INSTALLATION_DIR_WIN}) -GEANY_THEMES_DIR="/build/geany-themes" -GEANY_RELEASE_BINARY_PATTERNS=( - "${GEANY_RELEASE_DIR}/bin/geany.exe" - "${GEANY_RELEASE_DIR}/bin/*.dll" - "${GEANY_RELEASE_DIR}/lib/geany/*.dll" -) -GEANY_RELEASE_TEXTFILE_PATTERNS=( - "${GEANY_RELEASE_DIR}/*.txt" - "${GEANY_RELEASE_DIR}/share/doc/geany/*" -) - -# CI CFLAGS -CFLAGS="\ - -Wall \ - -Wextra \ - -O2 \ - -Wunused \ - -Wno-unused-parameter \ - -Wunreachable-code \ - -Wformat=2 \ - -Wundef \ - -Wpointer-arith \ - -Wwrite-strings \ - -Waggregate-return \ - -Wmissing-prototypes \ - -Wmissing-declarations \ - -Wmissing-noreturn \ - -Wmissing-format-attribute \ - -Wredundant-decls \ - -Wnested-externs \ - -Wno-deprecated-declarations" - -# cross-compilation environment -ARCH="x86_64" -MINGW_ARCH="mingw64" -HOST="x86_64-w64-mingw32" -export CC="/usr/bin/${HOST}-gcc" -export CPP="/usr/bin/${HOST}-cpp" -export CXX="/usr/bin/${HOST}-g++" -export AR="/usr/bin/${HOST}-ar" -export STRIP="/usr/bin/${HOST}-strip" -export WINDRES="/usr/bin/${HOST}-windres" -export CFLAGS="-I/windows/${MINGW_ARCH}/include/ ${CFLAGS}" -export LDFLAGS="-static-libgcc ${LDFLAGS}" -export PKG_CONFIG_SYSROOT_DIR="/windows" -export PKG_CONFIG_PATH="/windows/${MINGW_ARCH}/lib/pkgconfig/" -export PKG_CONFIG="/usr/bin/pkg-config" -export NOCONFIGURE=1 - -# stop on errors -set -e - - -log() { - echo "=========== $(date '+%Y-%m-%d %H:%M:%S %Z') $* ===========" -} - - -git_clone_geany_if_necessary() { - if [ -d ${GEANY_SOURCE_DIR} ]; then - log "Copying Geany source" - cp --archive ${GEANY_SOURCE_DIR}/ ${GEANY_BUILD_DIR}/ - else - log "Cloning Geany repository from ${GEANY_GIT_REPOSITORY}" - git clone --depth 1 ${GEANY_GIT_REPOSITORY} ${GEANY_BUILD_DIR} - fi -} - - -parse_geany_version() { - GEANY_VERSION=$(sed -n -E -e 's/^AC_INIT.\[Geany\], \[(.+)\],/\1/p' ${GEANY_BUILD_DIR}/configure.ac) - GEANY_GIT_REVISION=$(cd ${GEANY_BUILD_DIR} && git rev-parse --short --revs-only HEAD 2>/dev/null || true) - TIMESTAMP=$(date +%Y%m%d%H%M%S) - # add pull request number if this is a CI and a PR build - if [ "${GITHUB_PULL_REQUEST}" ]; then - GEANY_VERSION="${GEANY_VERSION}_ci_${TIMESTAMP}_${GEANY_GIT_REVISION}_pr${GITHUB_PULL_REQUEST}" - elif [ "${CI}" -a "${GEANY_GIT_REVISION}" ]; then - GEANY_VERSION="${GEANY_VERSION}_ci_${TIMESTAMP}_${GEANY_GIT_REVISION}" - elif [ "${GEANY_GIT_REVISION}" ]; then - GEANY_VERSION="${GEANY_VERSION}_git_${TIMESTAMP}_${GEANY_GIT_REVISION}" - fi - GEANY_INSTALLER_FILENAME="geany-${GEANY_VERSION}_setup.exe" -} - - -log_environment() { - log "Using environment" - CONFIGURE_OPTIONS="--disable-silent-rules --host=${HOST} --prefix=${GEANY_RELEASE_DIR} --with-libiconv-prefix=/windows/mingw64" - echo "Geany version : ${GEANY_VERSION}" - echo "Geany GIT revision : ${GEANY_GIT_REVISION}" - echo "PATH : ${PATH}" - echo "HOST : ${HOST}" - echo "CC : ${CC}" - echo "CFLAGS : ${CFLAGS}" - echo "Configure : ${CONFIGURE_OPTIONS}" -} - - -patch_version_information() { - log "Patching version information" - - if [ -z "${GEANY_GIT_REVISION}" ] && [ -z "${CI}" ]; then - return - fi - - # parse version string and decrement the patch and/or minor levels to keep nightly build - # versions below the next release version - regex='^([0-9]*)[.]([0-9]*)([.]([0-9]*))?' - if [[ ${GEANY_VERSION} =~ $regex ]]; then - MAJOR="${BASH_REMATCH[1]}" - MINOR="${BASH_REMATCH[2]}" - PATCH="${BASH_REMATCH[4]}" - if [ -z "${PATCH}" ] || [ "${PATCH}" = "0" ]; then - MINOR="$((MINOR-1))" - PATCH="90" - else - PATCH="$((PATCH-1))" - fi - else - echo "Could not extract or parse version tag" >&2 - exit 1 - fi - # replace version information in configure.ac and for Windows binaries - sed -i -E "s/^AC_INIT.\[Geany\], \[(.+)\],/AC_INIT(\[Geany\], \[${GEANY_VERSION}\],/" ${GEANY_BUILD_DIR}/configure.ac - sed -i -E "s/^#define VER_FILEVERSION_STR[[:space:]]+\".*\"+/#define VER_FILEVERSION_STR \"${GEANY_VERSION}\"/" ${GEANY_BUILD_DIR}/geany_private.rc - sed -i -E "s/^#define VER_FILEVERSION[[:space:]]+[0-9,]+/#define VER_FILEVERSION ${MAJOR},${MINOR},${PATCH},90/" ${GEANY_BUILD_DIR}/geany_private.rc - sed -i -E "s/^[[:space:]]+version=\"[0-9.]+\"/version=\"${MAJOR}.${MINOR}.${PATCH}.90\"/" ${GEANY_BUILD_DIR}/geany.exe.manifest - sed -i -E "s/^!define PRODUCT_VERSION \"@VERSION@\"/!define PRODUCT_VERSION \"${GEANY_VERSION}\"/" ${GEANY_BUILD_DIR}/geany.nsi.in - sed -i -E "s/^!define PRODUCT_VERSION_ID \"@VERSION@.0.0\"/!define PRODUCT_VERSION_ID \"${MAJOR}.${MINOR}.${PATCH}.90\"/" ${GEANY_BUILD_DIR}/geany.nsi.in -} - - -build_geany() { - cd ${GEANY_BUILD_DIR} - log "Running autogen.sh" - ./autogen.sh - log "Running configure" - ./configure ${CONFIGURE_OPTIONS} - log "Running make" - make - log "Running install-strip" - make install-strip - - cd / -} - - -sign_file() { - echo "Sign file $1" - if [ -f /certificates/cert.pem ] && [ -f /certificates/key.pem ]; then - osslsigncode sign \ - -certs /certificates/cert.pem \ - -key /certificates/key.pem \ - -n "Geany Binary" \ - -i "https://www.geany.org/" \ - -ts http://zeitstempel.dfn.de/ \ - -h sha512 \ - -in ${1} \ - -out ${1}-signed - mv ${1}-signed ${1} - else - echo "Skip signing due to missing certificate" - fi -} - - -sign_geany_binaries() { - log "Signing Geany binary files" - for binary_file_pattern in ${GEANY_RELEASE_BINARY_PATTERNS[@]}; do - for binary_file in $(ls ${binary_file_pattern}); do - sign_file ${binary_file} - done - done -} - - -convert_text_files_to_crlf() { - log "Converting line endings to CRLF in text files" - for text_file_pattern in ${GEANY_RELEASE_TEXTFILE_PATTERNS[@]}; do - for text_file in $(ls ${text_file_pattern}); do - mime_type=$(file --brief --mime-type ${text_file}) - case $mime_type in text/*) - unix2dos ${text_file} - esac - done - done -} - - -create_gtk_bundle() { - log "Creating GTK bundle" - mkdir ${GTK_BUNDLE_DIR} - cd ${GTK_BUNDLE_DIR} - bash ${GEANY_BUILD_DIR}/scripts/gtk-bundle-from-msys2.sh -x -3 - cd / -} - - -fetch_geany_themes() { - log "Cloning Geany-Themes repository from ${GEANY_THEMES_REPOSITORY}" - git clone --depth 1 ${GEANY_THEMES_REPOSITORY} ${GEANY_THEMES_DIR} -} - - -create_installer() { - log "Creating NSIS installer" - makensis \ - -V3 \ - -WX \ - -DGEANY_INSTALLER_NAME="${GEANY_INSTALLER_FILENAME}" \ - -DGEANY_RELEASE_DIR=${GEANY_RELEASE_DIR} \ - -DGEANY_THEMES_DIR=${GEANY_THEMES_DIR} \ - -DGTK_BUNDLE_DIR=${GTK_BUNDLE_DIR} \ - ${GEANY_BUILD_DIR}/geany.nsi -} - - -sign_installer() { - log "Signing NSIS installer" - sign_file ${GEANY_BUILD_DIR}/${GEANY_INSTALLER_FILENAME} -} - - -test_installer() { - log "Test NSIS installer" - exiftool -FileName -FileType -FileVersion -FileVersionNumber ${GEANY_BUILD_DIR}/${GEANY_INSTALLER_FILENAME} - # install Geany: perform a silent install and check for installed files - mingw-w64-i686-wine ${GEANY_BUILD_DIR}/${GEANY_INSTALLER_FILENAME} /S /D=${GEANY_INSTALLATION_DIR_WIN} - # check if we have something installed - test -f ${GEANY_INSTALLATION_DIR}/uninst.exe || exit 1 - test -f ${GEANY_INSTALLATION_DIR}/bin/geany.exe || exit 1 - test -f ${GEANY_INSTALLATION_DIR}/lib/geany/export.dll || exit 1 - test ! -f ${GEANY_INSTALLATION_DIR}/lib/geany/demoplugin.dll || exit 1 -} - - -log_geany_version() { - log "Log installed Geany version" - mingw-w64-x86_64-wine ${GEANY_INSTALLATION_DIR}/bin/geany.exe --version 2>/dev/null - exiftool -FileName -FileType -FileVersion -FileVersionNumber ${GEANY_INSTALLATION_DIR}/bin/geany.exe -} - - -test_uninstaller() { - log "Test NSIS uninstaller" - # uninstall Geany and test if everything is clean - mingw-w64-i686-wine ${GEANY_INSTALLATION_DIR}/uninst.exe /S - sleep 10 # it seems the uninstaller returns earlier than the files are actually removed, so wait a moment - test ! -e ${GEANY_INSTALLATION_DIR} -} - - -copy_installer_and_bundle() { - log "Copying NSIS installer and GTK bundle" - cp ${GEANY_BUILD_DIR}/${GEANY_INSTALLER_FILENAME} ${OUTPUT_DIRECTORY} - cd ${GTK_BUNDLE_DIR} - zip --quiet --recurse-paths ${OUTPUT_DIRECTORY}/gtk_bundle_$(date '+%Y%m%dT%H%M%S').zip * - cd / -} - - -main() { - git_clone_geany_if_necessary - - parse_geany_version - log_environment - patch_version_information - build_geany - sign_geany_binaries - convert_text_files_to_crlf - - create_gtk_bundle - fetch_geany_themes - create_installer - sign_installer - - test_installer - log_geany_version - test_uninstaller - - copy_installer_and_bundle - - log "Done." -} - - -main Modified: builders/scripts/build_mingw64_geany_plugins.sh 357 lines changed, 0 insertions(+), 357 deletions(-) =================================================================== @@ -1,357 +0,0 @@ -#!/bin/bash -# -# Copyright 2022 The Geany contributors -# License: GPLv2 -# -# Helper script to build Geany-Plugins for Windows in a Docker container. -# The following steps are performed: -# - clone Geany-Plugins repository if necessary (i.e. if it is not bind-mounted into the container) -# - cross-compile Geany-Plugins for Windows 64bit and GTK3 -# - sign all binaries and installer (if /certificates exist and contains cert.pem and key.pem) -# - create bundle with all dependencies -# - create the NSIS installer in ${OUTPUT_DIRECTORY} -# - test the created NSIS installer -# - test uninstaller and check there is nothing unexpected left after uninstalling -# -# This script has to be executed within the Docker container. -# The Docker container should have a bind-mount for ${OUTPUT_DIRECTORY} -# where the resulting installer binary is stored. -# -# To test the installer "wine" is used. -# Please note that we need to use wine32 as the created installer and uninstaller -# binaries are 32bit. -# - -GEANY_PLUGINS_VERSION= # will be set below from configure.ac -GEANY_PLUGINS_GIT_REVISION= # will be set below -OUTPUT_DIRECTORY="/output" -GEANY_PLUGINS_GIT_REPOSITORY="https://github.com/geany/geany-plugins.git" - -# rather static values, unlikely to be changed -DEPENDENCY_BUNDLE_DIR="/build/dependencies-bundle" -GEANY_PLUGINS_SOURCE_DIR="/geany-plugins-source" -GEANY_PLUGINS_BUILD_DIR="/build/geany-plugins-build" -GEANY_PLUGINS_RELEASE_DIR="/build/geany-plugins-release" -GEANY_PLUGINS_INSTALLER_FILENAME= # will be set below -GEANY_PLUGINS_INSTALLATION_DIR_WIN="C:\\geany_plugins_install" -GEANY_PLUGINS_INSTALLATION_DIR=$(winepath --unix ${GEANY_PLUGINS_INSTALLATION_DIR_WIN}) -GEANY_PLUGINS_RELEASE_BINARY_PATTERNS=( - "${GEANY_PLUGINS_RELEASE_DIR}/lib/geany/*.dll" - "${GEANY_PLUGINS_RELEASE_DIR}/lib/geany-plugins/geanylua/libgeanylua.dll" - "${GEANY_PLUGINS_RELEASE_DIR}/bin/libgeanypluginutils*.dll" -) - -GEANY_PLUGINS_RELEASE_TEXTFILE_PATTERNS=( - "${GEANY_PLUGINS_RELEASE_DIR}/share/doc/geany-plugins/*" - "${GEANY_PLUGINS_RELEASE_DIR}/share/doc/geany-plugins/*/*" -) -GEANY_INSTALLATION_DIR="/root/.wine/drive_c/geany_install" - -GEANY_INSTALL_DIR_WIN=$(winepath --windows ${GEANY_INSTALLATION_DIR}) -GEANY_INSTALLER_EXECUTABLE=$(ls ${OUTPUT_DIRECTORY}/geany-*_setup.exe) - -# TODO move to include and use it also in Geany build script -# CI CFLAGS -CFLAGS="\ - -Wall \ - -Wextra \ - -O2 \ - -Wunused \ - -Wno-unused-parameter \ - -Wunreachable-code \ - -Wformat=2 \ - -Wundef \ - -Wpointer-arith \ - -Wwrite-strings \ - -Waggregate-return \ - -Wmissing-prototypes \ - -Wmissing-declarations \ - -Wmissing-noreturn \ - -Wmissing-format-attribute \ - -Wredundant-decls \ - -Wnested-externs \ - -Wno-deprecated-declarations" - -# cross-compilation environment -ARCH="x86_64" -MINGW_ARCH="mingw64" -HOST="x86_64-w64-mingw32" -export CC="/usr/bin/${HOST}-gcc" -export CPP="/usr/bin/${HOST}-cpp" -export CXX="/usr/bin/${HOST}-g++" -export AR="/usr/bin/${HOST}-ar" -export STRIP="/usr/bin/${HOST}-strip" -export WINDRES="/usr/bin/${HOST}-windres" -export CFLAGS="-I/windows/${MINGW_ARCH}/include/ ${CFLAGS}" -export LDFLAGS="-static-libgcc ${LDFLAGS}" -export PKG_CONFIG_SYSROOT_DIR="/windows" -export PKG_CONFIG_PATH="/windows/${MINGW_ARCH}/lib/pkgconfig/" -export PKG_CONFIG="/usr/bin/pkg-config" -export PATH="${PATH}:/windows/mingw64/bin" -export NOCONFIGURE=1 - -# stop on errors -set -e - - -log() { - echo "=========== $(date '+%Y-%m-%d %H:%M:%S %Z') $* ===========" -} - - -git_clone_geany_plugins_if_necessary() { - if [ -d ${GEANY_PLUGINS_SOURCE_DIR} ]; then - log "Copying Geany-Plugins source" - cp --archive ${GEANY_PLUGINS_SOURCE_DIR}/ ${GEANY_PLUGINS_BUILD_DIR}/ - else - log "Cloning Geany-Plugins repository from ${GEANY_PLUGINS_GIT_REPOSITORY}" - git clone --depth 1 ${GEANY_PLUGINS_GIT_REPOSITORY} ${GEANY_PLUGINS_BUILD_DIR} - fi -} - - -parse_geany_plugins_version() { - GEANY_PLUGINS_VERSION=$(sed -n -E -e 's/^AC_INIT.\[geany-plugins\], \[(.+)\]./\1/p' ${GEANY_PLUGINS_BUILD_DIR}/configure.ac) - GEANY_PLUGINS_GIT_REVISION=$(cd ${GEANY_PLUGINS_BUILD_DIR} && git rev-parse --short --revs-only HEAD 2>/dev/null || true) - TIMESTAMP=$(date +%Y%m%d%H%M%S) - # add pull request number if this is a CI and a PR build - if [ "${GITHUB_PULL_REQUEST}" ]; then - GEANY_PLUGINS_VERSION="${GEANY_PLUGINS_VERSION}_ci_${TIMESTAMP}_${GEANY_PLUGINS_GIT_REVISION}_pr${GITHUB_PULL_REQUEST}" - elif [ "${CI}" -a "${GEANY_PLUGINS_GIT_REVISION}" ]; then - GEANY_PLUGINS_VERSION="${GEANY_PLUGINS_VERSION}_ci_${TIMESTAMP}_${GEANY_PLUGINS_GIT_REVISION}" - elif [ "${GEANY_PLUGINS_GIT_REVISION}" ]; then - GEANY_PLUGINS_VERSION="${GEANY_PLUGINS_VERSION}_git_${TIMESTAMP}_${GEANY_PLUGINS_GIT_REVISION}" - fi - GEANY_PLUGINS_INSTALLER_FILENAME="geany-plugins-${GEANY_PLUGINS_VERSION}_setup.exe" -} - - -log_environment() { - log "Using environment" - CONFIGURE_OPTIONS="--disable-silent-rules --host=${HOST} --prefix=${GEANY_PLUGINS_RELEASE_DIR} --with-geany-libdir=${GEANY_PLUGINS_RELEASE_DIR}/lib" - echo "Geany-Plugins version : ${GEANY_PLUGINS_VERSION}" - echo "Geany-Plugins GIT revision : ${GEANY_PLUGINS_GIT_REVISION}" - echo "Geany installer : ${GEANY_INSTALLER_EXECUTABLE}" - echo "PATH : ${PATH}" - echo "HOST : ${HOST}" - echo "CC : ${CC}" - echo "CFLAGS : ${CFLAGS}" - echo "Configure : ${CONFIGURE_OPTIONS}" -} - - -patch_version_information() { - log "Patching version information" - - if [ -z "${GEANY_PLUGINS_GIT_REVISION}" ]; then - return - fi - - # parse version string and decrement the patch and/or minor levels to keep nightly build - # versions below the next release version - regex='^([0-9]*)[.]([0-9]*)([.]([0-9]*))?' - if [[ ${GEANY_PLUGINS_VERSION} =~ $regex ]]; then - MAJOR="${BASH_REMATCH[1]}" - MINOR="${BASH_REMATCH[2]}" - PATCH="${BASH_REMATCH[4]}" - if [ -z "${PATCH}" ] || [ "${PATCH}" = "0" ]; then - MINOR="$((MINOR-1))" - PATCH="90" - else - PATCH="$((PATCH-1))" - fi - else - echo "Could not extract or parse version tag" >&2 - exit 1 - fi - # replace version information in configure.ac and for Windows binaries - sed -i -E "s/^AC_INIT.\[geany-plugins\], \[(.+)\],/AC_INIT(\[geany-plugins\], \[${GEANY_PLUGINS_VERSION}\],/" ${GEANY_PLUGINS_BUILD_DIR}/configure.ac - sed -i -E "s/^!define PRODUCT_VERSION \"(.+)\"/!define PRODUCT_VERSION \"${GEANY_PLUGINS_VERSION}\"/" ${GEANY_PLUGINS_BUILD_DIR}/build/geany-plugins.nsi - sed -i -E "s/^!define PRODUCT_VERSION_ID \"(.+)\"/!define PRODUCT_VERSION_ID \"${MAJOR}.${MINOR}.${PATCH}.90\"/" ${GEANY_PLUGINS_BUILD_DIR}/build/geany-plugins.nsi - sed -i -E "s/^!define REQUIRED_GEANY_VERSION \"(.+)\"/!define REQUIRED_GEANY_VERSION \"${MAJOR}.${MINOR}\"/" ${GEANY_PLUGINS_BUILD_DIR}/build/geany-plugins.nsi -} - - -install_dependencies() { - log "Installing build dependencies" - pacman --noconfirm -Syu - pacman --noconfirm -S \ - mingw-w64-${ARCH}-check \ - mingw-w64-${ARCH}-cppcheck \ - mingw-w64-${ARCH}-ctpl-git \ - mingw-w64-${ARCH}-enchant \ - mingw-w64-${ARCH}-gpgme \ - mingw-w64-${ARCH}-gtkspell3 \ - mingw-w64-${ARCH}-libgit2 \ - mingw-w64-${ARCH}-libsoup \ - mingw-w64-${ARCH}-lua51 -} - - -install_geany() { - log "Installing Geany (using wine)" - if [ -z "${GEANY_INSTALLER_EXECUTABLE}" -o ! -f "${GEANY_INSTALLER_EXECUTABLE}" ]; then - echo "No Geany installer found" - exit 1 - fi - mingw-w64-i686-wine ${GEANY_INSTALLER_EXECUTABLE} /S /D=${GEANY_INSTALL_DIR_WIN} - - # TODO the following steps are way too hacky: installing Geany from the installer is basically - # what we want for CI tests but the installed "geany.pc" file isn't really suitable - # for cross-compiling - - # add the Geany installation directory to the PKG_CONFIG_PATH - export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:${GEANY_INSTALLATION_DIR}/lib/pkgconfig/" - # patch Geany pkg-config prefix: pkg-config always prepend "/windows" to the "prefix" variable, so we - # need to add ../ to get out of the hardcoded "/windows" path element - sed -i "s%^$prefix=$.*$%\1/..${GEANY_INSTALLATION_DIR}%" ${GEANY_INSTALLATION_DIR}/lib/pkgconfig/geany.pc - sed -i "s%^$exec_prefix=$.*$%\1/..${GEANY_INSTALLATION_DIR}%" ${GEANY_INSTALLATION_DIR}/lib/pkgconfig/geany.pc - # we need "${exec_prefix}/bin" additionally for libgeany-0.dll which is installed into bin/ and replace -lgeany by -lgeany-0 - sed -i "s%^Libs: -L\${libdir} -lgeany$%Libs: -L\${libdir} -L\${exec_prefix}/bin -lgeany-0%" ${GEANY_INSTALLATION_DIR}/lib/pkgconfig/geany.pc -} - - -build_geany_plugins() { - cd ${GEANY_PLUGINS_BUILD_DIR} - log "Running autogen.sh" - ./autogen.sh - log "Running configure" - ./configure ${CONFIGURE_OPTIONS} - log "Running make" - make - log "Running install-strip" - make install-strip - - cd / -} - - -sign_file() { - echo "Sign file $1" - if [ -f /certificates/cert.pem ] && [ -f /certificates/key.pem ]; then - osslsigncode sign \ - -certs /certificates/cert.pem \ - -key /certificates/key.pem \ - -n "Geany-Plugins Binary" \ - -i "https://www.geany.org/" \ - -ts http://zeitstempel.dfn.de/ \ - -h sha512 \ - -in ${1} \ - -out ${1}-signed - mv ${1}-signed ${1} - else - echo "Skip signing due to missing certificate" - fi -} - - -sign_geany_plugins_binaries() { - log "Signing Geany-Plugins binary files" - for binary_file_pattern in ${GEANY_PLUGINS_RELEASE_BINARY_PATTERNS[@]}; do - for binary_file in $(ls ${binary_file_pattern}); do - sign_file ${binary_file} - done - done -} - - -convert_text_files_to_crlf() { - log "Converting line endings to CRLF in text files" - for text_file_pattern in ${GEANY_PLUGINS_RELEASE_TEXTFILE_PATTERNS[@]}; do - for text_file in $(ls ${text_file_pattern}); do - mime_type=$(file --brief --mime-type ${text_file}) - case $mime_type in text/*) - unix2dos ${text_file} - esac - done - done -} - - -create_dependencies_bundle() { - log "Creating Geany-Plugins dependencies bundle" - mkdir ${DEPENDENCY_BUNDLE_DIR} - cd ${DEPENDENCY_BUNDLE_DIR} - bash ${GEANY_PLUGINS_BUILD_DIR}/build/gtk-bundle-from-msys2.sh -x -3 - cd / -} - - -create_installer() { - log "Creating NSIS installer" - makensis \ - -V3 \ - -WX \ - -DGEANY_PLUGINS_INSTALLER_NAME="${GEANY_PLUGINS_INSTALLER_FILENAME}" \ - -DGEANY_PLUGINS_RELEASE_DIR=${GEANY_PLUGINS_RELEASE_DIR} \ - -DDEPENDENCY_BUNDLE_DIR=${DEPENDENCY_BUNDLE_DIR} \ - ${GEANY_PLUGINS_BUILD_DIR}/build/geany-plugins.nsi -} - - -sign_installer() { - log "Signing NSIS installer" - sign_file ${GEANY_PLUGINS_BUILD_DIR}/build/${GEANY_PLUGINS_INSTALLER_FILENAME} -} - - -test_installer() { - log "Test NSIS installer" - # perform a silent install and check for installed files - exiftool -FileName -FileType -FileVersion -FileVersionNumber ${GEANY_PLUGINS_BUILD_DIR}/build/${GEANY_PLUGINS_INSTALLER_FILENAME} - # install Geany-Plugins - mingw-w64-i686-wine ${GEANY_PLUGINS_BUILD_DIR}/build/${GEANY_PLUGINS_INSTALLER_FILENAME} /S /D=${GEANY_PLUGINS_INSTALLATION_DIR_WIN} - # check if we have something installed - ls -l ${GEANY_PLUGINS_INSTALLATION_DIR}/uninst-plugins.exe || exit 1 - ls -l ${GEANY_PLUGINS_INSTALLATION_DIR}/lib/geany/addons.dll || exit 1 -} - - -test_uninstaller() { - log "Test NSIS uninstaller" - # uninstall Geany-Plugins and test if everything is clean - mingw-w64-i686-wine ${GEANY_PLUGINS_INSTALLATION_DIR}/uninst-plugins.exe /S - sleep 15 # it seems the uninstaller returns earlier than the files are actually removed, so wait a moment - rest=$(find ${GEANY_PLUGINS_INSTALLATION_DIR} $ -path '*share/locale' -o -path '*share/licenses' $ -prune -false -o -true -printf '%P ') - if [ "${rest}" != " share share/locale share/licenses " ]; then - # do not treat this as error, it might happen if upstream dependencies have been updated, - # the list of files to be removed needs to be updated only before releases - echo "WARNING: Uninstaller failed to uninstall the following files files: ${rest}" - fi -} - - -copy_installer_and_bundle() { - log "Copying NSIS installer and dependencies bundle" - cp ${GEANY_PLUGINS_BUILD_DIR}/build/${GEANY_PLUGINS_INSTALLER_FILENAME} ${OUTPUT_DIRECTORY} - cd ${DEPENDENCY_BUNDLE_DIR} - zip --quiet --recurse-paths ${OUTPUT_DIRECTORY}/geany_plugins_dependencies_bundle_$(date '+%Y%m%dT%H%M%S').zip * - cd / -} - - -main() { - git_clone_geany_plugins_if_necessary - - parse_geany_plugins_version - log_environment - patch_version_information - install_dependencies - install_geany - build_geany_plugins - sign_geany_plugins_binaries - convert_text_files_to_crlf - - create_dependencies_bundle - create_installer - sign_installer - copy_installer_and_bundle - - test_installer - test_uninstaller - - log "Done." -} - - -main Modified: builders/start_build.sh 18 lines changed, 16 insertions(+), 2 deletions(-) =================================================================== @@ -33,7 +33,9 @@ GNUPG_KEYID=${GNUPG_KEYID:-0EE5B5AD} BASE_OUTPUT_DIRECTORY="${PWD}/output/" DOCKER_CMD="docker" +GEANY_BUILD_SCRIPT=/geany-source/scripts/ci_mingw64_geany.sh GEANY_SOURCE= +GEANY_PLUGINS_BUILD_SCRIPT=/geany-plugins-source/build/ci_mingw64_geany_plugins.sh GEANY_PLUGINS_SOURCE= # stop on errors @@ -165,7 +167,7 @@ build_mingw64() { --volume "${PWD}/certificates/:/certificates/" \ --volume "${MINGW64_OUTPUT_DIRECTORY}:/output/" \ "${IMAGE_NAME_WINDOWS}:latest" \ - bash /scripts/build_mingw64_geany.sh + bash ${GEANY_BUILD_SCRIPT} fi # Build Geany-Plugins @@ -186,7 +188,7 @@ build_mingw64() { --volume "${PWD}/certificates/:/certificates/" \ --volume "${MINGW64_OUTPUT_DIRECTORY}:/output/" \ "${IMAGE_NAME_WINDOWS}:latest" \ - bash /scripts/build_mingw64_geany_plugins.sh + bash ${GEANY_PLUGINS_BUILD_SCRIPT} fi } @@ -197,7 +199,9 @@ usage() { echo " -d, --distro DISTRO Build for target Debian DISTRO (e.g. \"bullseye\"," echo " can be specified multiple times" echo " -g, --geany Build Geany" + echo "--geany-script Path to the script to be executed to build Geany" echo "--geany-source Path to a Geany source directory (optional, cloned from GIT if missing)" + echo "--geany-plugins-script Path to the script to be executed to build Geany-Plugins" echo "--geany-plugins-source Path to a Geany-Plugins source directory (optional, cloned from GIT if missing)" echo " -h Show this help screen" echo " -l, --log-to-stdout Log build output additionally to stdout" @@ -229,11 +233,21 @@ parse_command_line_options() { DO_GEANY=1 shift ;; + --geany-script) + GEANY_BUILD_SCRIPT="${2}" + shift + shift + ;; --geany-source) GEANY_SOURCE="${2}" shift shift ;; + --geany-plugins-script) + GEANY_PLUGINS_BUILD_SCRIPT="${2}" + shift + shift + ;; --geany-plugins-source) GEANY_PLUGINS_SOURCE="${2}" shift -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-osx] 9e2ec7: Use white color for base_bg_color and theme_base_color
by Jiří Techet 04 Oct '22

04 Oct '22

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Tue, 04 Oct 2022 20:32:56 UTC Commit: 9e2ec78fbbabc45717c30fc56a724a09b9a3a275 https://github.com/geany/geany-osx/commit/9e2ec78fbbabc45717c30fc56a724a09b… Log Message: ----------- Use white color for base_bg_color and theme_base_color Modified Paths: -------------- Prof-Gnome/gtk-3.0/theme-colors/colors-light.css Modified: Prof-Gnome/gtk-3.0/theme-colors/colors-light.css 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -58,12 +58,12 @@ @define-color theme_fg_color #404040; /* widget base background color */ -@define-color base_bg_color rgba(243,243,244,0.99);/*rgba(243,243,243,0.99);*/ +@define-color base_bg_color #ffffff; @define-color theme_bg_color #f2f2f2; @define-color osd_bg_color #353535; /* text widgets and the like base background color */ -@define-color theme_base_color #fafafb;/*#ffffff;*/ +@define-color theme_base_color #ffffff; /* base background color of selections @color_600 */ @define-color theme_selected_bg_color @color_600; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-osx] 4a933f: Make check boxes and radio buttons a little smaller
by Jiří Techet 02 Oct '22

02 Oct '22

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Sun, 02 Oct 2022 20:15:02 UTC Commit: 4a933f18568adc14107f86c51b45b1d5e588724c https://github.com/geany/geany-osx/commit/4a933f18568adc14107f86c51b45b1d5e… Log Message: ----------- Make check boxes and radio buttons a little smaller This way they look more like native checkboxes and radio boxes on macOS and Windows. Modified Paths: -------------- Prof-Gnome/gtk-3.0/main-dark.css Prof-Gnome/gtk-3.0/main-light.css Modified: Prof-Gnome/gtk-3.0/main-dark.css 28 lines changed, 14 insertions(+), 14 deletions(-) =================================================================== @@ -3623,9 +3623,9 @@ radio:hover background-image: linear-gradient(to top,@button_color,shade(@button_color,0.97)); background-color: transparent; color: alpha((a)text_color,0.9); - margin: 0 6px; - min-height:14px; - min-width: 14px; + margin: 0 6px 2px 6px; + min-height:12px; + min-width: 12px; -gtk-icon-source: none; } radio:checked, @@ -3746,8 +3746,8 @@ popover radio:disabled background-color: alpha((a)button_color,0.4); border-color: transparent; - min-height:14px; - min-width: 14px; + min-height:12px; + min-width: 12px; } popover radio:checked, popover radio:active @@ -3786,8 +3786,8 @@ menu menuitem radio:disabled background-color: alpha((a)button_color,0.4); border-color: #333333; - min-height: 14px; - min-width: 14px; + min-height: 12px; + min-width: 12px; } menu menuitem radio:checked, menu menuitem radio:active @@ -3846,9 +3846,9 @@ check:hover border: 1px solid; border-radius: 4px; color: alpha((a)text_color,0.9); - margin: 0 6px; - min-height: 14px; - min-width: 14px; + margin: 0 6px 2px 6px; + min-height: 12px; + min-width: 12px; border-color: shade((a)borders,0.9); @@ -3985,8 +3985,8 @@ popover check:disabled background-color: alpha((a)button_color,0.4); border-color: transparent; - min-height: 14px; - min-width: 14px; + min-height: 12px; + min-width: 12px; } popover check:checked, popover check:active @@ -4024,8 +4024,8 @@ menu menuitem check:disabled background-color: alpha((a)button_color,0.4); border-color: #333333; - min-height: 14px; - min-width: 14px; + min-height: 12px; + min-width: 12px; } menu menuitem check:checked, menu menuitem check:active Modified: Prof-Gnome/gtk-3.0/main-light.css 28 lines changed, 14 insertions(+), 14 deletions(-) =================================================================== @@ -3615,9 +3615,9 @@ radio:hover background-image: linear-gradient(to top,@button_color,shade(@button_color,0.97)); background-color: transparent; color: alpha((a)text_color,0.9); - margin: 0 6px; - min-height:14px; - min-width: 14px; + margin: 0 6px 2px 6px; + min-height:12px; + min-width: 12px; -gtk-icon-source: none; } radio:checked, @@ -3738,8 +3738,8 @@ popover radio:disabled background-color: alpha((a)button_color,0.4); border-color: transparent; - min-height:14px; - min-width: 14px; + min-height:12px; + min-width: 12px; } popover radio:checked, popover radio:active @@ -3778,8 +3778,8 @@ menu menuitem radio:disabled background-color: alpha((a)button_color,0.4); border-color: #cccccc; - min-height: 14px; - min-width: 14px; + min-height: 12px; + min-width: 12px; } menu menuitem radio:checked, menu menuitem radio:active @@ -3838,9 +3838,9 @@ check:hover border: 1px solid; border-radius: 4px; color: alpha((a)text_color,0.9); - margin: 0 6px; - min-height: 14px; - min-width: 14px; + margin: 0 6px 2px 6px; + min-height: 12px; + min-width: 12px; border-color: shade((a)borders,0.9); @@ -3977,8 +3977,8 @@ popover check:disabled background-color: alpha((a)button_color,0.4); border-color: transparent; - min-height: 14px; - min-width: 14px; + min-height: 12px; + min-width: 12px; } popover check:checked, popover check:active @@ -4016,8 +4016,8 @@ menu menuitem check:disabled background-color: alpha((a)button_color,0.4); border-color: #cccccc; - min-height: 14px; - min-width: 14px; + min-height: 12px; + min-width: 12px; } menu menuitem check:checked, menu menuitem check:active -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-osx] a56169: Use better background color for menus and file open sidebar
by Jiří Techet 02 Oct '22

02 Oct '22

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Sun, 02 Oct 2022 20:13:53 UTC Commit: a561697bee97282cf2e9ca5837bd68a4ebc71cb6 https://github.com/geany/geany-osx/commit/a561697bee97282cf2e9ca5837bd68a4e… Log Message: ----------- Use better background color for menus and file open sidebar Use the same color as other widgets use for the background. Modified Paths: -------------- Prof-Gnome/gtk-3.0/theme-colors/colors-light.css Modified: Prof-Gnome/gtk-3.0/theme-colors/colors-light.css 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -51,8 +51,8 @@ @define-color shadows_light #ffffff; @define-color shadows_dark #000000; /**/ -@define-color menu_bg_color rgba(239,241,245,1); -@define-color sidebar_bg_color rgba(231,233,237,1); +@define-color menu_bg_color #f2f2f2; +@define-color sidebar_bg_color #f2f2f2; /*text color for entries, views and content in general*/ @define-color theme_text_color #404040; @define-color theme_fg_color #404040; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 0d8580: PO:(uk) Update translation; metadata only
by nomadbyte 02 Oct '22

02 Oct '22

1 0

[geany/geany] 35ac13: PO:(uk) Update translation
by nomadbyte 02 Oct '22

02 Oct '22

Branch: refs/heads/master Author: nomadbyte <nomadbyte(a)users.noreply.github.com> Committer: nomadbyte <nomadbyte(a)users.noreply.github.com> Date: Tue, 11 Jan 2022 04:13:52 UTC Commit: 35ac13cb2cdc4bf0d12237667c1080cc99c2abc0 https://github.com/geany/geany/commit/35ac13cb2cdc4bf0d12237667c1080cc99c2a… Log Message: ----------- PO:(uk) Update translation Modified Paths: -------------- po/uk.po Modified: po/uk.po 26 lines changed, 13 insertions(+), 13 deletions(-) =================================================================== @@ -2526,9 +2526,8 @@ msgid "Changes detected, reloading all will lose any changes and history." msgstr "" #: src/callbacks.c:354 -#, fuzzy msgid "Are you sure you want to reload all files?" -msgstr "Ви дійсно хочете перевідкрити \"%s\"?" +msgstr "Ви дійсно хочете перевідкрити всі файли?" #: src/callbacks.c:920 src/keybindings.c:567 msgid "Go to Line" @@ -3305,9 +3304,8 @@ msgid "Reload file" msgstr "Перевідкрити файл" #: src/keybindings.c:359 -#, fuzzy msgid "Reload all files" -msgstr "Перевідкрити файл" +msgstr "Перевідкрити всі файли" #: src/keybindings.c:361 msgid "Re-open last closed tab" @@ -3917,7 +3915,7 @@ msgid "" msgstr "" "Не вдалось створити каталог конфігурації (%s).\n" "Використання Geany без каталогу конфігурації може призвести до деяких " -"помилок.Продовжувати запуск Geany?" +"помилок. Продовжити запуск Geany?" #: src/libmain.c:1158 #, c-format @@ -4808,14 +4806,12 @@ msgid "Classes" msgstr "" #: src/symbols.c:640 -#, fuzzy msgid "Fields" -msgstr "Перейти до рядка" +msgstr "" #: src/symbols.c:644 -#, fuzzy msgid "Unknowns" -msgstr "невідомо" +msgstr "" #: src/symbols.c:652 msgid "Anchors" @@ -5886,9 +5882,9 @@ msgid "Backup Copy: File could not be saved (%s)." msgstr "Резервна копія: Не вдалось зберегти файл (%s)." #: plugins/saveactions.c:286 -#, fuzzy, c-format +#, c-format msgid "Instant Save filename could not be generated (%s)." -msgstr "Не вдалось записати файл проекту (%s)." +msgstr "Автозбереження: Не вдалось зберегти створений файл (%s)." #: plugins/saveactions.c:386 #, c-format @@ -5903,9 +5899,8 @@ msgid "Select Directory" msgstr "Вибрати каталог" #: plugins/saveactions.c:544 -#, fuzzy msgid "Instantsave directory does not exist or is not writable." -msgstr "Каталог для резервних копій не існує або не дозволяє запис." +msgstr "Каталог для автозбереження файлів не існує або не дозволяє запис." #: plugins/saveactions.c:561 msgid "Backup directory does not exist or is not writable." @@ -5956,6 +5951,7 @@ msgstr "_Тип файлу для створених файлів:" #, c-format msgid "_Directory to save files in (leave empty to use the default: %s):" msgstr "" +"_Каталог для автозбереження створених файлів (за замовчуванням: \"%s\"):" #: plugins/saveactions.c:766 msgid "" @@ -5964,6 +5960,10 @@ msgid "" "you will need to cleanup instantly saved files manually. The Instant Save " "plugin will not delete the created files.</i>" msgstr "" +"<i>Файли, автоматично збережені при створенні, залишаться у встановленому " +"каталозі.\n" +"Каталог для автозбереження створених файлів необхідно очищати вручну або " +"іншим способом.</i>" #: plugins/saveactions.c:784 msgid "Backup Copy" -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] e59a24: Merge pull request #3094 from nomadbyte/po/uk
by Frank Lanitz 02 Oct '22

02 Oct '22

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: GitHub <noreply(a)github.com> Date: Sun, 02 Oct 2022 16:41:43 UTC Commit: e59a2412f9c4d316f6eab1a4ac5a77469a326d0a https://github.com/geany/geany/commit/e59a2412f9c4d316f6eab1a4ac5a77469a326… Log Message: ----------- Merge pull request #3094 from nomadbyte/po/uk PO:(uk) Update translation Modified Paths: -------------- po/uk.po Modified: po/uk.po 2848 lines changed, 1388 insertions(+), 1460 deletions(-) =================================================================== No diff available, check online -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits October 2022