Branch: refs/heads/add_ci_builders Author: Enrico Tröger enrico.troeger@uvena.de Committer: Enrico Tröger enrico.troeger@uvena.de Date: Sun, 20 Feb 2022 17:27:40 UTC Commit: f01890e100abd9c9212e2c238b042823a0086313 https://github.com/geany/infrastructure/commit/f01890e100abd9c9212e2c238b042...

Log Message: ----------- Implement using an existing geany(-plugins) source tree for building

Modified Paths: -------------- builders/README.md builders/start_build.sh

Modified: builders/README.md 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -56,12 +56,16 @@ the builds of Geany and Geany-Plugins for the various targets. -d, --distro DISTRO Build for target Debian DISTRO (e.g. "bullseye", can be specified multiple times -g, --geany Build Geany + --geany-source Path to a Geany source directory (optional, cloned from GIT if missing) + --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 -m, --mingw Build for target Mingw-w64 -p, --geany-plugins Build Geany-Plugins -r, --rebuild-images Rebuild Docker images before start building (images are rebuilt automatically every 30 days) + -s, --sudo Use "sudo" for Docker commands +

Example to build Geany and Geany-Plugins for Debian Bullseye, Debian Sid and Windows:

Modified: builders/start_build.sh 23 lines changed, 19 insertions(+), 4 deletions(-) =================================================================== @@ -14,12 +14,15 @@ # -d, --distro DISTRO Build for target Debian DISTRO (e.g. "bullseye", # can be specified multiple times # -g, --geany Build Geany +# --geany-source Path to a Geany source directory (optional, cloned from GIT if missing) +# --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 # -m, --mingw Build for target Mingw-w64 # -p, --geany-plugins Build Geany-Plugins # -r, --rebuild-images Rebuild Docker images before start building # (images are rebuilt automatically every 30 days) +# -s, --sudo Use "sudo" for Docker commands

DOCKER_IMAGE_MAX_AGE_DAYS=30 @@ -145,7 +148,7 @@ build_mingw() { if [ -n "${DO_GEANY}" ]; then log - "Building Geany for Windows" if [ -n "${GEANY_SOURCE}" ]; then - source_volume="--volume "${GEANY_SOURCE}:/geany-source/":ro" + source_volume="--volume ${GEANY_SOURCE}:/geany-source/:ro" else source_volume= fi @@ -166,7 +169,7 @@ build_mingw() { if [ -n "${DO_GEANY_PLUGINS}" ]; then log - "Building Geany-Plugins for Windows" if [ -n "${GEANY_PLUGINS_SOURCE}" ]; then - source_volume="--volume "${GEANY_PLUGINS_SOURCE}:/geany-plugins-source/":ro" + source_volume="--volume ${GEANY_PLUGINS_SOURCE}:/geany-plugins-source/:ro" else source_volume= fi @@ -191,8 +194,8 @@ 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-source Path to a Geany source directory (optional)" - echo "--geany-plugins-source Path to a Geany-Plugins source directory (optional)" + echo "--geany-source Path to a Geany source directory (optional, cloned from GIT if missing)" + 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" echo " -m, --mingw Build for target Mingw-w64" @@ -219,6 +222,16 @@ parse_command_line_options() { DO_GEANY=1 shift ;; + --geany-source) + GEANY_SOURCE="${2}" + shift + shift + ;; + --geany-plugins-source) + GEANY_PLUGINS_SOURCE="${2}" + shift + shift + ;; -l|--log-to-stdout) DO_LOG_TO_STDOUT=1 shift @@ -253,6 +266,8 @@ DO_IMAGE_REBUILD= DO_GEANY= DO_GEANY_PLUGINS= DO_LOG_TO_STDOUT= +GEANY_SOURCE= +GEANY_PLUGINS_SOURCE=

main() {

-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).