Commits March 2016

commits@lists.geany.org

1 participants
100 discussions

[geany/geany] 479cf3: Improve Windows GTK runtime bundle creation script
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:54:42 UTC Commit: 479cf3dc53494530a584d541ea507fc234e70003 https://github.com/geany/geany/commit/479cf3dc53494530a584d541ea507fc234e70… Log Message: ----------- Improve Windows GTK runtime bundle creation script Update the list of dependencies, include sort.exe and grep.exe, create a information file with all download links of included binaries and re-structure the script for better readability. See #560 for details. Modified Paths: -------------- scripts/gtk-bundle-from-msys2.sh Modified: scripts/gtk-bundle-from-msys2.sh 338 lines changed, 251 insertions(+), 87 deletions(-) =================================================================== @@ -1,109 +1,273 @@ #!/bin/sh +# +# Fetch and extract Geany dependencies for Windows/MSYS2 +# This script will download (or use Pacman's cache) to extract +# dependencies as defined below needed to run Geany. +# To be run within a MSYS2 shell. The extracted files will be +# placed into the current directory. ABI=i686 - -GLIB= -ADW= -GTK= - use_cache="no" make_zip="no" gtkv="3" +run_pi="y" -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] [-z] [-2 | -3]" - echo " -c Use pacman cache. Otherwise pacman will download" - echo " archive files" - echo " -z Create a zip afterwards" - echo " -2 Prefer gtk2" - echo " -3 Prefer gtk3" - exit 1 - ;; - *) - cachedir="$opt" - ;; - esac -done +UNX_UTILS_URL="http://unxutils.sourceforge.net/UnxUpdates.zip" +GREP_URL="https://download.geany.org/contrib/grep-2.23.tar.xz" -if [ -z "$cachedir" ]; then - cachedir="/var/cache/pacman/pkg" -fi +package_urls="" +gtk2_dependency_pkgs="" +gtk3_dependency_pkgs=" +libepoxy +hicolor-icon-theme +adwaita-icon-theme +" -if [ "$use_cache" = "yes" ] && ! [ -d "$cachedir" ]; then - echo "Cache dir \"$cachedir\" not a directory" - exit 1 -fi +packages=" +gcc-libs +pcre +zlib +expat +libffi +libiconv +bzip2 +libffi +libpng +gettext +glib2 +libwinpthread-git +harfbuzz +fontconfig +freetype +atk +pango +cairo +pixman +gdk-pixbuf2 +" -gtk="gtk$gtkv" +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" + ;; + "-n") + run_pi="" + ;; + "-h"|"--help") + echo "gtk-bundle-from-msys2.sh [-c] [-h] [-n] [-z] [-2 | -3] [CACHEDIR]" + echo " -c Use pacman cache. Otherwise pacman will download" + echo " archive files" + echo " -h Show this help screen" + echo " -n Do not run post install scripts of the packages" + 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 +} -getpkg() { - if [ "$use_cache" = "yes" ]; then - ls $cachedir/mingw-w64-$ABI-$1-* | sort -V | tail -n 1 - else - pacman -Sp mingw-w64-$ABI-$1 +initialize() { + if [ -z "$cachedir" ]; then + cachedir="/var/cache/pacman/pkg" fi -} -GLIB=$(getpkg glib2) -ATK=$(getpkg atk) -PANGO=$(getpkg pango) -CAIRO=$(getpkg cairo) -ADW=$(getpkg adwaita-icon-theme) -GTK=$(getpkg $gtk) - -cat <<EOF -Using: -glib: $GLIB -atk: $ATK -pango: $PANGO -cairo: $CAIRO -adwaita $ADW -$gtk: $GTK -EOF + 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} +${gtk} +" +} -for i in $GLIB $ATK $PANGO $CAURIO $ADW $GTK; do - if [ "$use_cache" = "yes" -a -e "$i" ]; then - echo "Extracting $i from cache" - tar xaf $i +_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 - echo "Download $i using curl" - curl -L "$i" | tar -x --xz + pacman -Sp mingw-w64-${ABI}-${1} fi - echo "Running post_install script" - test -f .INSTALL && /bin/bash -c ". .INSTALL; post_install" - if [ "$make_zip" = "yes" -a "$i" = "$GTK" ]; then - VERSION=$(grep ^pkgver .PKGINFO | sed -e 's,^pkgver = ,,' -e 's,-.*$,,') +} + +_remember_package_source() { + if [ "$use_cache" = "yes" ]; then + package_url=`pacman -Sp mingw-w64-${ABI}-${2}` + else + package_url="${1}" fi - rm -f .INSTALL .MTREE .PKGINFO -done + package_urls="${package_urls}\n${package_url}" +} -if [ -d mingw32 ]; then - for d in bin etc include lib locale share; do - rm -rf $d - mv mingw32/$d . +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 [ -n "$run_pi" ] && [ -f .INSTALL ]; then + echo "Running post_install script for \"$i\"" + /bin/bash -c ". .INSTALL; post_install" + fi + if [ "$make_zip" = "yes" -a "$i" = "$gtk" ]; then + VERSION=$(grep ^pkgver .PKGINFO | sed -e 's,^pkgver = ,,' -e 's,-.*$,,') + fi + rm -f .INSTALL .MTREE .PKGINFO .BUILDINFO done - rmdir mingw32 -fi +} -if [ "$make_zip" = "yes" ]; then - if [ -z "$VERSION" ]; then - VERSION="unknown-version" +move_extracted_files() { + echo "Move extracted data to destination directory" + if [ -d mingw32 ]; then + for d in bin etc home include lib locale share 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 - echo "Packing the bundle" - zip -r gtk-$VERSION.zip bin etc include lib locale share -fi +} + +cleanup_unnecessary_files() { + echo "Cleanup unnecessary files" + # cleanup temporary files + rm -rf var/cache/fontconfig + rmdir var/cache + rmdir var + # cleanup development and other unnecessary files + rm -rf include + rm -rf lib/gettext + rm -rf lib/libffi-* + rm -rf lib/pkgconfig + find lib -name '*.a' -delete + find lib -name '*.typelib' -delete + find lib -name '*.def' -delete + find lib -name '*.h' -delete + find lib -name '*.sh' -delete + # cleanup other unnecessary files + rm -rf share/aclocal + rm -rf share/applications + rm -rf share/bash-completion + rm -rf share/doc + rm -rf share/gdb + rm -rf share/gettext + rm -rf share/gir-1.0 + rm -rf share/glib-2.0 + rm -rf share/gtk-2.0 + rm -rf share/gtk-3.0 + rm -rf share/gtk-doc + rm -rf share/info + rm -rf share/man + rm -rf share/xml + # cleanup binaries and libs (delete anything except *.dll) + find bin ! -name '*.dll' -type f -delete + # cleanup empty directories + find . -type d -empty -delete +} + +download_and_compile_grep() { + grep_archive="grep_source.tar.xz" + grep_build_dir="grep_build" + grep_build_log="grep_build.log" + echo "Download and compile 'grep' (see ${grep_build_dir}/${grep_build_log} for details)" + mkdir ${grep_build_dir} + cd ${grep_build_dir} + wget --no-verbose -O ${grep_archive} ${GREP_URL} + tar xf ${grep_archive} + grep-2*/configure > ${grep_build_log} 2>&1 || exit 1 + make >> ${grep_build_log} 2>&1 || exit 1 + strip src/grep.exe + cp src/grep.exe ../bin/ + cd .. + rm -rf ${grep_build_dir} +} + +download_and_extract_sort() { + echo "Download and unpack 'sort'" + # add sort to the bin directory + unxutils_archive="unxutilsupdates.zip" + wget --no-verbose -O ${unxutils_archive} ${UNX_UTILS_URL} + unzip ${unxutils_archive} sort.exe -d bin/ + rm ${unxutils_archive} +} + +create_bundle_dependency_info_file() { + filename="ReadMe.Dependencies.Geany.txt" + cat << EOF > "${filename}" +This installation contains dependencies for Geany 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. + +sort.exe is extracted from the ZIP archive at +${UNX_UTILS_URL}. + +grep.exe is self-compiled from the sources available at +${GREP_URL}. +Used command to compile: ./configure && make + +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() { + if [ "$make_zip" = "yes" ]; then + if [ -z "$VERSION" ]; then + VERSION="unknown-version" + fi + echo "Packing the bundle" + zip -r gtk-$VERSION.zip bin etc include lib locale share var + fi +} + + +# main() +handle_command_line_options $@ +initialize +extract_packages +move_extracted_files +cleanup_unnecessary_files +download_and_compile_grep +download_and_extract_sort +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] 825427: Merge pull request #937 from eht16/win32_open_uri_error_handling
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:22:28 UTC Commit: 8254271b3373ec0e53ce2b07c206ebd6418e61fb https://github.com/geany/geany/commit/8254271b3373ec0e53ce2b07c206ebd6418e6… Log Message: ----------- Merge pull request #937 from eht16/win32_open_uri_error_handling Add error reporting for opening URIs on Windows Modified Paths: -------------- src/win32.c Modified: src/win32.c 10 lines changed, 9 insertions(+), 1 deletions(-) =================================================================== @@ -785,6 +785,7 @@ gint win32_check_write_permission(const gchar *dir) /* Just a simple wrapper function to open a browser window */ void win32_open_browser(const gchar *uri) { + gint ret; if (strncmp(uri, "file://", 7) == 0) { uri += 7; @@ -794,7 +795,14 @@ void win32_open_browser(const gchar *uri) uri++; } } - ShellExecute(NULL, "open", uri, NULL, NULL, SW_SHOWNORMAL); + ret = (gint) ShellExecute(NULL, "open", uri, NULL, NULL, SW_SHOWNORMAL); + if (ret <= 32) + { + gchar *err = g_win32_error_message(GetLastError()); + /* TODO add a GUI warning that opening an URI failed */ + g_warning("ShellExecute failed opening \"%s\" (code %d): %s", uri, ret, err); + g_free(err); + } } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] fc811e: Small update of German translation
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: Fri, 11 Mar 2016 22:15:18 UTC Commit: fc811ecdc7df38d6c1ba34c6a82403bbb2053a20 https://github.com/geany/geany/commit/fc811ecdc7df38d6c1ba34c6a82403bbb2053… Log Message: ----------- Small update of German translation Modified Paths: -------------- po/de.po Modified: po/de.po 31 lines changed, 15 insertions(+), 16 deletions(-) =================================================================== @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: Geany 1.27\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-02 19:56+0100\n" +"POT-Creation-Date: 2016-03-11 23:14+0100\n" "PO-Revision-Date: 2015-03-31 07:10+0200\n" "Last-Translator: Frank Lanitz <frank(a)frank.uvena.de>\n" "Language-Team: German <geany-i18n(a)uvena.de>\n" @@ -108,11 +108,11 @@ msgstr "_Suchen" msgid "Open Selected F_ile" msgstr "_Markierte Datei öffnen" -#: ../data/geany.glade.h:19 ../src/symbols.c:2557 +#: ../data/geany.glade.h:19 ../src/symbols.c:2580 msgid "Find _Usage" msgstr "A_uftreten finden" -#: ../data/geany.glade.h:20 ../src/symbols.c:2562 +#: ../data/geany.glade.h:20 ../src/symbols.c:2585 msgid "Find _Document Usage" msgstr "_Auftreten im Dokument finden" @@ -1824,7 +1824,7 @@ msgstr "_Nächstes" msgid "Find _Previous" msgstr "_Vorheriges" -#: ../data/geany.glade.h:380 ../src/symbols.c:2567 +#: ../data/geany.glade.h:380 ../src/symbols.c:2590 msgid "Find in F_iles..." msgstr "In _Dateien suchen..." @@ -2746,7 +2746,7 @@ msgstr "" #: ../src/dialogs.c:1204 ../src/dialogs.c:1205 ../src/dialogs.c:1206 #: ../src/dialogs.c:1212 ../src/dialogs.c:1213 ../src/dialogs.c:1214 -#: ../src/symbols.c:2371 ../src/symbols.c:2387 ../src/ui_utils.c:289 +#: ../src/symbols.c:2394 ../src/symbols.c:2410 ../src/ui_utils.c:289 msgid "unknown" msgstr "unbekannt" @@ -2994,17 +2994,17 @@ msgstr[1] "%s: %d mal wurde »%s« mit »%s« ersetzt." msgid "Do you want to reload it?" msgstr "Möchten Sie die Datei neu laden?" -#: ../src/editor.c:4490 +#: ../src/editor.c:4494 msgid "Enter Tab Width" msgstr "Tabulatorbreite:" -#: ../src/editor.c:4491 +#: ../src/editor.c:4495 msgid "Enter the amount of spaces which should be replaced by a tab character." msgstr "" "Geben Sie die Anzahl der Leerzeichen an, welche durch den Tabulator ersetzt " "werden sollen." -#: ../src/editor.c:4696 +#: ../src/editor.c:4700 #, c-format msgid "Warning: non-standard hard tab width: %d != 8!" msgstr "Achtung: Keine gewöhnliche harte Tabulatorbreite:: %d != 8!" @@ -4089,11 +4089,11 @@ msgstr "Tasten festlegen" msgid "Press the combination of the keys you want to use for \"%s\"." msgstr "Welche Tastenkombination soll für »%s« genutzt werden?" -#: ../src/prefs.c:225 ../src/symbols.c:2525 ../src/sidebar.c:752 +#: ../src/prefs.c:225 ../src/symbols.c:2548 ../src/sidebar.c:752 msgid "_Expand All" msgstr "Alle a_usklappen" -#: ../src/prefs.c:230 ../src/symbols.c:2530 ../src/sidebar.c:758 +#: ../src/prefs.c:230 ../src/symbols.c:2553 ../src/sidebar.c:758 msgid "_Collapse All" msgstr "Alle _einklappen" @@ -5004,9 +5004,8 @@ msgstr "Konnte Tag-Datei »%s« nicht laden." #. For translators: it's the filename and line number of a symbol in the goto-symbol popup menu #: ../src/symbols.c:1983 -#, fuzzy, c-format msgid "%s: %lu" -msgstr "Anzeige" +msgstr "%s: %lu" #. For translators: it's the filename and line number of a symbol in the goto-symbol popup menu #: ../src/symbols.c:1986 @@ -5014,21 +5013,21 @@ msgstr "Anzeige" msgid "%s: %lu" msgstr "%s: %lu" -#: ../src/symbols.c:2161 +#: ../src/symbols.c:2184 #, c-format msgid "Forward declaration \"%s\" not found." msgstr "(Vorwärts-)Deklaration von »%s« nicht gefunden." -#: ../src/symbols.c:2163 +#: ../src/symbols.c:2186 #, c-format msgid "Definition of \"%s\" not found." msgstr "Definition von »%s« nicht gefunden." -#: ../src/symbols.c:2540 +#: ../src/symbols.c:2563 msgid "Sort by _Name" msgstr "Nach _Namen sortieren" -#: ../src/symbols.c:2547 +#: ../src/symbols.c:2570 msgid "Sort by _Appearance" msgstr "Nach _Auftreten sortieren" -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-osx] 34e11e: Update filetype extensions
by Jiří Techet 11 Mar '16

11 Mar '16

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Fri, 11 Mar 2016 14:45:28 UTC Commit: 34e11ebc6914c3a11cd6d3f315656a672b8348a7 https://github.com/geany/geany-osx/commit/34e11ebc6914c3a11cd6d3f315656a672… Log Message: ----------- Update filetype extensions Modified Paths: -------------- Info.plist plist_filetypes.py Modified: Info.plist 23 lines changed, 23 insertions(+), 0 deletions(-) =================================================================== @@ -213,7 +213,9 @@ <string>ASM Source</string> <key>CFBundleTypeExtensions</key> <array> + <string>a51</string> <string>asm</string> + <string>asm51</string> </array> <key>CFBundleTypeIconFile</key> <string>Geany.icns</string> @@ -295,6 +297,22 @@ </dict> <dict> <key>CFBundleTypeName</key> + <string>Clojure Source</string> + <key>CFBundleTypeExtensions</key> + <array> + <string>clj</string> + <string>cljc</string> + <string>cljs</string> + </array> + <key>CFBundleTypeIconFile</key> + <string>Geany.icns</string> + <key>CFBundleTypeRole</key> + <string>Editor</string> + <key>LSHandlerRank</key> + <string>Alternate</string> + </dict> + <dict> + <key>CFBundleTypeName</key> <string>CUDA Source</string> <key>CFBundleTypeExtensions</key> <array> @@ -794,7 +812,12 @@ <string>markdown</string> <string>md</string> <string>mdml</string> + <string>mdown</string> + <string>mdtext</string> + <string>mdtxt</string> + <string>mdwn</string> <string>mkd</string> + <string>mkdn</string> </array> <key>CFBundleTypeIconFile</key> <string>Geany.icns</string> Modified: plist_filetypes.py 5 lines changed, 3 insertions(+), 2 deletions(-) =================================================================== @@ -8,11 +8,12 @@ ActionScript=*.as; Ada=*.adb;*.ads; Asciidoc=*.asciidoc;*.adoc; -ASM=*.asm; +ASM=*.asm;*.asm51;*.a51; Batch=*.bat;*.cmd;*.nt; CAML=*.ml;*.mli; C=*.c;*.h;*.xpm; C++=*.cpp;*.cxx;*.c++;*.cc;*.h;*.hpp;*.hxx;*.h++;*.hh;*.C;*.H; +Clojure=*.clj;*.cljs;*.cljc; CUDA=*.cu;*.cuh;*.h; C#=*.cs; CMake=CMakeLists.txt;*.cmake;*.ctest; @@ -44,7 +45,7 @@ Lisp=*.lisp; Lua=*.lua; Make=*.mak;*.mk;GNUmakefile;makefile;Makefile;makefile.*;Makefile.*; -Markdown=*.mdml;*.markdown;*.md;*.mkd; +Markdown=*.mdml;*.markdown;*.md;*.mkd;*.mkdn;*.mdwn;*.mdown;*.mdtxt;*.mdtext; Matlab/Octave=*.m; NSIS=*.nsi;*.nsh; Objective-C=*.m;*.mm;*.h; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-osx] 9edd95: Remove pango modules
by Jiří Techet 11 Mar '16

11 Mar '16

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Fri, 11 Mar 2016 14:24:17 UTC Commit: 9edd95d55d8586415e641c9f9b9896dd5e5212cf https://github.com/geany/geany-osx/commit/9edd95d55d8586415e641c9f9b9896dd5… Log Message: ----------- Remove pango modules Not needed for newer pango versions Modified Paths: -------------- geany.bundle Modified: geany.bundle 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -83,9 +83,11 @@ ${prefix}/lib/gdk-pixbuf-2.0/${pkg:${gtk}:gtk_binary_version}/loaders/*.so </binary> +  <binary> -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-osx] 9b9a74: Bump version numbers and years
by Jiří Techet 11 Mar '16

11 Mar '16

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Fri, 11 Mar 2016 14:22:26 UTC Commit: 9b9a743552015e1603a3a4828b649a5c4aa08c07 https://github.com/geany/geany-osx/commit/9b9a743552015e1603a3a4828b649a5c4… Log Message: ----------- Bump version numbers and years Modified Paths: -------------- Info.plist create_dmg.sh Modified: Info.plist 8 lines changed, 4 insertions(+), 4 deletions(-) =================================================================== @@ -3,13 +3,13 @@ <plist version="1.0"> <dict> <key>CFBundleShortVersionString</key> - <string>1.26</string> + <string>1.27</string> <key>CFBundleVersion</key> - <string>1.26</string> + <string>1.27</string> <key>CFBundleGetInfoString</key> - <string>1.26 (C) 2015 The Geany Team, http://www.geany.org</string> + <string>1.27 (C) 2016 The Geany Team, http://www.geany.org</string> <key>NSHumanReadableCopyright</key> - <string>Copyright 2015 The Geany Team, GNU General Public License</string> + <string>Copyright 2016 The Geany Team, GNU General Public License</string> <key>CFBundleDevelopmentRegion</key> <string>English</string> Modified: create_dmg.sh 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,6 +1,6 @@ #!/bin/sh -VERSION="1.26" +VERSION="1.27" NAME="Geany" ICONNAME="Geany.icns" -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 7798a0: Update NEWS preparing for next release
by Colomban Wendling 10 Mar '16

10 Mar '16

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Thu, 10 Mar 2016 00:06:54 UTC Commit: 7798a041b7212352f6f947fbe77a72dc6dfbf878 https://github.com/geany/geany/commit/7798a041b7212352f6f947fbe77a72dc6dfbf… Log Message: ----------- Update NEWS preparing for next release Modified Paths: -------------- NEWS Modified: NEWS 50 lines changed, 50 insertions(+), 0 deletions(-) =================================================================== @@ -1,9 +1,59 @@ Geany 1.27 (unreleased) + Bug fixes + * Fix build with GLib < 2.32 (Issue#764). + * Fix missing progress bar during build runs (Issue#765). + * Fix infinite loop when performing reflow on some input with many + consecutive spaces (Issue#848, PR#852). + * Fix some locale encoding conversion issues (Jiří Techet, PR#547). + + Interface + * Allow to set a keybinding for File->Properties (Issue#622, PR#952). + * Make it possible to define default symbol_list_sort_mode (Jiří Techet, + Issue#313, PR#581). + * Add keybindings for custom commands 4 through 9 (Thomas Sahlin, PR#858). + * Use "Symbol" in place of "Tag" everywhere it does not refer to markup + tags (Jiří Techet, Issue#579, PR#582). + + Editor + * Update Scintilla to version 3.6.3 (including improved support for Lua + 5.3 and Perl 5.22). + * Greatly improve scope completion (Jiří Techet, PR#488, PR#505, PR#862, + PR#906). + * Performance improvement highlighting types (Jiří Techet, PR#575). + * Show calltips after a C++ explicit specialization (PR#496). + * Show a popup to select the symbol when going to a symbol has several + options (Jiří Techet, PR#406, PR#923). + + Filetypes + * Added some extra Markdown extensions (Andrea Stacchiotti, PR#820). + * Add `.asm51` and `.a51` extensions for 8051 assembly (Devyn Collier + Johnson, PR#739). + * Fix C++ namespaces scope (Issue#871). + * Fix parsing of C++ global scope qualifiers in base class lists. + * Use the C++ parser for CUDA filetype (Issue#830, PR#831). + * Add Clojure file extensions (Daniel Șuteu, PR#842). + * Improve return type and var type recognition in C, C++, C# and D + (Issue#845, PR#889). + * Fix parsing of C++11 raw string literals (PR#879). + * Update built-in PHP symbols (Issue#584, PR#603). + * Fix parsing some Objective-C properties (PR#940, PR#941). + Internationalization * Updated translations: de, es, fr, it, ja, kk, lt, nl, pt, ru, sk, zh_CN + API + * Add `editor_set_indent_width()` (Thomas Martitz, PR#903). + * Add `GeanyFiletypeID` and deprecate `filetype_id` (PR#932). + * Remove non-API type `langType` (Jiří Techet, part of PR#906). + * Mark deprecated API so GCC-like compilers can warn about it, and add + `GEANY_DISABLE_DEPRECATION_WARNINGS` to silence those (PR#911). + * Add `scintilla_object_send_message()`, `scintilla_object_get_type()` + and `scintilla_object_new()` alias to the API as synonyms for their + legacy counterparts `scintilla_send_message()`, `scintilla_get_type()` + and `scintilla_new()` (Thomas Martitz, PR#874). + Geany 1.26 (November 15, 2015) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] c3c67c: doc: Generate geany-sciwrappers-gtkdoc.h along geany-gtkdoc.h
by Thomas Martitz 10 Mar '16

10 Mar '16

Branch: refs/heads/master Author: Thomas Martitz <kugel(a)rockbox.org> Committer: Thomas Martitz <kugel(a)rockbox.org> Date: Wed, 09 Mar 2016 22:42:09 UTC Commit: c3c67c96d44009a3a1c5a9e1d70b778002d5f847 https://github.com/geany/geany/commit/c3c67c96d44009a3a1c5a9e1d70b778002d5f… Log Message: ----------- doc: Generate geany-sciwrappers-gtkdoc.h along geany-gtkdoc.h geany-sciwrappers-gtkdoc.h contains all scintilla_object_* methods. It is intended that they are going to be exposed through a separate .gir file, therefore a separate header makes things easier. This is useful when you want scintlla-related stuff in a separate .gir file or oarse it specially otherwise. gen-api-gtkdoc.py: Add switch to write out scintilla_object methods Modified Paths: -------------- .gitignore doc/Doxyfile.in doc/Makefile.am scripts/gen-api-gtkdoc.py Modified: .gitignore 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -112,6 +112,7 @@ Makefile.in /doc/*.toc /doc/reference /doc/geany-gtkdoc.h +/doc/geany-sciwrappers-gtkdoc.h /doc/xml/ #----------------------------------------------------------------------- Modified: doc/Doxyfile.in 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -850,7 +850,8 @@ RECURSIVE = NO # Note that relative paths are relative to the directory from which doxygen is # run. -EXCLUDE = @top_srcdir@/doc/geany-gtkdoc.h +EXCLUDE = @top_srcdir@/doc/geany-gtkdoc.h \ + @top_srcdir@/doc/geany-sciwrappers-gtkdoc.h # The EXCLUDE_SYMLINKS tag can be used to select whether or not files or # directories that are symbolic links (a Unix file system feature) are excluded Modified: doc/Makefile.am 11 lines changed, 7 insertions(+), 4 deletions(-) =================================================================== @@ -129,16 +129,19 @@ Doxyfile-gi.stamp: Doxyfile-gi Doxyfile.stamp $(doxygen_sources) $(AM_V_GEN)$(DOXYGEN) Doxyfile-gi && echo "" > $@ geany-gtkdoc.h: Doxyfile-gi.stamp $(top_srcdir)/scripts/gen-api-gtkdoc.py - $(AM_V_GEN)$(top_srcdir)/scripts/gen-api-gtkdoc.py xml -d $(builddir) -o $@ + $(AM_V_GEN)$(top_srcdir)/scripts/gen-api-gtkdoc.py xml -d $(builddir) -o $@ \ + --sci-output geany-sciwrappers-gtkdoc.h + +geany-sciwrappers-gtkdoc.h: geany-gtkdoc.h geany_gtkdocincludedir = $(includedir)/geany/gtkdoc -nodist_geany_gtkdocinclude_HEADERS = geany-gtkdoc.h +nodist_geany_gtkdocinclude_HEADERS = geany-gtkdoc.h geany-sciwrappers-gtkdoc.h -ALL_LOCAL_TARGETS += geany-gtkdoc.h +ALL_LOCAL_TARGETS += geany-gtkdoc.h geany-sciwrappers-gtkdoc.h CLEAN_LOCAL_TARGETS += clean-gtkdoc-header-local clean-gtkdoc-header-local: - -rm -rf xml/ Doxyfile-gi Doxyfile-gi.stamp geany-gtkdoc.h + -rm -rf xml/ Doxyfile-gi Doxyfile-gi.stamp geany-gtkdoc.h geany-sciwrappers-gtkdoc.h endif Modified: scripts/gen-api-gtkdoc.py 24 lines changed, 24 insertions(+), 0 deletions(-) =================================================================== @@ -341,6 +341,7 @@ def from_memberdef(xml): def main(args): xml_dir = None outfile = None + scioutfile = None parser = OptionParser(usage="usage: %prog [options] XML_DIR") parser.add_option("--xmldir", metavar="DIRECTORY", help="Path to Doxygen-generated XML files", @@ -349,6 +350,8 @@ def main(args): action="store", dest="outdir", default=".") parser.add_option("-o", "--output", metavar="FILE", help="Write output to FILE", action="store", dest="outfile") + parser.add_option("--sci-output", metavar="FILE", help="Write output to FILE (only sciwrappers)", + action="store", dest="scioutfile") opts, args = parser.parse_args(args[1:]) xml_dir = args[0] @@ -397,11 +400,25 @@ def main(args): else: outfile = sys.stdout + if (opts.scioutfile): + try: + scioutfile = open(opts.scioutfile, "w+") + except OSError as err: + sys.stderr.write("failed to open \"%s\" for writing (%s)\n" % (opts.scioutfile, err.strerror)) + return 1 + else: + scioutfile = outfile + try: outfile.write("/*\n * Automatically generated file - do not edit\n */\n\n") outfile.write("#include \"gtkcompat.h\"\n") outfile.write("#include \"Scintilla.h\"\n") outfile.write("#include \"ScintillaWidget.h\"\n") + if (scioutfile != outfile): + scioutfile.write("/*\n * Automatically generated file - do not edit\n */\n\n") + scioutfile.write("#include \"gtkcompat.h\"\n") + scioutfile.write("#include \"Scintilla.h\"\n") + scioutfile.write("#include \"ScintillaWidget.h\"\n") # write enums first, so typedefs to them are valid (as forward enum declaration # is invalid). It's fine as an enum can't contain reference to other types. @@ -423,6 +440,13 @@ def main(args): outfile.write(e.to_gtkdoc()) outfile.write(e.definition) outfile.write("\n\n") + if (e.name.startswith("sci_")): + if (scioutfile != outfile): + scioutfile.write("\n\n") + scioutfile.write(e.to_gtkdoc()) + scioutfile.write(e.definition) + scioutfile.write("\n\n") + except BrokenPipeError: # probably piped to head or tail return 0 -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 1e9110: Merge pull request #956 from kugel-/tm-gir-fix
by Colomban Wendling 10 Mar '16

10 Mar '16

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Wed, 09 Mar 2016 22:32:22 UTC Commit: 1e911051abb6cdc8b7fc1ee5aebfe17fbd736358 https://github.com/geany/geany/commit/1e911051abb6cdc8b7fc1ee5aebfe17fbd736… Log Message: ----------- Merge pull request #956 from kugel-/tm-gir-fix Fix and cleanup GtkDoc header generation regarding TagManager's types. Modified Paths: -------------- doc/Doxyfile.in scripts/gen-api-gtkdoc.py tagmanager/src/tm_parser.h tagmanager/src/tm_source_file.h tagmanager/src/tm_workspace.h Modified: doc/Doxyfile.in 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -793,7 +793,8 @@ INPUT = @top_srcdir@/src/ \ @top_srcdir@/tagmanager/src/tm_source_file.c \ @top_srcdir@/tagmanager/src/tm_source_file.h \ @top_srcdir@/tagmanager/src/tm_workspace.c \ - @top_srcdir@/tagmanager/src/tm_workspace.h + @top_srcdir@/tagmanager/src/tm_workspace.h \ + @top_srcdir@/tagmanager/src/tm_parser.h # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses Modified: scripts/gen-api-gtkdoc.py 8 lines changed, 3 insertions(+), 5 deletions(-) =================================================================== @@ -399,11 +399,9 @@ def main(args): try: outfile.write("/*\n * Automatically generated file - do not edit\n */\n\n") - outfile.write("#include <glib.h>\n") - outfile.write("#include <gtk/gtk.h>\n\n") - outfile.write("typedef struct _ScintillaObject ScintillaObject;\n") - outfile.write("typedef struct TMSourceFile TMSourceFile;\n") - outfile.write("typedef struct TMWorkspace TMWorkspace;\n") + outfile.write("#include \"gtkcompat.h\"\n") + outfile.write("#include \"Scintilla.h\"\n") + outfile.write("#include \"ScintillaWidget.h\"\n") # write enums first, so typedefs to them are valid (as forward enum declaration # is invalid). It's fine as an enum can't contain reference to other types. Modified: tagmanager/src/tm_parser.h 3 lines changed, 3 insertions(+), 0 deletions(-) =================================================================== @@ -10,6 +10,9 @@ #ifndef TM_PARSER_H #define TM_PARSER_H +/** @gironly + * A integral type which can hold known parser type IDs + **/ typedef gint TMParserType; Modified: tagmanager/src/tm_source_file.h 6 lines changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -33,9 +33,9 @@ extern "C" /** - The TMSourceFile structure represents the source file and its tags in the tag manager. -*/ -typedef struct + * The TMSourceFile structure represents the source file and its tags in the tag manager. + **/ +typedef struct TMSourceFile { TMParserType lang; /* Programming language used */ char *file_name; /**< Full file name (inc. path) */ Modified: tagmanager/src/tm_workspace.h 10 lines changed, 5 insertions(+), 5 deletions(-) =================================================================== @@ -22,11 +22,11 @@ extern "C" /** The Tag Manager Workspace. This is a singleton object containing a list - of individual source files. There is also a global tag list - which can be loaded or created. This contains global tags gleaned from - /usr/include, etc. and should be used for autocompletion, calltips, etc. -*/ -typedef struct + * of individual source files. There is also a global tag list + * which can be loaded or created. This contains global tags gleaned from + * /usr/include, etc. and should be used for autocompletion, calltips, etc. + **/ +typedef struct TMWorkspace { GPtrArray *global_tags; /**< Global tags loaded at startup */ GPtrArray *source_files; /**< An array of TMSourceFile pointers */ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 4a54ee: Include more headers into geany-gtkdoc.h
by Thomas Martitz 10 Mar '16

10 Mar '16

Branch: refs/heads/master Author: Thomas Martitz <kugel(a)rockbox.org> Committer: Thomas Martitz <kugel(a)rockbox.org> Date: Wed, 09 Mar 2016 21:49:51 UTC Commit: 4a54ee86f3a4401e76d1fa001ce2b5d4be9adca4 https://github.com/geany/geany/commit/4a54ee86f3a4401e76d1fa001ce2b5d4be9ad… Log Message: ----------- Include more headers into geany-gtkdoc.h gtkcompat.h is more convinient, and includes gtk.h and glib.h. Due to including ScintillaWidget.h, the manual ScintillaObject typedef isn't required anymore. Modified Paths: -------------- scripts/gen-api-gtkdoc.py Modified: scripts/gen-api-gtkdoc.py 6 lines changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -399,9 +399,9 @@ def main(args): try: outfile.write("/*\n * Automatically generated file - do not edit\n */\n\n") - outfile.write("#include <glib.h>\n") - outfile.write("#include <gtk/gtk.h>\n\n") - outfile.write("typedef struct _ScintillaObject ScintillaObject;\n") + outfile.write("#include \"gtkcompat.h\"\n") + outfile.write("#include \"Scintilla.h\"\n") + outfile.write("#include \"ScintillaWidget.h\"\n") outfile.write("typedef struct TMSourceFile TMSourceFile;\n") outfile.write("typedef struct TMWorkspace TMWorkspace;\n") -------------- 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
8
9
10
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits March 2016