Commits January 2023

commits@lists.geany.org

1 participants
26 discussions

[geany/geany-themes] 644698: A dark cyber theme with sugar colors
by 127001 16 Jan '23

16 Jan '23

Branch: refs/heads/master Author: 127001 <85120225+1270011(a)users.noreply.github.com> Committer: GitHub <noreply(a)github.com> Date: Tue, 17 Jan 2023 03:22:17 UTC Commit: 644698a0651e16b9fcfc517deb2dc5a2863fb7c6 https://github.com/geany/geany-themes/commit/644698a0651e16b9fcfc517deb2dc5… Log Message: ----------- A dark cyber theme with sugar colors A dark cyber theme with sugar colors. Added .conf, tested. Modified Paths: -------------- colorschemes/cyber-sugar.conf Modified: colorschemes/cyber-sugar.conf 135 lines changed, 135 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,135 @@ +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Library General Public +# License as published by the Free Software Foundation; either +# version 2 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Library General Public License for more details. +# +# You should have received a copy of the GNU Library General Public +# License along with this library; if not, write to the +# Free Software Foundation, Inc., 59 Temple Place - Suite 330, +# Boston, MA 02111-1307, USA. +# + +[theme_info] +name=Cyber Sugar +description=A dark cyber theme with sugar colors. +# incremented automatically, do not change manually +version=1.0 +author=pingu +# list of each compatible Geany release version +compat=1.22;1.23;1.23.1;1.24 + +[named_colors] +base0=#80bfff +base1=#000 +base2=#fff +base3=#a6a +base4=#000 +barbie=#e64d7d +orange=#ea7d10 +frostwhite=#fff +attentionred=#ff1f47 +pastelgreen=#6cf982 +softpink=#f9b8b8 +red=#f00 +redbg=#751212 +green=#859900 +blue=#268bd2 +oxfordblue=#002147 + +[named_styles] +default=base0;base1 +error=red + + +# Editor styles +#------------------------------------------------------------------------------- +selection=;oxfordblue;;true +current_line=;#1a1a1a;true +brace_good=#000;pastelgreen;true +brace_bad=red;frostwhite;true +margin_line_number=#a6a;base4 +margin_folding=base3;#000 +fold_symbol_highlight=base2 +indent_guide=base2;;true +caret=orange +marker_line=#fff;#00f; +marker_search=;frostwhite; +marker_mark=; +call_tips=base0;#fff +white_space=base2;;true + + +# Programming languages +#------------------------------------------------------------------------------- + +comment=softpink +comment_doc=comment +comment_line=comment +comment_line_doc=comment_doc +comment_doc_keyword=comment_doc,bold +comment_doc_keyword_error=comment_doc,italic + +number=attentionred +number_1=number +number_2=number_1 + +type=barbie;;true +class=orange +function=#00FFFA +parameter=function + +keyword=barbie;;true +keyword_1=keyword +keyword_2=orange;;true +keyword_3=frostwhite +keyword_4=keyword_3 + +identifier=default +identifier_1=identifier +identifier_2=identifier_1 +identifier_3=identifier_1 +identifier_4=identifier_1 + +string=pastelgreen +string_1=string +string_2=string_1 +string_3=default +string_4=default +string_eol=red +character=string_1 +backticks=string_2 +here_doc=string_2 + +scalar=string_2 +label=keyword,bold +preprocessor=orange +regex=number_1 +operator=#fff +decorator=string_1,bold +other=orange + + +# Markup-type languages +#------------------------------------------------------------------------------- + +tag=barbie +tag_unknown=tag,bold +tag_end=tag,bold +attribute=orange +attribute_unknown=attribute,bold +value=string_1 +entity=default + + +# Diff +#------------------------------------------------------------------------------- + +line_added=green +line_removed=red +line_changed=blue -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 469db1: Merge pull request #3334 from eht16/show_d_python_global_class_calltips
by Enrico Tröger 15 Jan '23

15 Jan '23

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: GitHub <noreply(a)github.com> Date: Sun, 15 Jan 2023 17:41:56 UTC Commit: 469db1505508e1f4b9091e2ebe9be5d7434ac98a https://github.com/geany/geany/commit/469db1505508e1f4b9091e2ebe9be5d7434ac… Log Message: ----------- Merge pull request #3334 from eht16/show_d_python_global_class_calltips Use constructor method calltip only if available Modified Paths: -------------- src/editor.c Modified: src/editor.c 73 lines changed, 58 insertions(+), 15 deletions(-) =================================================================== @@ -1843,6 +1843,53 @@ static gint find_start_bracket(ScintillaObject *sci, gint pos) } +static GPtrArray *get_constructor_tags(GeanyFiletype *ft, TMTag *tag, + const gchar *constructor_method) +{ + if (constructor_method && (tag->type == tm_tag_class_t || tag->type == tm_tag_struct_t)) + { + const TMTagType arg_types = tm_tag_function_t | tm_tag_prototype_t | + tm_tag_method_t | tm_tag_macro_with_arg_t; + const gchar *scope_sep = tm_parser_scope_separator(ft->lang); + gchar *scope = EMPTY(tag->scope) ? g_strdup(tag->name) : + g_strjoin(scope_sep, tag->scope, tag->name, NULL); + GPtrArray *constructor_tags; + + constructor_tags = tm_workspace_find(constructor_method, scope, arg_types, NULL, ft->lang); + g_free(scope); + if (constructor_tags->len != 0) + { /* found constructor tag, so use it instead of the class tag */ + return constructor_tags; + } + else + { + g_ptr_array_free(constructor_tags, TRUE); + } + } + return NULL; +} + + +static void update_tag_name_and_scope_for_calltip(const gchar *word, TMTag *tag, + const gchar *constructor_method, + const gchar **tag_name, const gchar **scope) +{ + if (tag_name == NULL || scope == NULL) + return; + + /* Remove scope and replace name with the current calltip word if the current tag + * is the constructor method of the current calltip word, e.g. for Python: + * "SomeClass.__init__ (self, arg1, ...)" will be changed to "SomeClass (self, arg1, ...)" */ + if (constructor_method && + utils_str_equal(constructor_method, tag->name) && + !utils_str_equal(word, tag->name)) + { + *tag_name = word; + *scope = NULL; + } +} + + static gchar *find_calltip(const gchar *word, GeanyFiletype *ft) { const gchar *constructor_method; @@ -1865,21 +1912,13 @@ static gchar *find_calltip(const gchar *word, GeanyFiletype *ft) /* user typed e.g. 'a = Classname(' in Python so lookup __init__() arguments */ constructor_method = tm_parser_get_constructor_method(tag->lang); - if (constructor_method && (tag->type == tm_tag_class_t || tag->type == tm_tag_struct_t)) + if (constructor_method) { - const TMTagType arg_types = tm_tag_function_t | tm_tag_prototype_t | - tm_tag_method_t | tm_tag_macro_with_arg_t; - const gchar *scope_sep = tm_parser_scope_separator(ft->lang); - gchar *scope = EMPTY(tag->scope) ? g_strdup(tag->name) : - g_strjoin(scope_sep, tag->scope, tag->name, NULL); - - g_ptr_array_free(tags, TRUE); - tags = tm_workspace_find(constructor_method, scope, arg_types, NULL, ft->lang); - g_free(scope); - if (tags->len == 0) + GPtrArray *constructor_tags = get_constructor_tags(ft, tag, constructor_method); + if (constructor_tags) { g_ptr_array_free(tags, TRUE); - return NULL; + tags = constructor_tags; } } @@ -1919,9 +1958,13 @@ static gchar *find_calltip(const gchar *word, GeanyFiletype *ft) if (str == NULL) { - gchar *f = tm_parser_format_function(tag->lang, tag->name, - tag->arglist, tag->var_type, tag->scope); - str = g_string_new(NULL); + const gchar *tag_name = tag->name; + const gchar *scope = tag->scope; + gchar *f; + + update_tag_name_and_scope_for_calltip(word, tag, constructor_method, &tag_name, &scope); + f = tm_parser_format_function(tag->lang, tag_name, tag->arglist, tag->var_type, scope); + str = g_string_new(NULL); if (calltip.tag_index > 0) g_string_prepend(str, "\001 "); /* up arrow */ g_string_append(str, f); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 641f3e: Use constructor method calltip only if available
by Enrico Tröger 15 Jan '23

15 Jan '23

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sun, 15 Jan 2023 17:40:52 UTC Commit: 641f3eae03571b803e84ae1bd1da02cdc72da45c https://github.com/geany/geany/commit/641f3eae03571b803e84ae1bd1da02cdc72da… Log Message: ----------- Use constructor method calltip only if available For D and Python, we try to read the calltip from the constructor method (e.g. "__init__" for Python) instead of from the class tag itself. If we don't find a matching constructor method tag, now we continue looking at the class tag itself. This is useful for global tags where the constructor signature might be defined on the class tag itself. Modified Paths: -------------- src/editor.c Modified: src/editor.c 73 lines changed, 58 insertions(+), 15 deletions(-) =================================================================== @@ -1843,6 +1843,53 @@ static gint find_start_bracket(ScintillaObject *sci, gint pos) } +static GPtrArray *get_constructor_tags(GeanyFiletype *ft, TMTag *tag, + const gchar *constructor_method) +{ + if (constructor_method && (tag->type == tm_tag_class_t || tag->type == tm_tag_struct_t)) + { + const TMTagType arg_types = tm_tag_function_t | tm_tag_prototype_t | + tm_tag_method_t | tm_tag_macro_with_arg_t; + const gchar *scope_sep = tm_parser_scope_separator(ft->lang); + gchar *scope = EMPTY(tag->scope) ? g_strdup(tag->name) : + g_strjoin(scope_sep, tag->scope, tag->name, NULL); + GPtrArray *constructor_tags; + + constructor_tags = tm_workspace_find(constructor_method, scope, arg_types, NULL, ft->lang); + g_free(scope); + if (constructor_tags->len != 0) + { /* found constructor tag, so use it instead of the class tag */ + return constructor_tags; + } + else + { + g_ptr_array_free(constructor_tags, TRUE); + } + } + return NULL; +} + + +static void update_tag_name_and_scope_for_calltip(const gchar *word, TMTag *tag, + const gchar *constructor_method, + const gchar **tag_name, const gchar **scope) +{ + if (tag_name == NULL || scope == NULL) + return; + + /* Remove scope and replace name with the current calltip word if the current tag + * is the constructor method of the current calltip word, e.g. for Python: + * "SomeClass.__init__ (self, arg1, ...)" will be changed to "SomeClass (self, arg1, ...)" */ + if (constructor_method && + utils_str_equal(constructor_method, tag->name) && + !utils_str_equal(word, tag->name)) + { + *tag_name = word; + *scope = NULL; + } +} + + static gchar *find_calltip(const gchar *word, GeanyFiletype *ft) { const gchar *constructor_method; @@ -1865,21 +1912,13 @@ static gchar *find_calltip(const gchar *word, GeanyFiletype *ft) /* user typed e.g. 'a = Classname(' in Python so lookup __init__() arguments */ constructor_method = tm_parser_get_constructor_method(tag->lang); - if (constructor_method && (tag->type == tm_tag_class_t || tag->type == tm_tag_struct_t)) + if (constructor_method) { - const TMTagType arg_types = tm_tag_function_t | tm_tag_prototype_t | - tm_tag_method_t | tm_tag_macro_with_arg_t; - const gchar *scope_sep = tm_parser_scope_separator(ft->lang); - gchar *scope = EMPTY(tag->scope) ? g_strdup(tag->name) : - g_strjoin(scope_sep, tag->scope, tag->name, NULL); - - g_ptr_array_free(tags, TRUE); - tags = tm_workspace_find(constructor_method, scope, arg_types, NULL, ft->lang); - g_free(scope); - if (tags->len == 0) + GPtrArray *constructor_tags = get_constructor_tags(ft, tag, constructor_method); + if (constructor_tags) { g_ptr_array_free(tags, TRUE); - return NULL; + tags = constructor_tags; } } @@ -1919,9 +1958,13 @@ static gchar *find_calltip(const gchar *word, GeanyFiletype *ft) if (str == NULL) { - gchar *f = tm_parser_format_function(tag->lang, tag->name, - tag->arglist, tag->var_type, tag->scope); - str = g_string_new(NULL); + const gchar *tag_name = tag->name; + const gchar *scope = tag->scope; + gchar *f; + + update_tag_name_and_scope_for_calltip(word, tag, constructor_method, &tag_name, &scope); + f = tm_parser_format_function(tag->lang, tag_name, tag->arglist, tag->var_type, scope); + str = g_string_new(NULL); if (calltip.tag_index > 0) g_string_prepend(str, "\001 "); /* up arrow */ g_string_append(str, f); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] f146c2: CI: Use MSYS2 for Windows build
by Enrico Tröger 15 Jan '23

15 Jan '23

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sun, 08 Jan 2023 20:44:12 UTC Commit: f146c2eb70715e94d1e31931cdebb08c86f81799 https://github.com/geany/geany/commit/f146c2eb70715e94d1e31931cdebb08c86f81… Log Message: ----------- CI: Use MSYS2 for Windows build Modified Paths: -------------- .github/workflows/build.yml scripts/ci_mingw64_geany.sh scripts/gtk-bundle-from-msys2.sh Modified: .github/workflows/build.yml 126 lines changed, 74 insertions(+), 52 deletions(-) =================================================================== @@ -43,18 +43,18 @@ jobs: CXX: ccache g++ steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 # create and use a timestamp for the cache key: GH Actions will never update a cache # only use an existing cache item or create a new one. To use an existing cache *and* # push back the the updated cache after build, we use a always new cache key (to force # the creation of the cache item at the end) in combination with "restore-keys" as fallback - name: Prepare ccache timestamp id: ccache_cache_timestamp - run: echo "::set-output name=timestamp::$(date +%Y-%m-%d-%H-%M)" + run: echo "timestamp=$(date +%Y-%m-%d-%H-%M)" >> $GITHUB_OUTPUT - name: Configure ccache - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ${{ env.CCACHE_DIR }} key: ${{ runner.os }}-${{ github.job }}-ccache-${{ steps.ccache_cache_timestamp.outputs.timestamp }} @@ -102,6 +102,7 @@ jobs: - name: ccache statistics run: ccache --show-stats if: ${{ env.DEBUG == '1' }} + linux-meson: name: Linux Meson Build runs-on: ubuntu-20.04 @@ -114,18 +115,18 @@ jobs: CXX: ccache g++ steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 # create and use a timestamp for the cache key: GH Actions will never update a cache # only use an existing cache item or create a new one. To use an existing cache *and* # push back the the updated cache after build, we use a always new cache key (to force # the creation of the cache item at the end) in combination with "restore-keys" as fallback - name: Prepare ccache timestamp id: ccache_cache_timestamp - run: echo "::set-output name=timestamp::$(date +%Y-%m-%d-%H-%M)" + run: echo "timestamp=$(date +%Y-%m-%d-%H-%M)" >> $GITHUB_OUTPUT - name: Configure ccache - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ${{ env.CCACHE_DIR }} key: ${{ runner.os }}-${{ github.job }}-ccache-${{ steps.ccache_cache_timestamp.outputs.timestamp }} @@ -167,62 +168,83 @@ jobs: run: ccache --show-stats if: ${{ env.DEBUG == '1' }} - mingw: - name: Mingw Build - # i686-w64-mingw32-pkg-config fails with weird error message on 20.04 - runs-on: ubuntu-18.04 + mingw64: + name: Mingw-w64 Build (Windows) + runs-on: ubuntu-20.04 + env: - CC: ccache i686-w64-mingw32-gcc - CXX: ccache i686-w64-mingw32-g++ + INFRASTRUCTURE_PATH: ${{ github.workspace }}/.infrastructure + BUILDER_PATH: ${{ github.workspace }}/.infrastructure/builders + DOCKER_REGISTRY: "ghcr.io" + DOCKER_IMAGE_NAME: "geany-mingw64-ci" + DOCKER_IMAGE_TAG: "ghcr.io/geany/geany-mingw64-ci:latest" steps: - - uses: actions/checkout@v2 - - # create and use a timestamp for the cache key: GH Actions will never update a cache - # only use an existing cache item or create a new one. To use an existing cache *and* - # push back the the updated cache after build, we use a always new cache key (to force - # the creation of the cache item at the end) in combination with "restore-keys" as fallback - - name: Prepare ccache timestamp - id: ccache_cache_timestamp - run: echo "::set-output name=timestamp::$(date +%Y-%m-%d-%H-%M)" + - name: Checkout Geany + uses: actions/checkout@v3 - - name: Configure ccache - uses: actions/cache@v2 + - name: Checkout Build Scripts + uses: actions/checkout@v3 with: - path: ${{ env.CCACHE_DIR }} - key: ${{ runner.os }}-${{ github.job }}-ccache-${{ steps.ccache_cache_timestamp.outputs.timestamp }} - restore-keys: ${{ runner.os }}-${{ github.job }}-ccache- + ref: master + repository: geany/infrastructure + path: ${{ env.INFRASTRUCTURE_PATH }} + token: ${{ github.token }} - - name: Show environment - run: env | sort - if: ${{ env.DEBUG == '1' }} + - uses: jwalton/gh-find-current-pr@v1 + id: find_pull_request + with: + state: open - - name: Install dependencies + - name: Define environment variables run: | - sudo apt-get update -qq - sudo apt-get install --assume-yes --no-install-recommends \ - ccache \ - gettext autopoint \ - libtool \ - mingw-w64-tools \ - g++-mingw-w64-i686 \ - gcc-mingw-w64-i686 \ - binutils-mingw-w64-i686 \ - doxygen \ - python3-docutils \ - python3-lxml \ - rst2pdf - # fix broken pkg-config-crosswrapper, see https://bugs.launchpad.net/ubuntu/+source/mingw-w64/+bug/1327242 - sudo sed -e 's/PKG_CONFIG_PATH=/&$PKG_CONFIG_PATH:/' -i /usr/bin/i686-w64-mingw32-pkg-config + echo "SHORT_SHA=$(git rev-parse --short HEAD)" >> $GITHUB_ENV + echo "GITHUB_PULL_REQUEST=${GITHUB_PULL_REQUEST}" >> $GITHUB_ENV + echo "GITHUB_PULL_REQUEST_OR_REF=${GITHUB_PULL_REQUEST:-${{ github.ref_name }}}" | tr '/' '-' >> $GITHUB_ENV + env: + GITHUB_PULL_REQUEST: ${{ steps.find_pull_request.outputs.pr }} - - name: Run autogen.sh + - name: Show Environment + if: ${{ env.DEBUG == '1' }} run: | - NOCONFIGURE=1 ./autogen.sh + env | sort - - name: Build + - 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: Pull Or Build Docker Image + working-directory: ${{ env.BUILDER_PATH }} + run: | + docker_image_created= + docker pull ${{ env.DOCKER_IMAGE_TAG }} || true + if $(docker image inspect ${{ env.DOCKER_IMAGE_TAG }} --format="ignored" >/dev/null 2>&1); then + docker tag ${{ env.DOCKER_IMAGE_TAG }} ${{ env.DOCKER_IMAGE_NAME }} + docker_image_created=$(docker image inspect ${{ env.DOCKER_IMAGE_NAME }} --format='{{ index .Config.Labels "org.opencontainers.image.created" }}') + echo "Docker image built on: ${docker_image_created}" + fi + + bash start_build.sh --log-to-stdout --mingw64 --rebuild-images + docker_image_created_new=$(docker image inspect ${{ env.DOCKER_IMAGE_NAME }} --format='{{ index .Config.Labels "org.opencontainers.image.created" }}') + # tag the image + if [ "${docker_image_created}" != "${docker_image_created_new}" ]; then + docker tag ${{ env.DOCKER_IMAGE_NAME }} ${{ env.DOCKER_IMAGE_TAG }} + fi + + - name: Build Geany + if: steps.geany_cache.outputs.cache-hit != 'true' + working-directory: ${{ env.BUILDER_PATH }} run: | - sh ./scripts/cross-build-mingw.sh; + bash start_build.sh --log-to-stdout --mingw64 --geany --geany-source "${{ github.workspace }}" - - name: ccache statistics - run: ccache --show-stats - if: ${{ env.DEBUG == '1' }} + - name: Archive Geany Installer + uses: actions/upload-artifact@v3 + with: + name: geany-installer-ci-${{ env.SHORT_SHA }}-pr${{ env.GITHUB_PULL_REQUEST_OR_REF }} + retention-days: 30 + path: | + ${{ env.BUILDER_PATH }}/output/mingw64/geany-*.exe + ${{ env.BUILDER_PATH }}/output/mingw64/geany-*.zip Modified: scripts/ci_mingw64_geany.sh 305 lines changed, 305 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,305 @@ +#!/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" +) + +# 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 +} + + +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 +} + + +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 +} + + +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 * +} + + +main() { + git_clone_geany_if_necessary + + parse_geany_version + log_environment + patch_version_information + build_geany + sign_geany_binaries + + 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: scripts/gtk-bundle-from-msys2.sh 1 lines changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -286,7 +286,6 @@ Other dependencies are provided by the MSYS2 project (https://msys2.github.io) and were downloaded from: EOF echo -e "${package_urls}" >> "${filename}" - unix2dos "${filename}" } create_zip_archive() { -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 4b6a4a: Merge pull request #3315 from eht16/ci_add_windows_build
by Enrico Tröger 15 Jan '23

15 Jan '23

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: GitHub <noreply(a)github.com> Date: Sun, 15 Jan 2023 17:20:58 UTC Commit: 4b6a4a1d342e2b9ac1ea9622d4a1b000238ed795 https://github.com/geany/geany/commit/4b6a4a1d342e2b9ac1ea9622d4a1b000238ed… Log Message: ----------- Merge pull request #3315 from eht16/ci_add_windows_build CI: Use MSYS2 for Windows build Modified Paths: -------------- .github/workflows/build.yml scripts/ci_mingw64_geany.sh scripts/gtk-bundle-from-msys2.sh Modified: .github/workflows/build.yml 128 lines changed, 75 insertions(+), 53 deletions(-) =================================================================== @@ -28,7 +28,7 @@ env: jobs: linux: name: Linux Build (BINRELOC=${{ matrix.binreloc }}) - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 strategy: fail-fast: false @@ -43,18 +43,18 @@ jobs: CXX: ccache g++ steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 # create and use a timestamp for the cache key: GH Actions will never update a cache # only use an existing cache item or create a new one. To use an existing cache *and* # push back the the updated cache after build, we use a always new cache key (to force # the creation of the cache item at the end) in combination with "restore-keys" as fallback - name: Prepare ccache timestamp id: ccache_cache_timestamp - run: echo "::set-output name=timestamp::$(date +%Y-%m-%d-%H-%M)" + run: echo "timestamp=$(date +%Y-%m-%d-%H-%M)" >> $GITHUB_OUTPUT - name: Configure ccache - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ${{ env.CCACHE_DIR }} key: ${{ runner.os }}-${{ github.job }}-ccache-${{ steps.ccache_cache_timestamp.outputs.timestamp }} @@ -102,6 +102,7 @@ jobs: - name: ccache statistics run: ccache --show-stats if: ${{ env.DEBUG == '1' }} + linux-meson: name: Linux Meson Build runs-on: ubuntu-20.04 @@ -114,18 +115,18 @@ jobs: CXX: ccache g++ steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 # create and use a timestamp for the cache key: GH Actions will never update a cache # only use an existing cache item or create a new one. To use an existing cache *and* # push back the the updated cache after build, we use a always new cache key (to force # the creation of the cache item at the end) in combination with "restore-keys" as fallback - name: Prepare ccache timestamp id: ccache_cache_timestamp - run: echo "::set-output name=timestamp::$(date +%Y-%m-%d-%H-%M)" + run: echo "timestamp=$(date +%Y-%m-%d-%H-%M)" >> $GITHUB_OUTPUT - name: Configure ccache - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ${{ env.CCACHE_DIR }} key: ${{ runner.os }}-${{ github.job }}-ccache-${{ steps.ccache_cache_timestamp.outputs.timestamp }} @@ -167,62 +168,83 @@ jobs: run: ccache --show-stats if: ${{ env.DEBUG == '1' }} - mingw: - name: Mingw Build - # i686-w64-mingw32-pkg-config fails with weird error message on 20.04 - runs-on: ubuntu-18.04 + mingw64: + name: Mingw-w64 Build (Windows) + runs-on: ubuntu-20.04 + env: - CC: ccache i686-w64-mingw32-gcc - CXX: ccache i686-w64-mingw32-g++ + INFRASTRUCTURE_PATH: ${{ github.workspace }}/.infrastructure + BUILDER_PATH: ${{ github.workspace }}/.infrastructure/builders + DOCKER_REGISTRY: "ghcr.io" + DOCKER_IMAGE_NAME: "geany-mingw64-ci" + DOCKER_IMAGE_TAG: "ghcr.io/geany/geany-mingw64-ci:latest" steps: - - uses: actions/checkout@v2 - - # create and use a timestamp for the cache key: GH Actions will never update a cache - # only use an existing cache item or create a new one. To use an existing cache *and* - # push back the the updated cache after build, we use a always new cache key (to force - # the creation of the cache item at the end) in combination with "restore-keys" as fallback - - name: Prepare ccache timestamp - id: ccache_cache_timestamp - run: echo "::set-output name=timestamp::$(date +%Y-%m-%d-%H-%M)" + - name: Checkout Geany + uses: actions/checkout@v3 - - name: Configure ccache - uses: actions/cache@v2 + - name: Checkout Build Scripts + uses: actions/checkout@v3 with: - path: ${{ env.CCACHE_DIR }} - key: ${{ runner.os }}-${{ github.job }}-ccache-${{ steps.ccache_cache_timestamp.outputs.timestamp }} - restore-keys: ${{ runner.os }}-${{ github.job }}-ccache- + ref: master + repository: geany/infrastructure + path: ${{ env.INFRASTRUCTURE_PATH }} + token: ${{ github.token }} - - name: Show environment - run: env | sort - if: ${{ env.DEBUG == '1' }} + - uses: jwalton/gh-find-current-pr@v1 + id: find_pull_request + with: + state: open - - name: Install dependencies + - name: Define environment variables run: | - sudo apt-get update -qq - sudo apt-get install --assume-yes --no-install-recommends \ - ccache \ - gettext autopoint \ - libtool \ - mingw-w64-tools \ - g++-mingw-w64-i686 \ - gcc-mingw-w64-i686 \ - binutils-mingw-w64-i686 \ - doxygen \ - python3-docutils \ - python3-lxml \ - rst2pdf - # fix broken pkg-config-crosswrapper, see https://bugs.launchpad.net/ubuntu/+source/mingw-w64/+bug/1327242 - sudo sed -e 's/PKG_CONFIG_PATH=/&$PKG_CONFIG_PATH:/' -i /usr/bin/i686-w64-mingw32-pkg-config + echo "SHORT_SHA=$(git rev-parse --short HEAD)" >> $GITHUB_ENV + echo "GITHUB_PULL_REQUEST=${GITHUB_PULL_REQUEST}" >> $GITHUB_ENV + echo "GITHUB_PULL_REQUEST_OR_REF=${GITHUB_PULL_REQUEST:-${{ github.ref_name }}}" | tr '/' '-' >> $GITHUB_ENV + env: + GITHUB_PULL_REQUEST: ${{ steps.find_pull_request.outputs.pr }} - - name: Run autogen.sh + - name: Show Environment + if: ${{ env.DEBUG == '1' }} run: | - NOCONFIGURE=1 ./autogen.sh + env | sort - - name: Build + - 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: Pull Or Build Docker Image + working-directory: ${{ env.BUILDER_PATH }} + run: | + docker_image_created= + docker pull ${{ env.DOCKER_IMAGE_TAG }} || true + if $(docker image inspect ${{ env.DOCKER_IMAGE_TAG }} --format="ignored" >/dev/null 2>&1); then + docker tag ${{ env.DOCKER_IMAGE_TAG }} ${{ env.DOCKER_IMAGE_NAME }} + docker_image_created=$(docker image inspect ${{ env.DOCKER_IMAGE_NAME }} --format='{{ index .Config.Labels "org.opencontainers.image.created" }}') + echo "Docker image built on: ${docker_image_created}" + fi + + bash start_build.sh --log-to-stdout --mingw64 --rebuild-images + docker_image_created_new=$(docker image inspect ${{ env.DOCKER_IMAGE_NAME }} --format='{{ index .Config.Labels "org.opencontainers.image.created" }}') + # tag the image + if [ "${docker_image_created}" != "${docker_image_created_new}" ]; then + docker tag ${{ env.DOCKER_IMAGE_NAME }} ${{ env.DOCKER_IMAGE_TAG }} + fi + + - name: Build Geany + if: steps.geany_cache.outputs.cache-hit != 'true' + working-directory: ${{ env.BUILDER_PATH }} run: | - sh ./scripts/cross-build-mingw.sh; + bash start_build.sh --log-to-stdout --mingw64 --geany --geany-source "${{ github.workspace }}" - - name: ccache statistics - run: ccache --show-stats - if: ${{ env.DEBUG == '1' }} + - name: Archive Geany Installer + uses: actions/upload-artifact@v3 + with: + name: geany-installer-ci-${{ env.SHORT_SHA }}-pr${{ env.GITHUB_PULL_REQUEST_OR_REF }} + retention-days: 30 + path: | + ${{ env.BUILDER_PATH }}/output/mingw64/geany-*.exe + ${{ env.BUILDER_PATH }}/output/mingw64/geany-*.zip Modified: scripts/ci_mingw64_geany.sh 305 lines changed, 305 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,305 @@ +#!/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" +) + +# 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 +} + + +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 +} + + +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 +} + + +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 * +} + + +main() { + git_clone_geany_if_necessary + + parse_geany_version + log_environment + patch_version_information + build_geany + sign_geany_binaries + + 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: scripts/gtk-bundle-from-msys2.sh 1 lines changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -286,7 +286,6 @@ Other dependencies are provided by the MSYS2 project (https://msys2.github.io) and were downloaded from: EOF echo -e "${package_urls}" >> "${filename}" - unix2dos "${filename}" } create_zip_archive() { -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] e2066d: Use Ubuntu 20.04 for Linux CI builds
by Enrico Tröger 15 Jan '23

15 Jan '23

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sun, 15 Jan 2023 17:10:32 UTC Commit: e2066d4f5f9600b0d8acd0ebeaeddebc93d1f15a https://github.com/geany/geany/commit/e2066d4f5f9600b0d8acd0ebeaeddebc93d1f… Log Message: ----------- Use Ubuntu 20.04 for Linux CI builds Modified Paths: -------------- .github/workflows/build.yml Modified: .github/workflows/build.yml 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -28,7 +28,7 @@ env: jobs: linux: name: Linux Build (BINRELOC=${{ matrix.binreloc }}) - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 strategy: fail-fast: false -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/infrastructure] 30c6e2: Builders: Use the "pacman" package from Debian to avoid building it
by Enrico Tröger 15 Jan '23

15 Jan '23

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sun, 11 Dec 2022 16:22:14 UTC Commit: 30c6e21bbf3b5d3997cf2bbe0173a93719e648d9 https://github.com/geany/infrastructure/commit/30c6e21bbf3b5d3997cf2bbe0173… Log Message: ----------- Builders: Use the "pacman" package from Debian to avoid building it Modified Paths: -------------- builders/Dockerfile.mingw64 builders/mingw64/etc/pacman.conf Modified: builders/Dockerfile.mingw64 77 lines changed, 20 insertions(+), 57 deletions(-) =================================================================== @@ -8,60 +8,12 @@ # and create a ready-use installer. # For more details, see build_mingw64_geany.sh where this image is used. # -# Intermediate container for building pacman -FROM debian:bullseye as build-pacman -ENV PACMAN_VERSION=6.0.1 -ENV PACMAN_SHA256="0db61456e56aa49e260e891c0b025be210319e62b15521f29d3e93b00d3bf731" +FROM debian:bullseye + ENV MSYS2_KEYRING_PKG="msys2-keyring-1~20221024-1-any.pkg.tar.zst" ENV MSYS2_KEYRING_PKG_SHA256="e90fb4413f6056dbc8b2df9eac670924aa2851151bc97569e7df12c928acc209" -RUN set -ex && \ - apt-get update && \ - apt-get install --no-install-recommends --assume-yes \ - build-essential meson wget xz-utils zstd gnupg2 file zstd ca-certificates \ - pkg-config m4 libarchive-dev libssl-dev libcurl4-gnutls-dev libgpgme-dev \ - python3-setuptools - -# compile Pacman -RUN set -ex && \ - wget --no-verbose https://sources.archlinux.org/other/pacman/pacman-${PACMAN_VERSION}.tar.xz && \ - echo "${PACMAN_SHA256} *pacman-${PACMAN_VERSION}.tar.xz" | sha256sum --check --strict - && \ - tar xf pacman-${PACMAN_VERSION}.tar.xz && \ - cd /pacman-${PACMAN_VERSION} && \ - meson \ - --prefix /usr/local \ - --sysconfdir=/windows/etc \ - --localstatedir=/windows/var \ - --buildtype release \ - --strip \ - -Dscriptlet-shell='/bin/bash' \ - -Ddoc='disabled' \ - -Ddoxygen='disabled' \ - -Ddoc='disabled' \ - -Di18n=false \ - build && \ - ninja -C build && \ - ninja -C build install && \ - ldconfig - -COPY mingw64/etc/ /windows/etc/ - -# setup pacman-key -RUN set -ex && \ - # download MSYS2 keyring - mkdir -p /usr/local/share/pacman/keyrings/ && \ - wget --no-verbose "https://repo.msys2.org/msys/x86_64/${MSYS2_KEYRING_PKG}" && \ - echo "${MSYS2_KEYRING_PKG_SHA256} *${MSYS2_KEYRING_PKG}" | sha256sum --check --strict - && \ - tar -x -C /usr/local/share/pacman/keyrings/ -f "${MSYS2_KEYRING_PKG}" --strip-components 4 usr && \ - # initialize keyring - pacman-key --init && \ - pacman-key --populate msys2 - - -# Main image -FROM debian:bullseye - LABEL org.opencontainers.image.title="Geany-Mingw-w64-CI" LABEL org.opencontainers.image.description="Build image for Geany CI to support automatic building of Windows installers." LABEL org.opencontainers.image.url="https://github.com/geany/infrastructure" @@ -72,16 +24,20 @@ LABEL org.opencontainers.image.licenses="GPL-2.0" # install native tools and libraries RUN set -ex && \ dpkg --add-architecture i386 && \ + # add Debian backports for "pacman" package manager, can be removed after updating this image to Debian Bookworm + echo "deb http://deb.debian.org/debian bullseye-backports main" > /etc/apt/sources.list.d/backports.list && \ apt-get update && \ apt-get install --no-install-recommends --assume-yes \ # libraries \ libcurl3-gnutls libgpgme11 libarchive13 libssl1.1 \ # common useful utilities \ wget curl less nano git gnupg2 file ca-certificates \ zip unzip xz-utils zstd \ + # pacman package manager \ + pacman-package-manager archlinux-keyring makepkg \ # build tools \ build-essential automake autoconf autopoint gettext libtool check cppcheck \ - # genay-plugins autogen.sh requirements + # geany-plugins autogen.sh requirements intltool libglib2.0-dev \ # mingw-w64 \ gcc-mingw-w64-x86-64 g++-mingw-w64-x86-64 mingw-w64-x86-64-dev mingw-w64-tools \ @@ -93,19 +49,26 @@ RUN set -ex && \ python3-lxml python3-docutils -# copy pacman and scripts -COPY --from=build-pacman /windows /windows -COPY --from=build-pacman /usr/local /usr/local +# copy scripts COPY mingw64/bin/ /usr/local/bin/ -RUN mkdir /build +COPY mingw64/etc/ /etc/ +RUN mkdir /build /windows WORKDIR /build # start wine to initially create config directory -RUN /usr/local/bin/mingw-w64-i686-wine hostname.exe && \ +RUN set -e && \ + /usr/local/bin/mingw-w64-i686-wine hostname.exe && \ /usr/local/bin/mingw-w64-x86_64-wine hostname.exe && \ + # download MSYS2 keyring + wget --no-verbose "https://repo.msys2.org/msys/x86_64/${MSYS2_KEYRING_PKG}" && \ + echo "${MSYS2_KEYRING_PKG_SHA256} *${MSYS2_KEYRING_PKG}" | sha256sum --check --strict - && \ + tar -x -C /usr/share/keyrings/ -f "${MSYS2_KEYRING_PKG}" --strip-components 4 usr && \ + rm "${MSYS2_KEYRING_PKG}" && \ + # initialize keyring + pacman-key --init && \ + pacman-key --populate msys2 && \ # install GTK3 and all its dependencies - ldconfig && \ pacman --noconfirm -Sy mingw-w64-x86_64-gtk3 && \ # cleanup apt-get clean && \ Modified: builders/mingw64/etc/pacman.conf 11 lines changed, 5 insertions(+), 6 deletions(-) =================================================================== @@ -1,10 +1,9 @@ [options] RootDir = /windows -DBPath = /windows/var/lib/pacman/ -CacheDir = /windows/var/cache/pacman/pkg/ -LogFile = /windows/var/log/pacman.log -GPGDir = /windows/etc/pacman.d/gnupg/ +DBPath = /var/lib/pacman/ +CacheDir = /var/cache/pacman/pkg/ +LogFile = /var/log/pacman.log HoldPkg = pacman #XferCommand = /usr/bin/curl -C - -f %u > %o #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u @@ -34,7 +33,7 @@ LocalFileSigLevel = Optional #RemoteFileSigLevel = Required [mingw64] -Include = /windows/etc/pacman.d/mirrorlist.mingw64 +Include = /etc/pacman.d/mirrorlist.mingw64 [msys] -Include = /windows/etc/pacman.d/mirrorlist.msys +Include = /etc/pacman.d/mirrorlist.msys -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/infrastructure] 4a0d1a: Merge pull request #8 from geany/builders_use_pacman_package
by Enrico Tröger 15 Jan '23

15 Jan '23

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: GitHub <noreply(a)github.com> Date: Sun, 15 Jan 2023 17:03:10 UTC Commit: 4a0d1ad4214eacfd6e59c0ac3c20df12f07bf7eb https://github.com/geany/infrastructure/commit/4a0d1ad4214eacfd6e59c0ac3c20… Log Message: ----------- Merge pull request #8 from geany/builders_use_pacman_package Builders: Use the "pacman" package from Debian to avoid building it Modified Paths: -------------- builders/Dockerfile.mingw64 builders/mingw64/etc/pacman.conf Modified: builders/Dockerfile.mingw64 77 lines changed, 20 insertions(+), 57 deletions(-) =================================================================== @@ -8,60 +8,12 @@ # and create a ready-use installer. # For more details, see build_mingw64_geany.sh where this image is used. # -# Intermediate container for building pacman -FROM debian:bullseye as build-pacman -ENV PACMAN_VERSION=6.0.1 -ENV PACMAN_SHA256="0db61456e56aa49e260e891c0b025be210319e62b15521f29d3e93b00d3bf731" +FROM debian:bullseye + ENV MSYS2_KEYRING_PKG="msys2-keyring-1~20221024-1-any.pkg.tar.zst" ENV MSYS2_KEYRING_PKG_SHA256="e90fb4413f6056dbc8b2df9eac670924aa2851151bc97569e7df12c928acc209" -RUN set -ex && \ - apt-get update && \ - apt-get install --no-install-recommends --assume-yes \ - build-essential meson wget xz-utils zstd gnupg2 file zstd ca-certificates \ - pkg-config m4 libarchive-dev libssl-dev libcurl4-gnutls-dev libgpgme-dev \ - python3-setuptools - -# compile Pacman -RUN set -ex && \ - wget --no-verbose https://sources.archlinux.org/other/pacman/pacman-${PACMAN_VERSION}.tar.xz && \ - echo "${PACMAN_SHA256} *pacman-${PACMAN_VERSION}.tar.xz" | sha256sum --check --strict - && \ - tar xf pacman-${PACMAN_VERSION}.tar.xz && \ - cd /pacman-${PACMAN_VERSION} && \ - meson \ - --prefix /usr/local \ - --sysconfdir=/windows/etc \ - --localstatedir=/windows/var \ - --buildtype release \ - --strip \ - -Dscriptlet-shell='/bin/bash' \ - -Ddoc='disabled' \ - -Ddoxygen='disabled' \ - -Ddoc='disabled' \ - -Di18n=false \ - build && \ - ninja -C build && \ - ninja -C build install && \ - ldconfig - -COPY mingw64/etc/ /windows/etc/ - -# setup pacman-key -RUN set -ex && \ - # download MSYS2 keyring - mkdir -p /usr/local/share/pacman/keyrings/ && \ - wget --no-verbose "https://repo.msys2.org/msys/x86_64/${MSYS2_KEYRING_PKG}" && \ - echo "${MSYS2_KEYRING_PKG_SHA256} *${MSYS2_KEYRING_PKG}" | sha256sum --check --strict - && \ - tar -x -C /usr/local/share/pacman/keyrings/ -f "${MSYS2_KEYRING_PKG}" --strip-components 4 usr && \ - # initialize keyring - pacman-key --init && \ - pacman-key --populate msys2 - - -# Main image -FROM debian:bullseye - LABEL org.opencontainers.image.title="Geany-Mingw-w64-CI" LABEL org.opencontainers.image.description="Build image for Geany CI to support automatic building of Windows installers." LABEL org.opencontainers.image.url="https://github.com/geany/infrastructure" @@ -72,16 +24,20 @@ LABEL org.opencontainers.image.licenses="GPL-2.0" # install native tools and libraries RUN set -ex && \ dpkg --add-architecture i386 && \ + # add Debian backports for "pacman" package manager, can be removed after updating this image to Debian Bookworm + echo "deb http://deb.debian.org/debian bullseye-backports main" > /etc/apt/sources.list.d/backports.list && \ apt-get update && \ apt-get install --no-install-recommends --assume-yes \ # libraries \ libcurl3-gnutls libgpgme11 libarchive13 libssl1.1 \ # common useful utilities \ wget curl less nano git gnupg2 file ca-certificates \ zip unzip xz-utils zstd \ + # pacman package manager \ + pacman-package-manager archlinux-keyring makepkg \ # build tools \ build-essential automake autoconf autopoint gettext libtool check cppcheck \ - # genay-plugins autogen.sh requirements + # geany-plugins autogen.sh requirements intltool libglib2.0-dev \ # mingw-w64 \ gcc-mingw-w64-x86-64 g++-mingw-w64-x86-64 mingw-w64-x86-64-dev mingw-w64-tools \ @@ -93,19 +49,26 @@ RUN set -ex && \ python3-lxml python3-docutils -# copy pacman and scripts -COPY --from=build-pacman /windows /windows -COPY --from=build-pacman /usr/local /usr/local +# copy scripts COPY mingw64/bin/ /usr/local/bin/ -RUN mkdir /build +COPY mingw64/etc/ /etc/ +RUN mkdir /build /windows WORKDIR /build # start wine to initially create config directory -RUN /usr/local/bin/mingw-w64-i686-wine hostname.exe && \ +RUN set -e && \ + /usr/local/bin/mingw-w64-i686-wine hostname.exe && \ /usr/local/bin/mingw-w64-x86_64-wine hostname.exe && \ + # download MSYS2 keyring + wget --no-verbose "https://repo.msys2.org/msys/x86_64/${MSYS2_KEYRING_PKG}" && \ + echo "${MSYS2_KEYRING_PKG_SHA256} *${MSYS2_KEYRING_PKG}" | sha256sum --check --strict - && \ + tar -x -C /usr/share/keyrings/ -f "${MSYS2_KEYRING_PKG}" --strip-components 4 usr && \ + rm "${MSYS2_KEYRING_PKG}" && \ + # initialize keyring + pacman-key --init && \ + pacman-key --populate msys2 && \ # install GTK3 and all its dependencies - ldconfig && \ pacman --noconfirm -Sy mingw-w64-x86_64-gtk3 && \ # cleanup apt-get clean && \ Modified: builders/mingw64/etc/pacman.conf 11 lines changed, 5 insertions(+), 6 deletions(-) =================================================================== @@ -1,10 +1,9 @@ [options] RootDir = /windows -DBPath = /windows/var/lib/pacman/ -CacheDir = /windows/var/cache/pacman/pkg/ -LogFile = /windows/var/log/pacman.log -GPGDir = /windows/etc/pacman.d/gnupg/ +DBPath = /var/lib/pacman/ +CacheDir = /var/cache/pacman/pkg/ +LogFile = /var/log/pacman.log HoldPkg = pacman #XferCommand = /usr/bin/curl -C - -f %u > %o #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u @@ -34,7 +33,7 @@ LocalFileSigLevel = Optional #RemoteFileSigLevel = Required [mingw64] -Include = /windows/etc/pacman.d/mirrorlist.mingw64 +Include = /etc/pacman.d/mirrorlist.mingw64 [msys] -Include = /windows/etc/pacman.d/mirrorlist.msys +Include = /etc/pacman.d/mirrorlist.msys -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/www.geany.org] e3eeb6: Fix linting
by Enrico Tröger 15 Jan '23

15 Jan '23

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sun, 15 Jan 2023 12:01:46 UTC Commit: e3eeb626a76fc1963018ceeafcef4eabd22fe309 https://github.com/geany/www.geany.org/commit/e3eeb626a76fc1963018ceeafcef4… Log Message: ----------- Fix linting Modified Paths: -------------- pastebin/forms.py pastebin/urls.py pastebin/views.py Modified: pastebin/forms.py 3 lines changed, 0 insertions(+), 3 deletions(-) =================================================================== @@ -11,10 +11,7 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -from datetime import timedelta - from django import forms -from django.utils import timezone from django.utils.translation import gettext_lazy as _ from pastebin.highlight import LEXER_DEFAULT, LEXER_LIST Modified: pastebin/urls.py 1 lines changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -13,7 +13,6 @@ from django.urls import path, re_path from django.views.decorators.cache import never_cache -from django.views.generic.base import TemplateView from pastebin.views import ( LatestSnippetsView, Modified: pastebin/views.py 4 lines changed, 0 insertions(+), 4 deletions(-) =================================================================== @@ -61,10 +61,6 @@ class SnippetNotFoundError(Exception): class SnippetDetailView(View): template_name = 'pastebin/snippet_details.html' - # ---------------------------------------------------------------------- - def dispatch(self, request, *args, **kwargs): - return super().dispatch(request, *args, **kwargs) - # ---------------------------------------------------------------------- def get(self, request, snippet_id): # load snippet -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/www.geany.org] 144b44: Remove Pastebin form and related code
by Enrico Tröger 15 Jan '23

15 Jan '23

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sun, 15 Jan 2023 11:44:27 UTC Commit: 144b4409781e1863f5d575b0d7421c0aac14deb0 https://github.com/geany/www.geany.org/commit/144b4409781e1863f5d575b0d7421… Log Message: ----------- Remove Pastebin form and related code The Pastebin is spammed a lot and not of much use anyway. So remove it. Keep the API working for the GeniusPaste plugin. Modified Paths: -------------- geany/settings.py geany/urls.py pastebin/api/create.py pastebin/forms.py pastebin/highlight.py pastebin/templates/pastebin/api.html pastebin/templates/pastebin/base.html pastebin/templates/pastebin/help.html pastebin/templates/pastebin/snippet_details.html pastebin/templates/pastebin/snippet_form.html pastebin/templates/pastebin/snippet_new.html pastebin/templates/pastebin/widgets/captcha_field.html pastebin/templates/pastebin/widgets/radio.html pastebin/templatetags/pastebin_tags.py pastebin/urls.py pastebin/views.py requirements.txt Modified: geany/settings.py 8 lines changed, 0 insertions(+), 8 deletions(-) =================================================================== @@ -330,9 +330,7 @@ # 3rd party "compressor", - "captcha", # for pastebin "django_extensions", - "honeypot", # for pastebin "mezzanine_pagedown", "mezzanine_sync_pages.apps.MezzanineSyncPagesAppConfig", # "shortener", # disabled until it is fixed for Django 4.0 or we remove it completely @@ -434,12 +432,6 @@ 'compressor.filters.cssmin.CSSMinFilter'] COMPRESS_OFFLINE = True -# django-honeypot -HONEYPOT_FIELD_NAME = 'website' -CAPTCHA_CHALLENGE_FUNCT = 'captcha.helpers.math_challenge' -CAPTCHA_NOISE_FUNCTIONS = ('captcha.helpers.noise_dots',) -CAPTCHA_MATH_CHALLENGE_OPERATOR = '*' - NIGHTLYBUILDS_BASE_DIR = '/path/to/nightly/builds' STATIC_DOCS_GITHUB_API_TOKEN = None Modified: geany/urls.py 1 lines changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -61,7 +61,6 @@ # Pastebin path('p/', include('pastebin.urls')), - path('captcha/', include('captcha.urls')), # URL Shortener # path('s/', include('urlshortener.urls')), # disabled until it is fixed for Django 4.0 Modified: pastebin/api/create.py 3 lines changed, 1 insertions(+), 2 deletions(-) =================================================================== @@ -102,7 +102,7 @@ def _validate_passed_fields(self): def _validate_against_snippet_form(self): self._preprocess_data() - snippet_form = SnippetForm(request=self._request, data=self._data) + snippet_form = SnippetForm(data=self._data) # SnippetForm allows only a subset of lexer choices except the user enables all lexers # in her session but since we don't have a session here, we allow all unconditionally snippet_form.fields['lexer'].choices = LEXER_LIST_ALL @@ -115,7 +115,6 @@ def _validate_against_snippet_form(self): # ---------------------------------------------------------------------- def _preprocess_data(self): - # compatibility with SnippetForm self._data['expire_options'] = self._data.get('expires', 3600) # try to map lexer from a Geany filetype name to a Pygments lexer name # fallback to 'text' as default, also use that default in case no lexer was given at all Modified: pastebin/forms.py 60 lines changed, 7 insertions(+), 53 deletions(-) =================================================================== @@ -13,7 +13,6 @@ from datetime import timedelta -from captcha.fields import CaptchaField, CaptchaTextInput from django import forms from django.utils import timezone from django.utils.translation import gettext_lazy as _ @@ -36,15 +35,6 @@ EXPIRE_DEFAULT = 3600 * 24 * 30 -class ExpiryOptionsWidget(forms.RadioSelect): - template_name = 'pastebin/widgets/radio.html' - option_inherits_attrs = False - - -class CaptchaTextInputWidget(CaptchaTextInput): - template_name = 'pastebin/widgets/captcha_field.html' - - class SnippetForm(forms.ModelForm): lexer = forms.ChoiceField( @@ -57,19 +47,15 @@ class SnippetForm(forms.ModelForm): choices=EXPIRE_CHOICES, initial=EXPIRE_DEFAULT, label=_('Expires'), - widget=ExpiryOptionsWidget, ) - captcha = CaptchaField(widget=CaptchaTextInputWidget(attrs={ - 'placeholder': 'Please solve the challenge'})) - - # ---------------------------------------------------------------------- - def __init__(self, request, *args, **kwargs): - forms.ModelForm.__init__(self, *args, **kwargs) - self.request = request - self.fields['captcha'].label = 'Verification' - # set author - self.fields['author'].initial = self.request.session.get('author', '') + class Meta: + model = Snippet + fields = ( + 'content', + 'title', + 'author', + 'lexer',) # ---------------------------------------------------------------------- def _clean_field(self, field_name): @@ -92,35 +78,3 @@ def clean_content(self): # ---------------------------------------------------------------------- def clean_title(self): return self._clean_field('title') - - # ---------------------------------------------------------------------- - def save(self, *args, **kwargs): # pylint: disable=signature-differs - # Set parent snippet - parent = kwargs.pop('parent', None) - if parent: - self.instance.parent = parent - - # Add expire datestamp - self.instance.expires = timezone.now() + \ - timedelta(seconds=int(self.cleaned_data['expire_options'])) - - # Save snippet in the db - super().save(self, *args, **kwargs) - - # Add snippet to the user's session - if not self.request.session.get('snippet_list', False): - self.request.session['snippet_list'] = [] - self.request.session['snippet_list'].append(self.instance.pk) - - # Remember author - self.request.session['author'] = self.instance.author - - return self.request, self.instance - - class Meta: - model = Snippet - fields = ( - 'content', - 'title', - 'author', - 'lexer',) Modified: pastebin/highlight.py 7 lines changed, 5 insertions(+), 2 deletions(-) =================================================================== @@ -61,8 +61,11 @@ def wrap(self, source): # ---------------------------------------------------------------------- def _wrap_code(self, inner): - for code, text in inner: - yield code, text + yield from inner + + # ---------------------------------------------------------------------- + def _wrap_div(self, inner): + yield from inner # ---------------------------------------------------------------------- Modified: pastebin/templates/pastebin/api.html 88 lines changed, 0 insertions(+), 88 deletions(-) =================================================================== @@ -1,88 +0,0 @@ -{% extends "pastebin/base.html" %} - -{% block meta_title %} - API Usage | {{ block.super }} -{% endblock %} - - -{% block main %} -<div class="well"> - -<h1>API</h1> - -<p>The following Python 3 code can be used as a simple command line client for this -Pastebin service:</p> - -<pre>#!/usr/bin/env python - -import urllib.request, urllib.parse, urllib.error -import urllib.request, urllib.error, urllib.parse -import os -import sys - -def paste_code(): - fields = [] - fields.append(('content', ''.join(sys.stdin.readlines()))) - fields.append(('author', os.getlogin())) - fields.append(('lexer', 'python')) - encoded_data = urllib.parse.urlencode(fields).encode('utf-8') - request = urllib.request.Request( - '{{ request.scheme }}://{{ request.get_host }}{% url 'snippet_api' %}', - encoded_data, - ) - response = urllib.request.urlopen(request) - response_content = response.read() - print(response_content.decode()) - -if __name__ == '__main__': - paste_code()</pre> - -<p>Save this script in <code>/usr/local/bin/gpaste</code> and <code>chmod +x /usr/local/bin/gpaste/</code>.</p> -<p>Usage: <code>cat foo.txt | gpaste</code></p> - -<h2>Supported fields</h2> -<p>The only mandatory field is <strong>content</strong> which should contain the text to be pasted.</p> -<p>Other accepted, optional fields are: -<table class="table table-striped table-bordered"> -<thead> - <tr> - <th>Field</th> - <th>Possible values</th> - <th>Description</th> - </tr> -</thead> -<tbody> - <tr> - <td class="nowrap">expires</td> - <td> - <ul> - <li>3600 (1 hour)</li> - <li>604800 (1 week)</li> - <li>2592000 (1 month)</li> - </ul> - </td> - <td>Time to live in seconds, defaults to 3600</td> - </tr> - <tr> - <td>title</td> - <td class="nowrap">Maximum 120 characters</td> - <td>The title of this paste</td> - </tr> - <tr> - <td>author</td> - <td class="nowrap">Maximum 30 characters</td> - <td>The author's name</td> - </tr> - <tr> - <td>lexer</td> - <td class="nowrap">python, text, php, perl, c, bash, ...</td> - <td>The lexer to be used, all lexers supported by Pygments are possible and - also most of Geany's filetype names (<code>geany --ft-names</code>) - </td> - </tr> -</tbody> -</table> -</p> - -</div> -{% endblock %} Modified: pastebin/templates/pastebin/base.html 12 lines changed, 0 insertions(+), 12 deletions(-) =================================================================== @@ -8,9 +8,6 @@ {% endblock %} {% block top_menu %} -{% url 'snippet_new' as url_snippet_new %} -{% url 'snippet_help' as url_help %} -{% url 'snippet_help_api' as url_api %} {% url 'snippet_list' as url_snippet_list %} <div class="navbar navbar-inverse navbar-fixed-top"> @@ -27,15 +24,6 @@ <div class="navbar-collapse collapse" id="navbar"> <ul class="nav navbar-nav" id="navbar"> - <li class="{% if request.path == url_snippet_new %} active{% endif %}"> - <a href="{{ url_snippet_new }}">New snippet</a> - </li> - <li class="{% if request.path == url_help %} active{% endif %}"> - <a href="{{ url_help }}">Help</a> - </li> - <li class="{% if request.path == url_api %} active{% endif %}"> - <a href="{{ url_api }}">API</a> - </li> <li class="{% if request.path == url_snippet_list %} active{% endif %}"> <a href="{{ url_snippet_list }}">Recent snippets</a> </li> Modified: pastebin/templates/pastebin/help.html 27 lines changed, 0 insertions(+), 27 deletions(-) =================================================================== @@ -1,27 +0,0 @@ -{% extends "pastebin/base.html" %} - -{% block meta_title %} - Help | {{ block.super }} -{% endblock %} - -{% block main %} -<div class="well"> -<h1>Frequently Asked Questions</h1> - -<h2>What is pastebin?</h2> -<p>This pastebin is here to help you collaborate on debugging code snippets. If you're not familiar with the idea, -most people use it like this:</p> -<ul> -<li><a href="{% url 'snippet_new' %}">submit</a> a code fragment to pastebin, -getting a url like {{ request.scheme }}://{{ request.get_host }}{% url 'snippet_details' 'abc1234' %}</li> -<li>paste the url into an IRC or IM conversation</li> -<li>someone responds by reading and perhaps submitting a modification of your code</li> -</ul> - -<h2>How can I delete a post?</h2> -<p>Your posted snippets are remembered in your session, you will be able to delete the snippet from the same browser you posted from - -simply view the post and click the "delete" link.</p> -<p>In other cases, contact us and we will delete it for you.</p> - -</div> -{% endblock %} Modified: pastebin/templates/pastebin/snippet_details.html 15 lines changed, 5 insertions(+), 10 deletions(-) =================================================================== @@ -16,10 +16,6 @@ <h1> <div class="snippet-options"> <abbr title="Time to life">TTL:</abbr> {{ snippet.expires|timeuntil_or_forever }} — - {% if snippet.pk|in_list:request.session.snippet_list %} - <a onclick="return confirm('Really delete this snippet?')" href="{% url 'snippet_delete' snippet.secret_id %}">Delete</a> - — - {% endif %} {% if snippet.parent_id %} (Copy of <a href="{{ snippet.parent.get_absolute_url }}">snippet #{{ snippet.parent.id }}</a>) — @@ -31,14 +27,13 @@ <h1> <p>on <span class="date">{{ snippet.published|date:"Y/m/d G:i:s" }} (UTC)</span> by {% if snippet.author %}{{ snippet.author }}{% else %}Anonymous{% endif %} as {{ snippet.lexer|title }}</p> - <div class="tabbable"> - <ul class="nav nav-tabs"> - <li class="active"><a href="#tab1" data-toggle="tab">Markup</a></li> - <li><a href="#tab2" data-toggle="tab">Plain</a></li> + <ul class="nav nav-tabs" role="tablist"> + <li role="presentation" class="active"><a href="#markup" data-toggle="tab" aria-controls="markup" role="tab">Markup</a></li> + <li role="presentation"><a href="#plain" data-toggle="tab" aria-controls="plain" role="tab">Plain</a></li> </ul> <div class="tab-content"> - <div class="tab-pane active" id="tab1"> + <div class="tab-pane active" role="tabpanel" id="markup"> <div class="snippet"> <ol> {% for line in snippet|highlight %} @@ -49,7 +44,7 @@ <h1> </ol> </div> </div> - <div class="tab-pane" id="tab2"> + <div class="tab-pane" role="tabpanel" id="plain"> <div class="snippet-plain"> <textarea class="snippet-plain">{{ snippet.content }}</textarea> </div> Modified: pastebin/templates/pastebin/snippet_form.html 41 lines changed, 0 insertions(+), 41 deletions(-) =================================================================== @@ -1,41 +0,0 @@ -{% load geany_tags honeypot i18n mezzanine_tags %} - -{% if snippet_form.non_field_errors or snippet_form.errors %} -<div class="form-errors"> - {% for error in snippet_form.non_field_errors %} - <div class="alert alert-danger non-field-error">{{ error }}</div> - {% empty %} - <div class="alert alert-danger field-error">{% trans "Please correct the errors below." %}</div> - {% endfor %} -</div> -{% endif %} - -<form method="post" action="{% url 'snippet_new' %}" class="form-horizontal new-snippet-form" role="form"> -{% csrf_token %} -{% render_honeypot_field %} -{% for field in snippet_form %} - <div> - <div class="form-group input_{{ field.id_for_label }} {{ field.field.type }} - {% if field.errors %} has-error{% endif %}"> - <label class="control-label col-sm-2" for="{{ field.auto_id }}">{{ field.label }}</label> - <div class="col-sm-10"> - {{ field|add_css:"form-control input-sm" }} - {% if field.errors %} - <p class="help-block"> - {% for e in field.errors %} - {% if not forloop.first %} / {% endif %}{{ e }} - {% endfor %} - </p> - {% endif %} - </div> - </div> - </div> -{% endfor %} -<div class="form-group"> - <div class="controls"> - <div class="col-sm-offset-2 col-sm-10"> - <button type="submit" class="btn btn-primary">{% trans "Paste it" %}</button> - </div> - </div> -</div> -</form> Modified: pastebin/templates/pastebin/snippet_new.html 24 lines changed, 0 insertions(+), 24 deletions(-) =================================================================== @@ -1,24 +0,0 @@ -{% extends "pastebin/base.html" %} - -{% block extra_js %} -{{ block.super }} -<script> -$(function() {$('.mezzanine-form :input:visible:enabled:first').focus();}); -</script> -{% endblock %} - - -{% block meta_title %} - New snippet | {{ block.super }} -{% endblock %} - - -{% block main %} -<div class="well"> - <h1>Paste a new snippet</h1> - {% include "pastebin/snippet_form.html" %} - - {% include "pastebin/snippet_list_embedded.html" %} - -</div> -{% endblock %} Modified: pastebin/templates/pastebin/widgets/captcha_field.html 6 lines changed, 0 insertions(+), 6 deletions(-) =================================================================== @@ -1,6 +0,0 @@ -{% spaceless %} -<div class="radio-inline new-snippet-form-no-padding-left""><img src="{{ image }}" alt="captcha" class="captcha" /></div> -<div class="radio-inline new-snippet-form-no-padding-left"> -{% include "django/forms/widgets/multiwidget.html" %} -</div> -{% endspaceless %} Modified: pastebin/templates/pastebin/widgets/radio.html 5 lines changed, 0 insertions(+), 5 deletions(-) =================================================================== @@ -1,5 +0,0 @@ -{% with id=widget.attrs.id %}<div{% if id %} id="{{ id }}"{% endif %}{% if widget.attrs.class %} {{ widget.attrs.class }}"{% endif %}>{% for group, options, index in widget.optgroups %}{% if group %} - <div><label>{{ group }}</label>{% endif %}{% for option in options %}<div class="radio-inline"> - {% include option.template_name with widget=option %}</div>{% endfor %}{% if group %} - </div>{% endif %}{% endfor %} -</div>{% endwith %} Modified: pastebin/templatetags/pastebin_tags.py 6 lines changed, 0 insertions(+), 6 deletions(-) =================================================================== @@ -25,12 +25,6 @@ register = Library() -# ---------------------------------------------------------------------- -(a)register.filter -def in_list(value, arg): - return value in arg - - # ---------------------------------------------------------------------- @register.filter def timeuntil_or_forever(snippet_expire): Modified: pastebin/urls.py 17 lines changed, 1 insertions(+), 16 deletions(-) =================================================================== @@ -18,35 +18,20 @@ from pastebin.views import ( LatestSnippetsView, SnippetAPIView, - SnippetDeleteView, SnippetDetailRawView, SnippetDetailView, - SnippetNewView, ) urlpatterns = ( # pylint: disable=invalid-name - path( - 'help/', - TemplateView.as_view(template_name='pastebin/help.html'), - name='snippet_help'), - path( - 'help/api/', - TemplateView.as_view(template_name='pastebin/api.html'), - name='snippet_help_api'), - path('api/', never_cache(SnippetAPIView.as_view()), name='snippet_api'), - path('', never_cache(SnippetNewView.as_view()), name='snippet_new'), + path('', never_cache(LatestSnippetsView.as_view()), name='snippet_list'), path('latest/', never_cache(LatestSnippetsView.as_view()), name='snippet_list'), re_path( r'^(?P<snippet_id>[a-zA-Z0-9]+)/$', SnippetDetailView.as_view(), name='snippet_details'), - re_path( - r'^(?P<snippet_id>[a-zA-Z0-9]+)/delete/$', - SnippetDeleteView.as_view(), - name='snippet_delete'), re_path( r'^(?P<snippet_id>[a-zA-Z0-9]+)/raw/$', SnippetDetailRawView.as_view(), Modified: pastebin/views.py 75 lines changed, 7 insertions(+), 68 deletions(-) =================================================================== @@ -15,29 +15,28 @@ from django.contrib.sites.models import Site from django.core.cache import cache from django.core.exceptions import MultipleObjectsReturned, ObjectDoesNotExist -from django.http import HttpResponse, HttpResponseBadRequest, HttpResponseRedirect -from django.shortcuts import get_object_or_404, render +from django.http import HttpResponse, HttpResponseBadRequest +from django.shortcuts import render from django.template.response import TemplateResponse -from django.urls import reverse +from django.utils import timezone from django.utils.decorators import method_decorator from django.utils.translation import gettext_lazy as _ from django.views.decorators.csrf import csrf_exempt from django.views.generic.base import TemplateView, View -from honeypot.decorators import check_honeypot from geany.decorators import CACHE_TIMEOUT_24HOURS from pastebin.api.create import CreateSnippetApiController, SnippetValidationError -from pastebin.forms import SnippetForm from pastebin.models import CACHE_KEY_SNIPPET_LIST_FULL, CACHE_KEY_SNIPPET_LIST_NO_CONTENT, Snippet # ---------------------------------------------------------------------- def _get_snippet_list(no_content=False): + base_queryset = Snippet.objects.filter(published__lte=timezone.now()) if no_content: - queryset = Snippet.objects.defer('content', 'content_highlighted') + queryset = base_queryset.defer('content', 'content_highlighted') cache_key = CACHE_KEY_SNIPPET_LIST_NO_CONTENT else: - queryset = Snippet.objects.all() + queryset = base_queryset.all() cache_key = CACHE_KEY_SNIPPET_LIST_FULL # snippet list in cache? @@ -55,35 +54,6 @@ def _get_snippet_list(no_content=False): return snippet_list -class SnippetNewView(View): - template_name = 'pastebin/snippet_new.html' - - # ---------------------------------------------------------------------- - @method_decorator(check_honeypot) - def dispatch(self, request, *args, **kwargs): - return super().dispatch(request, *args, **kwargs) - - # ---------------------------------------------------------------------- - def get(self, request): - snippet_form = SnippetForm(request=request) - return self._render_response(request, snippet_form) - - # ---------------------------------------------------------------------- - def _render_response(self, request, snippet_form): - snippet_list = _get_snippet_list(no_content=True) - template_context = dict(snippet_form=snippet_form, snippet_list=snippet_list) - return render(request, self.template_name, template_context) - - # ---------------------------------------------------------------------- - def post(self, request): - snippet_form = SnippetForm(data=request.POST, request=request) - if snippet_form.is_valid(): - request, new_snippet = snippet_form.save() - return HttpResponseRedirect(new_snippet.get_absolute_url()) - - return self._render_response(request, snippet_form) - - class SnippetNotFoundError(Exception): pass @@ -92,7 +62,6 @@ class SnippetDetailView(View): template_name = 'pastebin/snippet_details.html' # ---------------------------------------------------------------------- - @method_decorator(check_honeypot) def dispatch(self, request, *args, **kwargs): return super().dispatch(request, *args, **kwargs) @@ -106,13 +75,9 @@ def get(self, request, snippet_id): context = dict(message=exc) return TemplateResponse(request, 'errors/404.html', context=context, status=404) - new_snippet_initial = dict(content=snippet.content, lexer=snippet.lexer) - snippet_form = SnippetForm(initial=new_snippet_initial, request=request) - snippet_list_ = _get_snippet_list(no_content=True) template_context = { 'snippet_list': snippet_list_, - 'snippet_form': snippet_form, 'snippet': snippet, 'lines': range(snippet.get_linecount()), } @@ -122,7 +87,7 @@ def get(self, request, snippet_id): # ---------------------------------------------------------------------- def _fetch_snippet(self, snippet_id): try: - snippet = Snippet.objects.get(secret_id=snippet_id) + snippet = Snippet.objects.get(secret_id=snippet_id, published__lte=timezone.now()) except MultipleObjectsReturned as exc: raise SnippetNotFoundError( _('Multiple snippets exist for this slug. This should never happen.') @@ -146,32 +111,6 @@ def get(self, request, snippet_id): return response -class SnippetDeleteView(View): - - # ---------------------------------------------------------------------- - def get(self, request, snippet_id): - snippet = get_object_or_404(Snippet, secret_id=snippet_id) - try: - snippet_list_ = request.session['snippet_list'] - except KeyError: - # 403 response with custom message - return TemplateResponse( - request, - 'errors/403.html', - context=dict(message=_('You have no recent snippet list, cookie error?')), - status=403) - if snippet.pk not in snippet_list_: - # 403 response with custom message - return TemplateResponse( - request, - 'errors/403.html', - context=dict(message=_('That is not your snippet!')), - status=403) - - snippet.delete() - return HttpResponseRedirect(reverse('snippet_new')) - - class LatestSnippetsView(TemplateView): template_name = 'pastebin/snippet_list.html' Modified: requirements.txt 2 lines changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -4,10 +4,8 @@ mysqlclient django-clearcache django-compressor django-extensions -django-honeypot django-link-shortener django-log-request-id -django-simple-captcha mezzanine-pagedown mezzanine-sync-pages packaging -------------- 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 January 2023