Plugins-Commits March 2016

plugins-commits@lists.geany.org

1 participants
106 discussions

[geany/geany-plugins] 69af4d: Try and reduce code duplication while simplifying altering paths
by Colomban Wendling 12 Mar '16

12 Mar '16

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sat, 12 Mar 2016 18:58:39 UTC Commit: 69af4d80499424cbae03cf1cc18123eb147e369a https://github.com/geany/geany-plugins/commit/69af4d80499424cbae03cf1cc1812… Log Message: ----------- Try and reduce code duplication while simplifying altering paths Modified Paths: -------------- build/vars.build.mk Modified: build/vars.build.mk 50 lines changed, 27 insertions(+), 23 deletions(-) =================================================================== @@ -1,32 +1,36 @@ if MINGW -LOCAL_AM_CFLAGS = \ - -DLOCALEDIR=\""share/locale"\" \ - -DPREFIX=\"\" \ - -DDOCDIR=\""share/doc/$(PACKAGE)"\" \ - -DGEANYPLUGINS_DATADIR=\""share"\" \ - -DPKGDATADIR=\""share/$(PACKAGE)"\" \ - -DLIBDIR=\""lib"\" \ - -DPKGLIBDIR=\""lib/$(PACKAGE)"\" \ - -DPLUGINDATADIR=\""share/$(PACKAGE)/$(plugin)"\" \ - -DPLUGINDOCDIR=\""$(plugin)"\" \ - -DPLUGINLIBDIR=\""lib/$(PACKAGE)/$(plugin)"\" +GP_PREFIX = . +GP_DATADIR = $(GP_PREFIX)/share +GP_LOCALEDIR = $(GP_DATADIR)/locale +GP_DOCDIR = $(GP_DATADIR)/doc/$(PACKAGE) +GP_PKGDATADIR = $(GP_DATADIR)/$(PACKAGE) +GP_LIBDIR = $(GP_PREFIX)/lib +GP_PKGLIBDIR = $(GP_LIBDIR)/$(PACKAGE) else -LOCAL_AM_CFLAGS = \ - -DLOCALEDIR=\""$(LOCALEDIR)"\" \ - -DPREFIX=\""$(prefix)"\" \ - -DDOCDIR=\""$(docdir)"\" \ - -DGEANYPLUGINS_DATADIR=\""$(datadir)"\" \ - -DPKGDATADIR=\""$(pkgdatadir)"\" \ - -DLIBDIR=\""$(libdir)"\" \ - -DPKGLIBDIR=\""$(pkglibdir)"\" \ - -DPLUGINDATADIR=\""$(pkgdatadir)/$(plugin)"\" \ - -DPLUGINDOCDIR=\""$(docdir)/$(plugin)"\" \ - -DPLUGINLIBDIR=\""$(pkglibdir)/$(plugin)"\" +GP_PREFIX = $(prefix) +GP_DATADIR = $(datadir) +GP_LOCALEDIR = $(LOCALEDIR) +GP_DOCDIR = $(docdir) +GP_PKGDATADIR = $(pkgdatadir) +GP_LIBDIR = $(libdir) +GP_PKGLIBDIR = $(pkglibdir) endif +LOCAL_AM_CFLAGS = \ + -DLOCALEDIR=\""$(GP_LOCALEDIR)"\" \ + -DPREFIX=\""$(GP_PREFIX)"\" \ + -DDOCDIR=\""$(GP_DOCDIR)"\" \ + -DGEANYPLUGINS_DATADIR=\""$(GP_DATADIR)"\" \ + -DPKGDATADIR=\""$(GP_PKGDATADIR)"\" \ + -DLIBDIR=\""$(GP_LIBDIR)"\" \ + -DPKGLIBDIR=\""$(GP_PKGLIBDIR)"\" \ + -DPLUGINDATADIR=\""$(GP_PKGDATADIR)/$(plugin)"\" \ + -DPLUGINDOCDIR=\""$(GP_DOCDIR)/$(plugin)"\" \ + -DPLUGINLIBDIR=\""$(GP_PKGLIBDIR)/$(plugin)"\" \ + -DPLUGIN="\"$(plugin)\"" + AM_CFLAGS = \ ${LOCAL_AM_CFLAGS} \ - -DPLUGIN="\"$(plugin)\"" \ $(GEANY_CFLAGS) \ $(GP_CFLAGS) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] c0e95a: Define PLUGIN{DATA, DOC, LIB}DIR more explicitly to try and make MSYS2 happy
by Colomban Wendling 12 Mar '16

12 Mar '16

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sat, 12 Mar 2016 18:45:25 UTC Commit: c0e95ae275254025c4650f5e3c95f20c582f16ac https://github.com/geany/geany-plugins/commit/c0e95ae275254025c4650f5e3c95f… Log Message: ----------- Define PLUGIN{DATA,DOC,LIB}DIR more explicitly to try and make MSYS2 happy Modified Paths: -------------- build/vars.build.mk Modified: build/vars.build.mk 13 lines changed, 8 insertions(+), 5 deletions(-) =================================================================== @@ -6,7 +6,10 @@ LOCAL_AM_CFLAGS = \ -DGEANYPLUGINS_DATADIR=\""share"\" \ -DPKGDATADIR=\""share/$(PACKAGE)"\" \ -DLIBDIR=\""lib"\" \ - -DPKGLIBDIR=\""lib/$(PACKAGE)"\" + -DPKGLIBDIR=\""lib/$(PACKAGE)"\" \ + -DPLUGINDATADIR=\""share/$(PACKAGE)/$(plugin)"\" \ + -DPLUGINDOCDIR=\""$(plugin)"\" \ + -DPLUGINLIBDIR=\""lib/$(PACKAGE)/$(plugin)"\" else LOCAL_AM_CFLAGS = \ -DLOCALEDIR=\""$(LOCALEDIR)"\" \ @@ -15,15 +18,15 @@ LOCAL_AM_CFLAGS = \ -DGEANYPLUGINS_DATADIR=\""$(datadir)"\" \ -DPKGDATADIR=\""$(pkgdatadir)"\" \ -DLIBDIR=\""$(libdir)"\" \ - -DPKGLIBDIR=\""$(pkglibdir)"\" + -DPKGLIBDIR=\""$(pkglibdir)"\" \ + -DPLUGINDATADIR=\""$(pkgdatadir)/$(plugin)"\" \ + -DPLUGINDOCDIR=\""$(docdir)/$(plugin)"\" \ + -DPLUGINLIBDIR=\""$(pkglibdir)/$(plugin)"\" endif AM_CFLAGS = \ ${LOCAL_AM_CFLAGS} \ -DPLUGIN="\"$(plugin)\"" \ - -DPLUGINDATADIR="PKGDATADIR\"/\"PLUGIN" \ - -DPLUGINDOCDIR="DOCDIR\"/\"PLUGIN" \ - -DPLUGINLIBDIR="PKGLIBDIR\"/\"PLUGIN" \ $(GEANY_CFLAGS) \ $(GP_CFLAGS) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 85ed43: Define PLUGIN and PLUGIN{DATA, DOC, LIB}DIR for all plugins
by Colomban Wendling 12 Mar '16

12 Mar '16

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sat, 12 Mar 2016 18:36:06 UTC Commit: 85ed43873e440b11781140f0ae43e9d733a7e744 https://github.com/geany/geany-plugins/commit/85ed43873e440b11781140f0ae43e… Log Message: ----------- Define PLUGIN and PLUGIN{DATA,DOC,LIB}DIR for all plugins This helps for locating data files, and to define those appropriately depending on the platform (Windows). Modified Paths: -------------- addons/src/Makefile.am autoclose/src/Makefile.am automark/src/Makefile.am build/vars.build.mk codenav/src/Makefile.am commander/src/Makefile.am defineformat/src/Makefile.am geanyctags/src/Makefile.am geanydoc/src/Makefile.am geanydoc/tests/Makefile.am geanyextrasel/src/Makefile.am geanyinsertnum/src/Makefile.am geanylatex/src/Makefile.am geanylipsum/src/Makefile.am geanymacro/src/Makefile.am geanyminiscript/src/Makefile.am geanynumberedbookmarks/src/Makefile.am geanypg/src/Makefile.am geanyprj/src/Makefile.am geanypy/src/Makefile.am geanysendmail/src/Makefile.am geanyvc/src/Makefile.am geniuspaste/src/Makefile.am git-changebar/src/Makefile.am lineoperations/src/Makefile.am pairtaghighlighter/src/Makefile.am pretty-printer/src/Makefile.am projectorganizer/src/Makefile.am scope/src/Makefile.am shiftcolumn/src/Makefile.am spellcheck/src/Makefile.am tableconvert/src/Makefile.am treebrowser/src/Makefile.am xmlsnippets/src/Makefile.am Modified: addons/src/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -1,4 +1,5 @@ include $(top_srcdir)/build/vars.build.mk +plugin = addons geanyplugins_LTLIBRARIES = addons.la Modified: autoclose/src/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -1,4 +1,5 @@ include $(top_srcdir)/build/vars.build.mk +plugin = autoclose geanyplugins_LTLIBRARIES = autoclose.la Modified: automark/src/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -1,4 +1,5 @@ include $(top_srcdir)/build/vars.build.mk +plugin = automark geanyplugins_LTLIBRARIES = automark.la Modified: build/vars.build.mk 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -20,6 +20,10 @@ endif AM_CFLAGS = \ ${LOCAL_AM_CFLAGS} \ + -DPLUGIN="\"$(plugin)\"" \ + -DPLUGINDATADIR="PKGDATADIR\"/\"PLUGIN" \ + -DPLUGINDOCDIR="DOCDIR\"/\"PLUGIN" \ + -DPLUGINLIBDIR="PKGLIBDIR\"/\"PLUGIN" \ $(GEANY_CFLAGS) \ $(GP_CFLAGS) Modified: codenav/src/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -1,4 +1,5 @@ include $(top_srcdir)/build/vars.build.mk +plugin = codenav geanyplugins_LTLIBRARIES = codenav.la Modified: commander/src/Makefile.am 1 lines changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -6,7 +6,6 @@ geanyplugins_LTLIBRARIES = commander.la commander_la_SOURCES = commander-plugin.c commander_la_CPPFLAGS = $(AM_CPPFLAGS) \ - -DPLUGIN=\"$(plugin)\" \ -DG_LOG_DOMAIN=\"Commander\" commander_la_CFLAGS = $(AM_CFLAGS) \ $(COMMANDER_CFLAGS) Modified: defineformat/src/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -1,4 +1,5 @@ include $(top_srcdir)/build/vars.build.mk +plugin = defineformat geanyplugins_LTLIBRARIES = defineformat.la Modified: geanyctags/src/Makefile.am 1 lines changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -9,7 +9,6 @@ geanyctags_la_SOURCES = \ readtags.c geanyctags_la_CPPFLAGS = $(AM_CPPFLAGS) \ - -DPLUGIN=\"$(plugin)\" \ -DG_LOG_DOMAIN=\"GeanyCtags\" geanyctags_la_CFLAGS = $(AM_CFLAGS) geanyctags_la_LIBADD = $(COMMONLIBS) Modified: geanydoc/src/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -1,4 +1,5 @@ include $(top_srcdir)/build/vars.build.mk +plugin = geanydoc geanyplugins_LTLIBRARIES = geanydoc.la Modified: geanydoc/tests/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -1,5 +1,6 @@ if UNITTESTS include $(top_srcdir)/build/vars.build.mk +plugin = geanydoc TESTS=unittests noinst_PROGRAMS=unittests unittests_SOURCES = unittests.c Modified: geanyextrasel/src/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -1,4 +1,5 @@ include $(top_srcdir)/build/vars.build.mk +plugin = geanyextrasel geanyplugins_LTLIBRARIES = geanyextrasel.la Modified: geanyinsertnum/src/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -1,4 +1,5 @@ include $(top_srcdir)/build/vars.build.mk +plugin = geanyinsertnum geanyplugins_LTLIBRARIES = geanyinsertnum.la Modified: geanylatex/src/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -1,4 +1,5 @@ include $(top_srcdir)/build/vars.build.mk +plugin = geanylatex geanyplugins_LTLIBRARIES = geanylatex.la Modified: geanylipsum/src/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -1,4 +1,5 @@ include $(top_srcdir)/build/vars.build.mk +plugin = geanylipsum geanyplugins_LTLIBRARIES = geanylipsum.la Modified: geanymacro/src/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -1,4 +1,5 @@ include $(top_srcdir)/build/vars.build.mk +plugin = geanymacro geanyplugins_LTLIBRARIES = geanymacro.la Modified: geanyminiscript/src/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -1,4 +1,5 @@ include $(top_srcdir)/build/vars.build.mk +plugin = geanyminiscript geanyplugins_LTLIBRARIES = geanyminiscript.la Modified: geanynumberedbookmarks/src/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -1,4 +1,5 @@ include $(top_srcdir)/build/vars.build.mk +plugin = geanynumberedbookmarks geanyplugins_LTLIBRARIES = geanynumberedbookmarks.la Modified: geanypg/src/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -1,4 +1,5 @@ include $(top_srcdir)/build/vars.build.mk +plugin = geanypg geanyplugins_LTLIBRARIES = geanypg.la Modified: geanyprj/src/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -1,4 +1,5 @@ include $(top_srcdir)/build/vars.build.mk +plugin = geanyprj geanyplugins_LTLIBRARIES = geanyprj.la Modified: geanypy/src/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -1,4 +1,5 @@ include $(top_srcdir)/build/vars.build.mk +plugin = geanypy geanyplugin_LTLIBRARIES = geanypy.la geanyplugindir = $(libdir)/geany Modified: geanysendmail/src/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -1,4 +1,5 @@ include $(top_srcdir)/build/vars.build.mk +plugin = geanysendmail geanyplugins_LTLIBRARIES = geanysendmail.la Modified: geanyvc/src/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -1,4 +1,5 @@ include $(top_srcdir)/build/vars.build.mk +plugin = geanyvc geanyplugins_LTLIBRARIES = geanyvc.la Modified: geniuspaste/src/Makefile.am 1 lines changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -7,7 +7,6 @@ geanyplugins_LTLIBRARIES = geniuspaste.la geniuspaste_la_SOURCES = geniuspaste.c geniuspaste_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ - -DPLUGINDATADIR=\"$(plugindatadir)\" \ -DGEANY_VERSION=\"$(GEANY_VERSION)\" \ -DG_LOG_DOMAIN=\"GeniusPaste\" geniuspaste_la_CFLAGS = \ Modified: git-changebar/src/Makefile.am 3 lines changed, 1 insertions(+), 2 deletions(-) =================================================================== @@ -4,8 +4,7 @@ plugin = git-changebar geanyplugins_LTLIBRARIES = git-changebar.la git_changebar_la_SOURCES = gcb-plugin.c -git_changebar_la_CPPFLAGS = $(AM_CPPFLAGS) -DG_LOG_DOMAIN=\"GitChangeBar\" \ - -DPLUGIN=\""$(plugin)"\" +git_changebar_la_CPPFLAGS = $(AM_CPPFLAGS) -DG_LOG_DOMAIN=\"GitChangeBar\" git_changebar_la_CFLAGS = $(AM_CFLAGS) $(GITCHANGEBAR_CFLAGS) git_changebar_la_LIBADD = $(COMMONLIBS) \ $(GITCHANGEBAR_LIBS) Modified: lineoperations/src/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -1,4 +1,5 @@ include $(top_srcdir)/build/vars.build.mk +plugin = lineoperations geanyplugins_LTLIBRARIES = lineoperations.la Modified: pairtaghighlighter/src/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -1,4 +1,5 @@ include $(top_srcdir)/build/vars.build.mk +plugin = pairtaghighlighter geanyplugins_LTLIBRARIES = pairtaghighlighter.la Modified: pretty-printer/src/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -1,4 +1,5 @@ include $(top_srcdir)/build/vars.build.mk +plugin = pretty-printer geanyplugins_LTLIBRARIES = pretty-printer.la Modified: projectorganizer/src/Makefile.am 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,5 @@ include $(top_srcdir)/build/vars.build.mk +plugin = projectorganizer geanyplugins_LTLIBRARIES = projectorganizer.la @@ -14,7 +15,6 @@ projectorganizer_la_SOURCES = \ prjorg-menu.c projectorganizer_la_CPPFLAGS = $(AM_CPPFLAGS) \ - -DPLUGIN=\"$(plugin)\" \ -DG_LOG_DOMAIN=\"ProjectOrganizer\" projectorganizer_la_CFLAGS = $(AM_CFLAGS) projectorganizer_la_LIBADD = $(COMMONLIBS) Modified: scope/src/Makefile.am 1 lines changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -54,7 +54,6 @@ scope_la_SOURCES = \ scope_la_LIBADD = $(COMMONLIBS) $(VTE_LIBS) $(PTY_LIBS) scope_la_CFLAGS = $(AM_CFLAGS) $(VTE_CFLAGS) \ - -DPLUGINDATADIR=\"$(plugindatadir)\" \ -DPLUGINHTMLDOCDIR=\"$(plugindocdir)/html\" \ -Wno-shadow Modified: shiftcolumn/src/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -1,4 +1,5 @@ include $(top_srcdir)/build/vars.build.mk +plugin = shiftcolumn geanyplugins_LTLIBRARIES = shiftcolumn.la Modified: spellcheck/src/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -1,4 +1,5 @@ include $(top_srcdir)/build/vars.build.mk +plugin = spellcheck geanyplugins_LTLIBRARIES = spellcheck.la Modified: tableconvert/src/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -1,4 +1,5 @@ include $(top_srcdir)/build/vars.build.mk +plugin = tableconvert geanyplugins_LTLIBRARIES = tableconvert.la Modified: treebrowser/src/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -1,4 +1,5 @@ include $(top_srcdir)/build/vars.build.mk +plugin = treebrowser geanyplugins_LTLIBRARIES = treebrowser.la Modified: xmlsnippets/src/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -1,4 +1,5 @@ include $(top_srcdir)/build/vars.build.mk +plugin = xmlsnippets geanyplugins_LTLIBRARIES = xmlsnippets.la -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 937123: Use $(PACKAGE) instead of hard-coding its value
by Colomban Wendling 12 Mar '16

12 Mar '16

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sat, 12 Mar 2016 18:35:15 UTC Commit: 9371238c0f74cff6a1c1ed75489097e89bc011c0 https://github.com/geany/geany-plugins/commit/9371238c0f74cff6a1c1ed7548909… Log Message: ----------- Use $(PACKAGE) instead of hard-coding its value Modified Paths: -------------- build/vars.build.mk Modified: build/vars.build.mk 6 lines changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -2,11 +2,11 @@ if MINGW LOCAL_AM_CFLAGS = \ -DLOCALEDIR=\""share/locale"\" \ -DPREFIX=\"\" \ - -DDOCDIR=\""share/doc/geany-plugins"\" \ + -DDOCDIR=\""share/doc/$(PACKAGE)"\" \ -DGEANYPLUGINS_DATADIR=\""share"\" \ - -DPKGDATADIR=\""share/geany-plugins"\" \ + -DPKGDATADIR=\""share/$(PACKAGE)"\" \ -DLIBDIR=\""lib"\" \ - -DPKGLIBDIR=\""lib/geany-plugins"\" + -DPKGLIBDIR=\""lib/$(PACKAGE)"\" else LOCAL_AM_CFLAGS = \ -DLOCALEDIR=\""$(LOCALEDIR)"\" \ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] f5a0bc: Merge pull request #375 from eht16/gtk_bundle_script
by Frank Lanitz 12 Mar '16

12 Mar '16

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Sat, 12 Mar 2016 16:17:41 UTC Commit: f5a0bc8d6ff9472c3c952fc02ef2b71cd38dd7f8 https://github.com/geany/geany-plugins/commit/f5a0bc8d6ff9472c3c952fc02ef2b… Log Message: ----------- Merge pull request #375 from eht16/gtk_bundle_script Add shell script to add plugin dependencies into GTK bundle on MSYS2 Modified Paths: -------------- build/gtk-bundle-from-msys2.sh Modified: build/gtk-bundle-from-msys2.sh 289 lines changed, 289 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,289 @@ +#!/bin/sh +# +# Fetch and extract Geany-Plugins dependencies for Windows/MSYS2 +# This script will download (or use Pacman's cache) to extract +# plugin dependencies as defined below. To be run within a MSYS2 +# shell. The extracted files will be placed into the current +# directory. + +ABI=i686 +use_cache="no" +make_zip="no" +gtkv="3" + +# ctags - binary for GeanyCTags plugin +# ctpl-git - for GeanyGenDoc plugin +# enchant, hunspell - for SpellCheck plugin +# curl, glib-networking, gnutls, icu, sqlite3, webkitgtk2/3 for WebHelper and Markdown plugins +# lua51 - for GeanyLua plugin +# gnupg, gpgme - for GeanyPG plugin +# libsoup - for UpdateChecker plugin +# libgit2 - for GitChangeBar plugin +# libxml2 - for PrettyPrinter plugin +# gtkspell - for GeanyVC plugin +# the rest is dependency-dependency +packages=" +ctags +ctpl-git +curl +dbus +dbus-glib +enchant +geoclue +giflib +glib-networking +gmp +gnupg +gnutls +gpgme +gstreamer +gst-plugins-base +gtkspell +http-parser +hunspell +icu +libassuan +libgcrypt +libgpg-error +libgit2 +libidn +libjpeg-turbo +libogg +libsoup +libssh2 +libsystre +libtasn1 +libtheora +libtiff +libtre-git +libvorbis +libvorbisidec-svn +libwebp +libxml2 +libxslt +lua51 +nettle +openssl +orc +p11-kit +readline +rtmpdump-git +sqlite3 +termcap +xz +" + +gtk2_dependency_pkgs=" +webkitgtk2 +" +gtk3_dependency_pkgs=" +webkitgtk3 +" + +package_urls="" + + +handle_command_line_options() { + for opt in "$@"; do + case "$opt" in + "-c"|"--cache") + use_cache="yes" + ;; + "-z"|"--zip") + make_zip="yes" + ;; + "-2") + gtkv="2" + ;; + "-3") + gtkv="3" + ;; + "-h"|"--help") + echo "gtk-bundle-from-msys2.sh [-c] [-h] [-z] [-2 | -3] [CACHEDIR]" + echo " -c Use pacman cache. Otherwise pacman will download" + echo " archive files" + echo " -h Show this help screen" + echo " -z Create a zip afterwards" + echo " -2 Prefer gtk2" + echo " -3 Prefer gtk3" + echo "CACHEDIR Directory where to look for cached packages (default: /var/cache/pacman/pkg)" + exit 1 + ;; + *) + cachedir="$opt" + ;; + esac + done +} + +initialize() { + if [ -z "$cachedir" ]; then + cachedir="/var/cache/pacman/pkg" + fi + + if [ "$use_cache" = "yes" ] && ! [ -d "$cachedir" ]; then + echo "Cache dir \"$cachedir\" not a directory" + exit 1 + fi + + gtk="gtk$gtkv" + eval "gtk_dependency_pkgs=\${${gtk}_dependency_pkgs}" + + pkgs=" +${packages} +${gtk_dependency_pkgs} +" +} + +_remember_package_source() { + if [ "$use_cache" = "yes" ]; then + package_url=`pacman -Sp mingw-w64-${ABI}-${2}` + else + package_url="${1}" + fi + package_urls="${package_urls}\n${package_url}" +} + +_getpkg() { + if [ "$use_cache" = "yes" ]; then + package_info=`pacman -Qi mingw-w64-$ABI-$1` + package_version=`echo "$package_info" | grep "^Version " | cut -d':' -f 2 | tr -d '[[:space:]]'` + ls $cachedir/mingw-w64-${ABI}-${1}-${package_version}-* | sort -V | tail -n 1 + else + pacman -Sp mingw-w64-${ABI}-${1} + fi +} + +extract_packages() { + # hack for libxml2 postinstall script which expects "bin/mkdir" + mkdir -p bin + cp /bin/mkdir bin/ + # extract packages + for i in $pkgs; do + pkg=$(_getpkg $i) + _remember_package_source $pkg $i + if [ "$use_cache" = "yes" ]; then + if [ -e "$pkg" ]; then + echo "Extracting $pkg from cache" + tar xaf $pkg + else + echo "ERROR: File $pkg not found" + exit 1 + fi + else + echo "Download $pkg using curl" + curl -L "$pkg" | tar -x --xz + fi + if [ -f .INSTALL ]; then + echo "Running post_install script for \"$i\"" + /bin/bash -c ". .INSTALL; post_install" + fi + rm -f .INSTALL .MTREE .PKGINFO .BUILDINFO + done +} + +move_extracted_files() { + echo "Move extracted data to destination directory" + if [ -d mingw32 ]; then + for d in bin etc home include lib libexec locale sbin share ssl var; do + if [ -d "mingw32/$d" ]; then + rm -rf $d + # prevent sporadic 'permission denied' errors on my system, not sure why they happen + sleep 0.5 + mv mingw32/$d . + fi + done + rmdir mingw32 + fi +} + +cleanup_unnecessary_files() { + echo "Cleanup unnecessary files" + # etc: cleanup unnecessary files + rm -rf etc/bash_completion.d + rm -rf etc/dbus-1 + rm -rf etc/pkcs11 + rm -rf etc/xml + # include: cleanup development files + rm -rf include + # lib: cleanup development and other unnecessary files + rm -rf lib/cmake + rm -rf lib/pkgconfig + rm -rf lib/girepository-1.0 + rm -rf lib/icu + rm -rf lib/lua + rm -rf lib/p11-kit + rm -rf lib/python2.7 + find lib -name '*.h' -delete + find lib -name '*.a' -delete + find lib -name '*.typelib' -delete + find lib -name '*.def' -delete + find lib -name '*.sh' -delete + find libexec -name '*.exe' -delete + # sbin: cleanup sbin files + rm -rf sbin + # share: cleanup other unnecessary files + rm -rf share/aclocal + rm -rf share/bash-completion + rm -rf share/common-lisp + rm -rf share/dbus-1 + rm -rf share/doc + rm -rf share/emacs + rm -rf share/GConf + rm -rf share/geoclue-providers + rm -rf share/gir-1.0 + rm -rf share/glib-2.0 + rm -rf share/gnupg + rm -rf share/gst-plugins-base + rm -rf share/gtk-doc + rm -rf share/icu + rm -rf share/info + rm -rf share/lua + rm -rf share/man + rm -rf share/readline + rm -rf share/zsh + # ssl: cleanup ssl files + rm -rf ssl + # bin: cleanup binaries and libs (delete anything except *.dll and binaries we need) + find bin \ + ! -name '*.dll' \ + ! -name ctags.exe \ + ! -name gpg2.exe \ + ! -name gpgme-w32spawn.exe \ + ! -name gpgme-tool.exe \ + ! -name gpgconf.exe \ + -type f \ + -delete + # cleanup empty directories + find . -type d -empty -delete +} + +create_bundle_dependency_info_file() { + filename="ReadMe.Dependencies.Geany-Plugins.txt" + cat << EOF > "${filename}" +This installation contains dependencies for Geany-Plugins which are +distributed as binaries (usually .dll files) as well as additional +files necessary for these dependencies. +Following is a list of all included binary packages with their +full download URL as used to create this installation. +EOF + echo -e "${package_urls}" >> "${filename}" + unix2dos "${filename}" +} + +create_zip_archive() { + if [ "$make_zip" = "yes" ]; then + echo "Packing the bundle" + zip -r plugins-$gtk.zip bin etc include lib locale share var + fi +} + + +# main() +handle_command_line_options $@ +initialize +extract_packages +move_extracted_files +cleanup_unnecessary_files +create_bundle_dependency_info_file +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-plugins] 57f450: Add shell script to add plugin dependencies into GTK bundle on MSYS2
by Enrico Tröger 12 Mar '16

12 Mar '16

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sat, 12 Mar 2016 15:55:42 UTC Commit: 57f450475dcb48e74cf4df04401adc5478fddcfe https://github.com/geany/geany-plugins/commit/57f450475dcb48e74cf4df04401ad… Log Message: ----------- Add shell script to add plugin dependencies into GTK bundle on MSYS2 This is a helper script to easily fetch and extract plugin dependencies on Windows using the MSYS2 environment. Modified Paths: -------------- build/gtk-bundle-from-msys2.sh Modified: build/gtk-bundle-from-msys2.sh 289 lines changed, 289 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,289 @@ +#!/bin/sh +# +# Fetch and extract Geany-Plugins dependencies for Windows/MSYS2 +# This script will download (or use Pacman's cache) to extract +# plugin dependencies as defined below. To be run within a MSYS2 +# shell. The extracted files will be placed into the current +# directory. + +ABI=i686 +use_cache="no" +make_zip="no" +gtkv="3" + +# ctags - binary for GeanyCTags plugin +# ctpl-git - for GeanyGenDoc plugin +# enchant, hunspell - for SpellCheck plugin +# curl, glib-networking, gnutls, icu, sqlite3, webkitgtk2/3 for WebHelper and Markdown plugins +# lua51 - for GeanyLua plugin +# gnupg, gpgme - for GeanyPG plugin +# libsoup - for UpdateChecker plugin +# libgit2 - for GitChangeBar plugin +# libxml2 - for PrettyPrinter plugin +# gtkspell - for GeanyVC plugin +# the rest is dependency-dependency +packages=" +ctags +ctpl-git +curl +dbus +dbus-glib +enchant +geoclue +giflib +glib-networking +gmp +gnupg +gnutls +gpgme +gstreamer +gst-plugins-base +gtkspell +http-parser +hunspell +icu +libassuan +libgcrypt +libgpg-error +libgit2 +libidn +libjpeg-turbo +libogg +libsoup +libssh2 +libsystre +libtasn1 +libtheora +libtiff +libtre-git +libvorbis +libvorbisidec-svn +libwebp +libxml2 +libxslt +lua51 +nettle +openssl +orc +p11-kit +readline +rtmpdump-git +sqlite3 +termcap +xz +" + +gtk2_dependency_pkgs=" +webkitgtk2 +" +gtk3_dependency_pkgs=" +webkitgtk3 +" + +package_urls="" + + +handle_command_line_options() { + for opt in "$@"; do + case "$opt" in + "-c"|"--cache") + use_cache="yes" + ;; + "-z"|"--zip") + make_zip="yes" + ;; + "-2") + gtkv="2" + ;; + "-3") + gtkv="3" + ;; + "-h"|"--help") + echo "gtk-bundle-from-msys2.sh [-c] [-h] [-z] [-2 | -3] [CACHEDIR]" + echo " -c Use pacman cache. Otherwise pacman will download" + echo " archive files" + echo " -h Show this help screen" + echo " -z Create a zip afterwards" + echo " -2 Prefer gtk2" + echo " -3 Prefer gtk3" + echo "CACHEDIR Directory where to look for cached packages (default: /var/cache/pacman/pkg)" + exit 1 + ;; + *) + cachedir="$opt" + ;; + esac + done +} + +initialize() { + if [ -z "$cachedir" ]; then + cachedir="/var/cache/pacman/pkg" + fi + + if [ "$use_cache" = "yes" ] && ! [ -d "$cachedir" ]; then + echo "Cache dir \"$cachedir\" not a directory" + exit 1 + fi + + gtk="gtk$gtkv" + eval "gtk_dependency_pkgs=\${${gtk}_dependency_pkgs}" + + pkgs=" +${packages} +${gtk_dependency_pkgs} +" +} + +_remember_package_source() { + if [ "$use_cache" = "yes" ]; then + package_url=`pacman -Sp mingw-w64-${ABI}-${2}` + else + package_url="${1}" + fi + package_urls="${package_urls}\n${package_url}" +} + +_getpkg() { + if [ "$use_cache" = "yes" ]; then + package_info=`pacman -Qi mingw-w64-$ABI-$1` + package_version=`echo "$package_info" | grep "^Version " | cut -d':' -f 2 | tr -d '[[:space:]]'` + ls $cachedir/mingw-w64-${ABI}-${1}-${package_version}-* | sort -V | tail -n 1 + else + pacman -Sp mingw-w64-${ABI}-${1} + fi +} + +extract_packages() { + # hack for libxml2 postinstall script which expects "bin/mkdir" + mkdir -p bin + cp /bin/mkdir bin/ + # extract packages + for i in $pkgs; do + pkg=$(_getpkg $i) + _remember_package_source $pkg $i + if [ "$use_cache" = "yes" ]; then + if [ -e "$pkg" ]; then + echo "Extracting $pkg from cache" + tar xaf $pkg + else + echo "ERROR: File $pkg not found" + exit 1 + fi + else + echo "Download $pkg using curl" + curl -L "$pkg" | tar -x --xz + fi + if [ -f .INSTALL ]; then + echo "Running post_install script for \"$i\"" + /bin/bash -c ". .INSTALL; post_install" + fi + rm -f .INSTALL .MTREE .PKGINFO .BUILDINFO + done +} + +move_extracted_files() { + echo "Move extracted data to destination directory" + if [ -d mingw32 ]; then + for d in bin etc home include lib libexec locale sbin share ssl var; do + if [ -d "mingw32/$d" ]; then + rm -rf $d + # prevent sporadic 'permission denied' errors on my system, not sure why they happen + sleep 0.5 + mv mingw32/$d . + fi + done + rmdir mingw32 + fi +} + +cleanup_unnecessary_files() { + echo "Cleanup unnecessary files" + # etc: cleanup unnecessary files + rm -rf etc/bash_completion.d + rm -rf etc/dbus-1 + rm -rf etc/pkcs11 + rm -rf etc/xml + # include: cleanup development files + rm -rf include + # lib: cleanup development and other unnecessary files + rm -rf lib/cmake + rm -rf lib/pkgconfig + rm -rf lib/girepository-1.0 + rm -rf lib/icu + rm -rf lib/lua + rm -rf lib/p11-kit + rm -rf lib/python2.7 + find lib -name '*.h' -delete + find lib -name '*.a' -delete + find lib -name '*.typelib' -delete + find lib -name '*.def' -delete + find lib -name '*.sh' -delete + find libexec -name '*.exe' -delete + # sbin: cleanup sbin files + rm -rf sbin + # share: cleanup other unnecessary files + rm -rf share/aclocal + rm -rf share/bash-completion + rm -rf share/common-lisp + rm -rf share/dbus-1 + rm -rf share/doc + rm -rf share/emacs + rm -rf share/GConf + rm -rf share/geoclue-providers + rm -rf share/gir-1.0 + rm -rf share/glib-2.0 + rm -rf share/gnupg + rm -rf share/gst-plugins-base + rm -rf share/gtk-doc + rm -rf share/icu + rm -rf share/info + rm -rf share/lua + rm -rf share/man + rm -rf share/readline + rm -rf share/zsh + # ssl: cleanup ssl files + rm -rf ssl + # bin: cleanup binaries and libs (delete anything except *.dll and binaries we need) + find bin \ + ! -name '*.dll' \ + ! -name ctags.exe \ + ! -name gpg2.exe \ + ! -name gpgme-w32spawn.exe \ + ! -name gpgme-tool.exe \ + ! -name gpgconf.exe \ + -type f \ + -delete + # cleanup empty directories + find . -type d -empty -delete +} + +create_bundle_dependency_info_file() { + filename="ReadMe.Dependencies.Geany-Plugins.txt" + cat << EOF > "${filename}" +This installation contains dependencies for Geany-Plugins which are +distributed as binaries (usually .dll files) as well as additional +files necessary for these dependencies. +Following is a list of all included binary packages with their +full download URL as used to create this installation. +EOF + echo -e "${package_urls}" >> "${filename}" + unix2dos "${filename}" +} + +create_zip_archive() { + if [ "$make_zip" = "yes" ]; then + echo "Packing the bundle" + zip -r plugins-$gtk.zip bin etc include lib locale share var + fi +} + + +# main() +handle_command_line_options $@ +initialize +extract_packages +move_extracted_files +cleanup_unnecessary_files +create_bundle_dependency_info_file +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-plugins] c86c65: Uninstall new ReadMe.Dependencies.Geany-Plugins.txt file
by Enrico Tröger 12 Mar '16

12 Mar '16

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sat, 12 Mar 2016 15:24:05 UTC Commit: c86c659407fa107aabf5a3c1d95018e1174bf578 https://github.com/geany/geany-plugins/commit/c86c659407fa107aabf5a3c1d9501… Log Message: ----------- Uninstall new ReadMe.Dependencies.Geany-Plugins.txt file And also update the list of plugins which need dependency packages. Modified Paths: -------------- build/geany-plugins.nsi Modified: build/geany-plugins.nsi 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -152,6 +152,7 @@ Section -Post SectionEnd Section Uninstall + Delete "$INSTDIR\ReadMe.Dependencies.Geany-Plugins.txt" Delete "$INSTDIR\uninst-plugins.exe" Delete "$INSTDIR\lib\geany\addons.dll" Delete "$INSTDIR\lib\geany\autoclose.dll" @@ -332,7 +333,7 @@ SectionEnd !insertmacro MUI_DESCRIPTION_TEXT ${SEC01} "Required plugin files. You cannot skip these files." !insertmacro MUI_DESCRIPTION_TEXT ${SEC02} "Various translations for the included plugins." !insertmacro MUI_DESCRIPTION_TEXT ${SEC03} "Various documentation files for the included plugins." -!insertmacro MUI_DESCRIPTION_TEXT ${SEC04} "Dependency files for various plugins (currently libenchant for Spell Check, Lua for GeanyLua, libxml2 for PrettyPrinter, CTPL for GeanyGenDoc, libgit2 for Git Change Bar)." +!insertmacro MUI_DESCRIPTION_TEXT ${SEC04} "Dependency files for various plugins (GeanyCTags, GeanyGenDoc, SpellCheck, WebHelper, Markdown, GeanyLua, GeanyPG, UpdateChecker, GitChangeBar, PrettyPrinter, GeanyVC)." !insertmacro MUI_FUNCTION_DESCRIPTION_END ;;;;;;;;;;;;;;;;;;;;; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 2df657: pairtaghighlighter: Drop use of the most obvious deprecated Geany API
by Colomban Wendling 12 Mar '16

12 Mar '16

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sun, 21 Feb 2016 00:17:50 UTC Commit: 2df6577b8de46824fb351c2055e4db8b96f4a891 https://github.com/geany/geany-plugins/commit/2df6577b8de46824fb351c2055e4d… Log Message: ----------- pairtaghighlighter: Drop use of the most obvious deprecated Geany API Modified Paths: -------------- pairtaghighlighter/src/pair_tag_highlighter.c Modified: pairtaghighlighter/src/pair_tag_highlighter.c 26 lines changed, 14 insertions(+), 12 deletions(-) =================================================================== @@ -193,8 +193,8 @@ static gboolean is_tag_opening(ScintillaObject *sci, gint openingBracket) } -static void get_tag_name(ScintillaObject *sci, gint openingBracket, gint closingBracket, - gchar tagName[], gboolean isTagOpening) +static gchar *get_tag_name(ScintillaObject *sci, gint openingBracket, gint closingBracket, + gboolean isTagOpening) { gint nameStart = openingBracket + (TRUE == isTagOpening ? 1 : 2); gint nameEnd = nameStart; @@ -208,7 +208,7 @@ static void get_tag_name(ScintillaObject *sci, gint openingBracket, gint closing if(nameEnd-nameStart > MAX_TAG_NAME) break; } - sci_get_text_range(sci, nameStart, nameEnd-1, tagName); + return sci_get_contents_range(sci, nameStart, nameEnd-1); } @@ -230,10 +230,10 @@ static void findMatchingOpeningTag(ScintillaObject *sci, gchar *tagName, gint op && (matchingClosingBracket > matchingOpeningBracket)) { /* we are inside of some tag. Let us check what tag*/ - gchar matchingTagName[MAX_TAG_NAME]; gboolean isMatchingTagOpening = is_tag_opening(sci, matchingOpeningBracket); - get_tag_name(sci, matchingOpeningBracket, matchingClosingBracket, - matchingTagName, isMatchingTagOpening); + gchar *matchingTagName = get_tag_name(sci, matchingOpeningBracket, + matchingClosingBracket, + isMatchingTagOpening); if(strcmp(tagName, matchingTagName) == 0) { if(TRUE == isMatchingTagOpening) @@ -242,6 +242,7 @@ static void findMatchingOpeningTag(ScintillaObject *sci, gchar *tagName, gint op closingTagsCount++; } pos = matchingOpeningBracket+1; + g_free(matchingTagName); } /* Speed up search: if findBracket returns -1, that means start of line * is reached. There is no need to go through the same positions again. @@ -285,10 +286,10 @@ static void findMatchingClosingTag(ScintillaObject *sci, gchar *tagName, gint cl && (matchingClosingBracket > matchingOpeningBracket)) { /* we are inside of some tag. Let us check what tag*/ - gchar matchingTagName[64]; gboolean isMatchingTagOpening = is_tag_opening(sci, matchingOpeningBracket); - get_tag_name(sci, matchingOpeningBracket, matchingClosingBracket, - matchingTagName, isMatchingTagOpening); + gchar *matchingTagName = get_tag_name(sci, matchingOpeningBracket, + matchingClosingBracket, + isMatchingTagOpening); if(strcmp(tagName, matchingTagName) == 0) { if(TRUE == isMatchingTagOpening) @@ -297,6 +298,7 @@ static void findMatchingClosingTag(ScintillaObject *sci, gchar *tagName, gint cl closingTagsCount++; } pos = matchingClosingBracket; + g_free(matchingTagName); } if(openingTagsCount == closingTagsCount) @@ -315,10 +317,8 @@ static void findMatchingClosingTag(ScintillaObject *sci, gchar *tagName, gint cl static void findMatchingTag(ScintillaObject *sci, gint openingBracket, gint closingBracket) { - gchar tagName[MAX_TAG_NAME]; gboolean isTagOpening = is_tag_opening(sci, openingBracket); - - get_tag_name(sci, openingBracket, closingBracket, tagName, isTagOpening); + gchar *tagName = get_tag_name(sci, openingBracket, closingBracket, isTagOpening); if(is_tag_self_closing(sci, closingBracket) || is_tag_empty(tagName)) { highlight_tag(sci, openingBracket, closingBracket, EMPTY_TAG_COLOR); @@ -328,6 +328,8 @@ static void findMatchingTag(ScintillaObject *sci, gint openingBracket, gint clos else findMatchingOpeningTag(sci, tagName, openingBracket); } + + g_free(tagName); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] d93498: Merge pull request #359 from b4n/pairtaghighlighter/less-deprecated
by Frank Lanitz 12 Mar '16

12 Mar '16

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Sat, 12 Mar 2016 15:13:27 UTC Commit: d9349887b68573696a02c27f3f23fd482c18a504 https://github.com/geany/geany-plugins/commit/d9349887b68573696a02c27f3f23f… Log Message: ----------- Merge pull request #359 from b4n/pairtaghighlighter/less-deprecated pairtaghighlighter: Drop use of the most obvious deprecated Geany API Modified Paths: -------------- pairtaghighlighter/src/pair_tag_highlighter.c Modified: pairtaghighlighter/src/pair_tag_highlighter.c 26 lines changed, 14 insertions(+), 12 deletions(-) =================================================================== @@ -192,8 +192,8 @@ static gboolean is_tag_opening(ScintillaObject *sci, gint openingBracket) } -static void get_tag_name(ScintillaObject *sci, gint openingBracket, gint closingBracket, - gchar tagName[], gboolean isTagOpening) +static gchar *get_tag_name(ScintillaObject *sci, gint openingBracket, gint closingBracket, + gboolean isTagOpening) { gint nameStart = openingBracket + (TRUE == isTagOpening ? 1 : 2); gint nameEnd = nameStart; @@ -207,7 +207,7 @@ static void get_tag_name(ScintillaObject *sci, gint openingBracket, gint closing if(nameEnd-nameStart > MAX_TAG_NAME) break; } - sci_get_text_range(sci, nameStart, nameEnd-1, tagName); + return sci_get_contents_range(sci, nameStart, nameEnd-1); } @@ -229,10 +229,10 @@ static void findMatchingOpeningTag(ScintillaObject *sci, gchar *tagName, gint op && (matchingClosingBracket > matchingOpeningBracket)) { /* we are inside of some tag. Let us check what tag*/ - gchar matchingTagName[MAX_TAG_NAME]; gboolean isMatchingTagOpening = is_tag_opening(sci, matchingOpeningBracket); - get_tag_name(sci, matchingOpeningBracket, matchingClosingBracket, - matchingTagName, isMatchingTagOpening); + gchar *matchingTagName = get_tag_name(sci, matchingOpeningBracket, + matchingClosingBracket, + isMatchingTagOpening); if(strcmp(tagName, matchingTagName) == 0) { if(TRUE == isMatchingTagOpening) @@ -241,6 +241,7 @@ static void findMatchingOpeningTag(ScintillaObject *sci, gchar *tagName, gint op closingTagsCount++; } pos = matchingOpeningBracket+1; + g_free(matchingTagName); } /* Speed up search: if findBracket returns -1, that means start of line * is reached. There is no need to go through the same positions again. @@ -284,10 +285,10 @@ static void findMatchingClosingTag(ScintillaObject *sci, gchar *tagName, gint cl && (matchingClosingBracket > matchingOpeningBracket)) { /* we are inside of some tag. Let us check what tag*/ - gchar matchingTagName[64]; gboolean isMatchingTagOpening = is_tag_opening(sci, matchingOpeningBracket); - get_tag_name(sci, matchingOpeningBracket, matchingClosingBracket, - matchingTagName, isMatchingTagOpening); + gchar *matchingTagName = get_tag_name(sci, matchingOpeningBracket, + matchingClosingBracket, + isMatchingTagOpening); if(strcmp(tagName, matchingTagName) == 0) { if(TRUE == isMatchingTagOpening) @@ -296,6 +297,7 @@ static void findMatchingClosingTag(ScintillaObject *sci, gchar *tagName, gint cl closingTagsCount++; } pos = matchingClosingBracket; + g_free(matchingTagName); } if(openingTagsCount == closingTagsCount) @@ -314,10 +316,8 @@ static void findMatchingClosingTag(ScintillaObject *sci, gchar *tagName, gint cl static void findMatchingTag(ScintillaObject *sci, gint openingBracket, gint closingBracket) { - gchar tagName[MAX_TAG_NAME]; gboolean isTagOpening = is_tag_opening(sci, openingBracket); - - get_tag_name(sci, openingBracket, closingBracket, tagName, isTagOpening); + gchar *tagName = get_tag_name(sci, openingBracket, closingBracket, isTagOpening); if(is_tag_self_closing(sci, closingBracket) || is_tag_empty(tagName)) { highlight_tag(sci, openingBracket, closingBracket, EMPTY_TAG_COLOR); @@ -327,6 +327,8 @@ static void findMatchingTag(ScintillaObject *sci, gint openingBracket, gint clos else findMatchingOpeningTag(sci, tagName, openingBracket); } + + g_free(tagName); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] ebad47: Set docdir on Windows builds
by Enrico Tröger 12 Mar '16

12 Mar '16

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sat, 12 Mar 2016 15:00:24 UTC Commit: ebad47c405beb91a8ae59d937a901a8e327847a7 https://github.com/geany/geany-plugins/commit/ebad47c405beb91a8ae59d937a901… Log Message: ----------- Set docdir on Windows builds And remove unused define PKGLIBDIR and quote paths even. Modified Paths: -------------- build/common.m4 build/vars.build.mk Modified: build/common.m4 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -65,7 +65,7 @@ AC_DEFUN([GP_COMMIT_PLUGIN_STATUS], GP_STATUS_PLUGIN_ADD([$1], [$m4_tolower(AS_TR_SH(enable_$1))]) ]) -dnl GEANY_CHECK_MINGW +dnl GP_CHECK_MINGW dnl Checks whether we're building for MinGW, and defines appropriate stuff dnl if it is the case. dnl Most importantly, AM_CODITIONALs MINGW Modified: build/vars.build.mk 8 lines changed, 4 insertions(+), 4 deletions(-) =================================================================== @@ -2,11 +2,11 @@ if MINGW LOCAL_AM_CFLAGS = \ -DLOCALEDIR=\""share/locale"\" \ -DPREFIX=\"\" \ - -DDOCDIR=\"\" \ - -DGEANYPLUGINS_DATADIR=\"share\" \ + -DDOCDIR=\""share/doc/geany-plugins"\" \ + -DGEANYPLUGINS_DATADIR=\""share"\" \ -DPKGDATADIR=\""share/geany-plugins"\" \ -DLIBDIR=\""lib"\" \ - -DPKGLIBDIR=\"\" + -DPKGLIBDIR=\""lib/geany-plugins"\" else LOCAL_AM_CFLAGS = \ -DLOCALEDIR=\""$(LOCALEDIR)"\" \ @@ -22,7 +22,7 @@ AM_CFLAGS = \ ${LOCAL_AM_CFLAGS} \ $(GEANY_CFLAGS) \ $(GP_CFLAGS) - + AM_LDFLAGS = -module -avoid-version -no-undefined $(GP_LDFLAGS) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

← Newer
1
2
3
4
5
6
7
...
11
Older →

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

Plugins-Commits March 2016