Plugins-Commits September 2009

plugins-commits@lists.geany.org

8 participants
93 discussions

Nightly build failed: Plugins GTK 2.8 build test
by noreply＠nightly.geany.org 23 Sep '09

23 Sep '09

Plugins GTK 2.8 build test failed at: waf build See http://nightly.geany.org/misc/build_gtk28_plugins_stderr.log for details. Error messages: ../../gtk28_test_plugins/codenav/src/codenavigation.c: In function 'switch_menu_item_activate': ../../gtk28_test_plugins/codenav/src/codenavigation.c:209: error: 'g_strcmp0' undeclared (first use in this function) ../../gtk28_test_plugins/codenav/src/codenavigation.c:209: error: (Each undeclared identifier is reported only once ../../gtk28_test_plugins/codenav/src/codenavigation.c:209: error: for each function it appears in.) ... ../../gtk28_test_plugins/codenav/src/codenavigation.c:209: error: for each function it appears in.) ../../gtk28_test_plugins/codenav/src/codenavigation.c:251: warning: comparison between signed and unsigned ../../gtk28_test_plugins/codenav/src/codenavigation.c:260: warning: implicit declaration of function 'g_strcmp0' ../../gtk28_test_plugins/codenav/src/codenavigation.c:311: warning: ISO C90 forbids mixed declarations and code Build failed -> task failed (err #1): {task: cc codenavigation.c -> codenavigation_2.o} http://nightly.geany.org/

1 0

Nightly build failed: Plugins GTK 2.8 build test
by noreply＠nightly.geany.org 22 Sep '09

22 Sep '09

1 0

SF.net SVN: geany-plugins:[949] branches/geany-plugins/geany-plugins-0.18/ configure.ac
by hyperair＠users.sourceforge.net 21 Sep '09

21 Sep '09

Revision: 949 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=949&view=rev Author: hyperair Date: 2009-09-21 07:56:24 +0000 (Mon, 21 Sep 2009) Log Message: ----------- Turn on automake silent rules if supported Modified Paths: -------------- branches/geany-plugins/geany-plugins-0.18/configure.ac Modified: branches/geany-plugins/geany-plugins-0.18/configure.ac =================================================================== --- branches/geany-plugins/geany-plugins-0.18/configure.ac 2009-09-21 07:55:37 UTC (rev 948) +++ branches/geany-plugins/geany-plugins-0.18/configure.ac 2009-09-21 07:56:24 UTC (rev 949) @@ -2,6 +2,8 @@ AC_INIT([geany-plugins], [0.17.1]) AM_INIT_AUTOMAKE([1.8 foreign dist-bzip2 tar-ustar]) +m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) + AC_CONFIG_SRCDIR([po/LINGUAS]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_MACRO_DIR([build/cache]) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[948] trunk/geany-plugins/configure.ac
by hyperair＠users.sourceforge.net 21 Sep '09

21 Sep '09

Revision: 948 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=948&view=rev Author: hyperair Date: 2009-09-21 07:55:37 +0000 (Mon, 21 Sep 2009) Log Message: ----------- Turn on automake silent rules if supported Modified Paths: -------------- trunk/geany-plugins/configure.ac Modified: trunk/geany-plugins/configure.ac =================================================================== --- trunk/geany-plugins/configure.ac 2009-09-21 06:01:15 UTC (rev 947) +++ trunk/geany-plugins/configure.ac 2009-09-21 07:55:37 UTC (rev 948) @@ -2,6 +2,8 @@ AC_INIT([geany-plugins], [0.17.1]) AM_INIT_AUTOMAKE([1.8 foreign dist-bzip2 tar-ustar]) +m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) + AC_CONFIG_SRCDIR([po/LINGUAS]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_MACRO_DIR([build/cache]) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[947] branches/geany-plugins/geany-plugins-0.18
by hyperair＠users.sourceforge.net 21 Sep '09

21 Sep '09

Revision: 947 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=947&view=rev Author: hyperair Date: 2009-09-21 06:01:15 +0000 (Mon, 21 Sep 2009) Log Message: ----------- Port build system updates from trunk Remaining changes: * excluded pretty-printer, codenav, geanydoc, geanyprj support until it enters this branch Modified Paths: -------------- branches/geany-plugins/geany-plugins-0.18/build/addons.m4 branches/geany-plugins/geany-plugins-0.18/build/geany-plugins.nsi branches/geany-plugins/geany-plugins-0.18/build/geanygdb.m4 branches/geany-plugins/geany-plugins-0.18/build/geanylatex.m4 branches/geany-plugins/geany-plugins-0.18/build/geanylipsum.m4 branches/geany-plugins/geany-plugins-0.18/build/geanylua.m4 branches/geany-plugins/geany-plugins-0.18/build/geanysendmail.m4 branches/geany-plugins/geany-plugins-0.18/build/geanyvc.m4 branches/geany-plugins/geany-plugins-0.18/build/shiftcolumn.m4 branches/geany-plugins/geany-plugins-0.18/build/spellcheck.m4 branches/geany-plugins/geany-plugins-0.18/configure.ac branches/geany-plugins/geany-plugins-0.18/spellcheck/src/Makefile.am Added Paths: ----------- branches/geany-plugins/geany-plugins-0.18/build/expansions.m4 branches/geany-plugins/geany-plugins-0.18/build/geany.m4 branches/geany-plugins/geany-plugins-0.18/build/i18n.m4 branches/geany-plugins/geany-plugins-0.18/build/status.m4 branches/geany-plugins/geany-plugins-0.18/build/unittests.m4 Modified: branches/geany-plugins/geany-plugins-0.18/build/addons.m4 =================================================================== --- branches/geany-plugins/geany-plugins-0.18/build/addons.m4 2009-09-21 05:57:38 UTC (rev 946) +++ branches/geany-plugins/geany-plugins-0.18/build/addons.m4 2009-09-21 06:01:15 UTC (rev 947) @@ -1,5 +1,6 @@ AC_DEFUN([GP_CHECK_ADDONS], [ + GP_STATUS_PLUGIN_ADD([Addons], [yes]) AC_CONFIG_FILES([ addons/Makefile addons/src/Makefile Added: branches/geany-plugins/geany-plugins-0.18/build/expansions.m4 =================================================================== --- branches/geany-plugins/geany-plugins-0.18/build/expansions.m4 (rev 0) +++ branches/geany-plugins/geany-plugins-0.18/build/expansions.m4 2009-09-21 06:01:15 UTC (rev 947) @@ -0,0 +1,20 @@ +AC_DEFUN([_GP_EXPAND_PREFIX_], +[ + case $prefix in + NONE) prefix=$ac_default_prefix ;; + *) ;; + esac + + case $exec_prefix in + NONE) exec_prefix=$prefix ;; + *) ;; + esac +]) + +AC_DEFUN([GP_EXPAND_DIR], +[ + AC_REQUIRE([_GP_EXPAND_PREFIX_]) + + expanded_$1=$(eval echo $$1) + expanded_$1=$(eval echo $expanded_$1) +]) Modified: branches/geany-plugins/geany-plugins-0.18/build/geany-plugins.nsi =================================================================== --- branches/geany-plugins/geany-plugins-0.18/build/geany-plugins.nsi 2009-09-21 05:57:38 UTC (rev 946) +++ branches/geany-plugins/geany-plugins-0.18/build/geany-plugins.nsi 2009-09-21 06:01:15 UTC (rev 947) @@ -31,8 +31,8 @@ ; helper defines ; ;;;;;;;;;;;;;;;;;;; !define PRODUCT_NAME "Geany-Plugins" -!define PRODUCT_VERSION "0.17.1" -!define PRODUCT_VERSION_ID "0.17.1.0" +!define PRODUCT_VERSION "0.17" +!define PRODUCT_VERSION_ID "0.17.0.0" !define PRODUCT_PUBLISHER "The Geany developer team" !define PRODUCT_WEB_SITE "http://www.geany.org/" !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" @@ -209,6 +209,33 @@ done: !macroend +Function CheckForGeany + ; find and read Geany's installation directory and use it as our installation directory + ReadRegStr $INSTDIR SHCTX "${GEANY_DIR_REGKEY}" "Path" + StrCmp $INSTDIR "" 0 +3 + MessageBox MB_OK|MB_ICONSTOP "Geany could not be found. Please install Geany first." /SD IDOK + Abort + + ; check Geany's version + GetDLLVersion "$INSTDIR\bin\geany.exe" $R0 $R1 + IntOp $R2 $R0 >> 16 + IntOp $R2 $R2 & 0x0000FFFF ; $R2 now contains major version + IntOp $R3 $R0 & 0x0000FFFF ; $R3 now contains minor version + StrCpy $0 "$R2.$R3" + StrCmp $0 ${REQUIRED_GEANY_VERSION} version_check_done 0 + MessageBox MB_YESNO|MB_ICONEXCLAMATION \ + "You have Geany $0 installed but you need Geany ${REQUIRED_GEANY_VERSION}.$\nDo you really want to continue?" \ + /SD IDNO IDNO stop IDYES ignore +stop: + Abort +ignore: + MessageBox MB_OK|MB_ICONEXCLAMATION \ + "Using another version than Geany ${REQUIRED_GEANY_VERSION} may cause unloadable plugins or crashes." \ + /SD IDOK + +version_check_done: +FunctionEnd + Function .onInit ; (from http://jabref.svn.sourceforge.net/viewvc/jabref/trunk/jabref/src/windows/ns…) ; If the user does *not* have administrator privileges, abort @@ -224,30 +251,15 @@ StrCpy $INSTDIR "$PROFILE\$(^Name)" ${endif} - ; find and read Geany's installation directory and use it as our installation directory - ReadRegStr $INSTDIR SHCTX "${GEANY_DIR_REGKEY}" "Path" - StrCmp $INSTDIR "" 0 +3 - MessageBox MB_OK|MB_ICONSTOP "Geany could not be found. Please install Geany first." /SD IDOK - Abort - - ; check Geany's version - GetDLLVersion "$INSTDIR\bin\geany.exe" $R0 $R1 - IntOp $R2 $R0 >> 16 - IntOp $R2 $R2 & 0x0000FFFF ; $R2 now contains major version - IntOp $R3 $R0 & 0x0000FFFF ; $R3 now contains minor version - StrCpy $0 "$R2.$R3" ; $0 now contains string like "1.2.0.192" - StrCmp $0 ${REQUIRED_GEANY_VERSION} +3 0 - MessageBox MB_OK|MB_ICONSTOP \ - "You have Geany $0 installed but you need Geany ${REQUIRED_GEANY_VERSION}." \ - /SD IDOK - Abort - ; prevent running multiple instances of the installer System::Call 'kernel32::CreateMutexA(i 0, i 0, t "geany_plugins_installer") i .r1 ?e' Pop $R0 StrCmp $R0 0 +3 MessageBox MB_OK|MB_ICONEXCLAMATION "The installer is already running." /SD IDOK Abort + + Call CheckForGeany + ; warn about a new install over an existing installation ReadRegStr $R0 SHCTX "${PRODUCT_UNINST_KEY}" "UninstallString" StrCmp $R0 "" finish Added: branches/geany-plugins/geany-plugins-0.18/build/geany.m4 =================================================================== --- branches/geany-plugins/geany-plugins-0.18/build/geany.m4 (rev 0) +++ branches/geany-plugins/geany-plugins-0.18/build/geany.m4 2009-09-21 06:01:15 UTC (rev 947) @@ -0,0 +1,19 @@ +AC_DEFUN([GP_CHECK_GEANY], +[ + AC_REQUIRE([PKG_PROG_PKG_CONFIG]) + AC_ARG_WITH([geany-prefix], + AC_HELP_STRING([--with-geany-prefix=PATH], + [Set Geany's installation prefix [[default=auto]]]), + [geany_prefix=${withval}], + [geany_prefix=$(${PKG_CONFIG} --variable=prefix geany)]) + + export PKG_CONFIG_PATH="$geany_prefix/lib/pkgconfig:$PKG_CONFIG_PATH" + + PKG_CHECK_MODULES([GEANY], [geany >= $1]) + geanypluginsdir=$(${PKG_CONFIG} --variable=libdir geany)/geany + geanyversion=$(${PKG_CONFIG} --modversion geany) + AC_SUBST([geanypluginsdir]) + + PKG_CONFIG_PATH="${PKG_CONFIG_PATH#*:}" + test -z "${PKG_CONFIG_PATH}" && unset PKG_CONFIG_PATH +]) Modified: branches/geany-plugins/geany-plugins-0.18/build/geanygdb.m4 =================================================================== --- branches/geany-plugins/geany-plugins-0.18/build/geanygdb.m4 2009-09-21 05:57:38 UTC (rev 946) +++ branches/geany-plugins/geany-plugins-0.18/build/geanygdb.m4 2009-09-21 06:01:15 UTC (rev 947) @@ -1,5 +1,8 @@ AC_DEFUN([GP_CHECK_GEANYGDB], [ + GP_STATUS_PLUGIN_ADD([GeanyGDB], [yes]) + AC_CHECK_HEADERS([elf.h]) + AC_CHECK_HEADERS([elf_abi.h]) AC_CONFIG_FILES([ geanygdb/Makefile geanygdb/src/Makefile Modified: branches/geany-plugins/geany-plugins-0.18/build/geanylatex.m4 =================================================================== --- branches/geany-plugins/geany-plugins-0.18/build/geanylatex.m4 2009-09-21 05:57:38 UTC (rev 946) +++ branches/geany-plugins/geany-plugins-0.18/build/geanylatex.m4 2009-09-21 06:01:15 UTC (rev 947) @@ -1,5 +1,6 @@ AC_DEFUN([GP_CHECK_GEANYLATEX], [ + GP_STATUS_PLUGIN_ADD([GeanyLaTeX], [yes]) AC_CONFIG_FILES([ geanylatex/Makefile geanylatex/src/Makefile Modified: branches/geany-plugins/geany-plugins-0.18/build/geanylipsum.m4 =================================================================== --- branches/geany-plugins/geany-plugins-0.18/build/geanylipsum.m4 2009-09-21 05:57:38 UTC (rev 946) +++ branches/geany-plugins/geany-plugins-0.18/build/geanylipsum.m4 2009-09-21 06:01:15 UTC (rev 947) @@ -1,5 +1,6 @@ AC_DEFUN([GP_CHECK_GEANYLIPSUM], [ + GP_STATUS_PLUGIN_ADD([GeanyLipsum], [yes]) AC_CONFIG_FILES([ geanylipsum/Makefile geanylipsum/src/Makefile Modified: branches/geany-plugins/geany-plugins-0.18/build/geanylua.m4 =================================================================== --- branches/geany-plugins/geany-plugins-0.18/build/geanylua.m4 2009-09-21 05:57:38 UTC (rev 946) +++ branches/geany-plugins/geany-plugins-0.18/build/geanylua.m4 2009-09-21 06:01:15 UTC (rev 947) @@ -27,6 +27,7 @@ fi AM_CONDITIONAL(ENABLE_GEANYLUA, test $enable_geanylua = yes) + GP_STATUS_PLUGIN_ADD([GeanyLua], [$enable_geanylua]) AC_CONFIG_FILES([ geanylua/examples/edit/Makefile Modified: branches/geany-plugins/geany-plugins-0.18/build/geanysendmail.m4 =================================================================== --- branches/geany-plugins/geany-plugins-0.18/build/geanysendmail.m4 2009-09-21 05:57:38 UTC (rev 946) +++ branches/geany-plugins/geany-plugins-0.18/build/geanysendmail.m4 2009-09-21 06:01:15 UTC (rev 947) @@ -1,5 +1,6 @@ AC_DEFUN([GP_CHECK_GEANYSENDMAIL], [ + GP_STATUS_PLUGIN_ADD([GeanySendmail], [yes]) AC_CONFIG_FILES([ geanysendmail/Makefile geanysendmail/src/Makefile Modified: branches/geany-plugins/geany-plugins-0.18/build/geanyvc.m4 =================================================================== --- branches/geany-plugins/geany-plugins-0.18/build/geanyvc.m4 2009-09-21 05:57:38 UTC (rev 946) +++ branches/geany-plugins/geany-plugins-0.18/build/geanyvc.m4 2009-09-21 06:01:15 UTC (rev 947) @@ -1,5 +1,6 @@ AC_DEFUN([GP_CHECK_GEANYVC], [ + GP_STATUS_PLUGIN_ADD([GeanyVC], [yes]) AC_ARG_ENABLE(gtkspell, AC_HELP_STRING([--enable-gtkspell=ARG], [Enable GtkSpell support in GeanyVC. [[default=auto]]]),, @@ -13,9 +14,11 @@ fi AM_CONDITIONAL(USE_GTKSPELL, test $enable_gtkspell = yes) + GP_STATUS_FEATURE_ADD([GeanyVC GtkSpell support], [$enable_gtkspell]) AC_CONFIG_FILES([ geanyvc/Makefile geanyvc/src/Makefile + geanyvc/tests/Makefile ]) ]) Added: branches/geany-plugins/geany-plugins-0.18/build/i18n.m4 =================================================================== --- branches/geany-plugins/geany-plugins-0.18/build/i18n.m4 (rev 0) +++ branches/geany-plugins/geany-plugins-0.18/build/i18n.m4 2009-09-21 06:01:15 UTC (rev 947) @@ -0,0 +1,12 @@ +AC_DEFUN([GP_I18N], +[ + GETTEXT_PACKAGE=geany-plugins + AC_SUBST(GETTEXT_PACKAGE) + AC_DEFINE_UNQUOTED( + [GETTEXT_PACKAGE], + ["$GETTEXT_PACKAGE"], + [The domain to use with gettext]) + LOCALEDIR="${datadir}/locale" + AC_SUBST(LOCALEDIR) + AM_GLIB_GNU_GETTEXT +]) Modified: branches/geany-plugins/geany-plugins-0.18/build/shiftcolumn.m4 =================================================================== --- branches/geany-plugins/geany-plugins-0.18/build/shiftcolumn.m4 2009-09-21 05:57:38 UTC (rev 946) +++ branches/geany-plugins/geany-plugins-0.18/build/shiftcolumn.m4 2009-09-21 06:01:15 UTC (rev 947) @@ -1,5 +1,6 @@ AC_DEFUN([GP_CHECK_SHIFTCOLUMN], [ + GP_STATUS_PLUGIN_ADD([ShiftColumn], [yes]) AC_CONFIG_FILES([ shiftcolumn/Makefile shiftcolumn/src/Makefile Modified: branches/geany-plugins/geany-plugins-0.18/build/spellcheck.m4 =================================================================== --- branches/geany-plugins/geany-plugins-0.18/build/spellcheck.m4 2009-09-21 05:57:38 UTC (rev 946) +++ branches/geany-plugins/geany-plugins-0.18/build/spellcheck.m4 2009-09-21 06:01:15 UTC (rev 947) @@ -6,16 +6,27 @@ enable_spellcheck=auto) ENCHANT_VERSION=1.3 + OPT_ENCHANT_VERSION=1.5 if [[ x"$enable_spellcheck" = "xauto" ]]; then - PKG_CHECK_MODULES(ENCHANT, [enchant >= $ENCHANT_VERSION], - [enable_spellcheck=yes], - [enable_spellcheck=no]) + PKG_CHECK_MODULES(ENCHANT, [enchant >= $OPT_ENCHANT_VERSION], + [have_enchant_1_5=yes; enable_spellcheck=yes], + [have_enchant_1_5=no; enable_spellcheck=auto]) + if [[ "$enable_spellcheck" = "auto" ]]; then + PKG_CHECK_MODULES(ENCHANT, [enchant >= $ENCHANT_VERSION], + [enable_spellcheck=yes], + [enable_spellcheck=no]) + fi elif [[ x"$enable_spellcheck" = "xyes" ]]; then - PKG_CHECK_MODULES(ENCHANT, [enchant >= $ENCHANT_VERSION]) + PKG_CHECK_MODULES(ENCHANT, [enchant >= $OPT_ENCHANT_VERSION], + [have_enchant_1_5=yes], + [have_enchant_1_5=no; + PKG_CHECK_MODULES(ENCHANT, [enchant >= $ENCHANT_VERSION])]) fi AM_CONDITIONAL(ENABLE_SPELLCHECK, test $enable_spellcheck = yes) + AM_CONDITIONAL(HAVE_ENCHANT_1_5, test $have_enchant_1_5 = yes) + GP_STATUS_PLUGIN_ADD([Spellcheck], [$enable_spellcheck]) AC_CONFIG_FILES([ spellcheck/Makefile Added: branches/geany-plugins/geany-plugins-0.18/build/status.m4 =================================================================== --- branches/geany-plugins/geany-plugins-0.18/build/status.m4 (rev 0) +++ branches/geany-plugins/geany-plugins-0.18/build/status.m4 2009-09-21 06:01:15 UTC (rev 947) @@ -0,0 +1,60 @@ +dnl add plugin status message, e.g. GP_STATUS_PLUGIN_ADD(plugin,yes) +AC_DEFUN([GP_STATUS_PLUGIN_ADD], +[ + plugins_statusmsg+="$1:$2 +" +]) + +dnl add feature status message, e.g. GP_STATUS_FEATURE_ADD(feature,yes) +AC_DEFUN([GP_STATUS_FEATURE_ADD], +[ + feature_statusmsg+="$1:$2 +" +]) + +dnl indent $1_statusmsg with RHS at col $2 +AC_DEFUN([_GP_STATUS_PRINT_INDENT_], +[ + while read line; do + test -z "$line" && break; + plugin=" ${line%:*}:" + status=${line#*:} + let extracols=$2-${#plugin} + echo -n "$plugin" + for (( i=0; $i<$extracols; i++ )); do + echo -n ' ' + done + echo $status + done << GPEOF +$$1_statusmsg +GPEOF +]) + +dnl print status message +AC_DEFUN([GP_STATUS_PRINT], +[ + GP_EXPAND_DIR(datadir) + GP_EXPAND_DIR(libdir) + GP_EXPAND_DIR(docdir) + + cat <<GPEOF + +${PACKAGE}-${VERSION} + + Build Environment: + Geany version: ${geanyversion} + Install prefix: ${prefix} + Datadir: ${expanded_datadir}/${PACKAGE_TARNAME} + Libdir: ${expanded_libdir}/${PACKAGE_TARNAME} + Docdir: ${expanded_docdir} + Plugins path: ${geanypluginsdir} + + Plugins: +GPEOF + + _GP_STATUS_PRINT_INDENT_(plugins, 34) + echo + echo " Features:" + _GP_STATUS_PRINT_INDENT_(feature, 34) + echo +]) Added: branches/geany-plugins/geany-plugins-0.18/build/unittests.m4 =================================================================== --- branches/geany-plugins/geany-plugins-0.18/build/unittests.m4 (rev 0) +++ branches/geany-plugins/geany-plugins-0.18/build/unittests.m4 2009-09-21 06:01:15 UTC (rev 947) @@ -0,0 +1,7 @@ +AC_DEFUN([GP_CHECK_UNITTESTS], +[ + PKG_CHECK_MODULES([CHECK], [check >= $1], + [AM_CONDITIONAL(UNITTESTS, true)], + [AM_CONDITIONAL(UNITTESTS, false)]) +]) + Modified: branches/geany-plugins/geany-plugins-0.18/configure.ac =================================================================== --- branches/geany-plugins/geany-plugins-0.18/configure.ac 2009-09-21 05:57:38 UTC (rev 946) +++ branches/geany-plugins/geany-plugins-0.18/configure.ac 2009-09-21 06:01:15 UTC (rev 947) @@ -1,6 +1,6 @@ AC_PREREQ([2.61]) -AC_INIT([geany-plugins], [0.18]) -AM_INIT_AUTOMAKE([1.8 foreign dist-bzip2 tar-ustar subdir-objects]) +AC_INIT([geany-plugins], [0.17.1]) +AM_INIT_AUTOMAKE([1.8 foreign dist-bzip2 tar-ustar]) AC_CONFIG_SRCDIR([po/LINGUAS]) AC_CONFIG_HEADERS([config.h]) @@ -12,25 +12,12 @@ dnl i18n IT_PROG_INTLTOOL([0.35.0]) -GETTEXT_PACKAGE=geany-plugins -AC_SUBST(GETTEXT_PACKAGE) -AC_DEFINE_UNQUOTED( - [GETTEXT_PACKAGE], - ["$GETTEXT_PACKAGE"], - [The domain to use with gettext]) -AM_GLIB_GNU_GETTEXT -LOCALEDIR="${datadir}/locale" -AC_SUBST(LOCALEDIR) +GP_I18N dnl common checks -PKG_CHECK_MODULES([GEANY], [geany >= 0.18]) -geanypluginsdir=`${PKG_CONFIG} --variable=libdir geany`/geany -AC_SUBST([geanypluginsdir]) +GP_CHECK_GEANY(0.18) +GP_CHECK_UNITTESTS(0.9.4) -PKG_CHECK_MODULES([CHECK], [check >= 0.9.4], - [AM_CONDITIONAL(UNITTESTS, true)], - [AM_CONDITIONAL(UNITTESTS, false)]) - dnl plugin checks GP_CHECK_ADDONS GP_CHECK_GEANYGDB @@ -47,3 +34,4 @@ po/Makefile.in ]) AC_OUTPUT +GP_STATUS_PRINT Modified: branches/geany-plugins/geany-plugins-0.18/spellcheck/src/Makefile.am =================================================================== --- branches/geany-plugins/geany-plugins-0.18/spellcheck/src/Makefile.am 2009-09-21 05:57:38 UTC (rev 946) +++ branches/geany-plugins/geany-plugins-0.18/spellcheck/src/Makefile.am 2009-09-21 06:01:15 UTC (rev 947) @@ -18,6 +18,10 @@ $(AM_CFLAGS) \ $(ENCHANT_CFLAGS) +if HAVE_ENCHANT_1_5 +spellcheck_la_CFLAGS += -DHAVE_ENCHANT_1_5 +endif + spellcheck_la_LIBADD = \ $(COMMONLIBS) \ $(ENCHANT_LIBS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[946] trunk/geany-plugins/configure.ac
by hyperair＠users.sourceforge.net 21 Sep '09

21 Sep '09

Revision: 946 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=946&view=rev Author: hyperair Date: 2009-09-21 05:57:38 +0000 (Mon, 21 Sep 2009) Log Message: ----------- Don't use subdir-objects We're not using non-recursive automake, and won't meet with any problems regarding object name clashes anyway. It causes problems with geanyvc's unittests during distclean Modified Paths: -------------- trunk/geany-plugins/configure.ac Modified: trunk/geany-plugins/configure.ac =================================================================== --- trunk/geany-plugins/configure.ac 2009-09-20 19:21:07 UTC (rev 945) +++ trunk/geany-plugins/configure.ac 2009-09-21 05:57:38 UTC (rev 946) @@ -1,6 +1,6 @@ AC_PREREQ([2.61]) AC_INIT([geany-plugins], [0.17.1]) -AM_INIT_AUTOMAKE([1.8 foreign dist-bzip2 tar-ustar subdir-objects]) +AM_INIT_AUTOMAKE([1.8 foreign dist-bzip2 tar-ustar]) AC_CONFIG_SRCDIR([po/LINGUAS]) AC_CONFIG_HEADERS([config.h]) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

Nightly build failed: Plugins GTK 2.8 build test
by noreply＠nightly.geany.org 21 Sep '09

21 Sep '09

1 0

SF.net SVN: geany-plugins:[945] trunk/geany-plugins/wscript
by eht16＠users.sourceforge.net 20 Sep '09

20 Sep '09

Revision: 945 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=945&view=rev Author: eht16 Date: 2009-09-20 19:21:07 +0000 (Sun, 20 Sep 2009) Log Message: ----------- Add HAVE_ENCHANT_1_5 conditional and define Modified Paths: -------------- trunk/geany-plugins/wscript Modified: trunk/geany-plugins/wscript =================================================================== --- trunk/geany-plugins/wscript 2009-09-20 19:20:25 UTC (rev 944) +++ trunk/geany-plugins/wscript 2009-09-20 19:21:07 UTC (rev 945) @@ -43,6 +43,7 @@ import os import sys import tempfile +from distutils import version import Build import Options import Utils @@ -279,6 +280,10 @@ if conf.env['HAVE_GTKSPELL_2_0']: conf.define('USE_GTKSPELL', 1); + if conf.env['HAVE_ENCHANT']: + enchant_version = conf.check_cfg(modversion="enchant") + if version.LooseVersion(enchant_version) >= version.LooseVersion('1.5.0'): + conf.define('HAVE_ENCHANT_1_5', 1); if is_win32: conf.define('PREFIX', '', 1) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[944] trunk/geany-plugins/spellcheck
by eht16＠users.sourceforge.net 20 Sep '09

20 Sep '09

Revision: 944 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=944&view=rev Author: eht16 Date: 2009-09-20 19:20:25 +0000 (Sun, 20 Sep 2009) Log Message: ----------- Add preliminary support for configurable dictionary directories. Modified Paths: -------------- trunk/geany-plugins/spellcheck/ChangeLog trunk/geany-plugins/spellcheck/src/speller.c Modified: trunk/geany-plugins/spellcheck/ChangeLog =================================================================== --- trunk/geany-plugins/spellcheck/ChangeLog 2009-09-20 19:17:32 UTC (rev 943) +++ trunk/geany-plugins/spellcheck/ChangeLog 2009-09-20 19:20:25 UTC (rev 944) @@ -2,6 +2,8 @@ * src/scplugin.c: Remove more unused code. + * src/speller.c: + Add preliminary support for configurable dictionary directories. 2009-08-09 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/geany-plugins/spellcheck/src/speller.c =================================================================== --- trunk/geany-plugins/spellcheck/src/speller.c 2009-09-20 19:17:32 UTC (rev 943) +++ trunk/geany-plugins/spellcheck/src/speller.c 2009-09-20 19:20:25 UTC (rev 944) @@ -396,10 +396,47 @@ } +#ifdef HAVE_ENCHANT_1_5 +/* TODO make this configurable */ +static gchar *get_dictionary_directory(void) +{ +#ifdef G_OS_WIN32 + gchar *path, *result; +# if GLIB_CHECK_VERSION(2, 16, 0) + path = g_win32_get_package_installation_directory_of_module(NULL); +# else + path = g_win32_get_package_installation_directory(NULL, NULL); +# endif + result = g_build_filename(path, "dict", NULL); + g_free(path); + return result; +#else + return g_build_filename(geany->app->datadir, "dict", NULL); +#endif +} +#endif + + void sc_speller_init(void) { + const gchar *old_path; + gchar *new_path, *dict_dir; + sc_speller_broker = enchant_broker_init(); +#if HAVE_ENCHANT_1_5 + /* add custom dictionary path for myspell (primarily used on Windows) */ + dict_dir = get_dictionary_directory(); + old_path = enchant_broker_get_param(sc_speller_broker, "enchant.myspell.dictionary.path"); + if (old_path != NULL) + new_path = g_strconcat(old_path, G_SEARCHPATH_SEPARATOR_S, dict_dir, NULL); + else + new_path = dict_dir; + enchant_broker_set_param(sc_speller_broker, "enchant.myspell.dictionary.path", new_path); + if (new_path != dict_dir) + g_free(dict_dir); + g_free(new_path); +#endif create_dicts_array(); sc_speller_reinit_enchant_dict(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[943] trunk/geany-plugins/spellcheck
by eht16＠users.sourceforge.net 20 Sep '09

20 Sep '09

Revision: 943 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=943&view=rev Author: eht16 Date: 2009-09-20 19:17:32 +0000 (Sun, 20 Sep 2009) Log Message: ----------- Remove more unused code. Modified Paths: -------------- trunk/geany-plugins/spellcheck/ChangeLog trunk/geany-plugins/spellcheck/src/scplugin.c Modified: trunk/geany-plugins/spellcheck/ChangeLog =================================================================== --- trunk/geany-plugins/spellcheck/ChangeLog 2009-09-20 16:10:16 UTC (rev 942) +++ trunk/geany-plugins/spellcheck/ChangeLog 2009-09-20 19:17:32 UTC (rev 943) @@ -1,3 +1,9 @@ +2009-09-20 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * src/scplugin.c: + Remove more unused code. + + 2009-08-09 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * src/gui.c: Modified: trunk/geany-plugins/spellcheck/src/scplugin.c =================================================================== --- trunk/geany-plugins/spellcheck/src/scplugin.c 2009-09-20 16:10:16 UTC (rev 942) +++ trunk/geany-plugins/spellcheck/src/scplugin.c 2009-09-20 19:17:32 UTC (rev 943) @@ -25,11 +25,6 @@ #include "geanyplugin.h" -/* -#ifdef G_OS_WIN32 -# include <windows.h> -#endif -*/ #include "scplugin.h" #include "gui.h" @@ -69,29 +64,6 @@ }; -/* currently unused */ -#ifdef G_OS_WIN32 -#warning TODO check Windows support -/* On Windows we need to find the Aspell installation prefix via the Windows Registry - * and then set the prefix in the Aspell config object. */ -static void set_up_aspell_prefix(AspellConfig *config) -{ - char sTemp[1024]; - HKEY hkey; - DWORD len = sizeof(sTemp); - - if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, TEXT("SOFTWARE\\Aspell"), 0, - KEY_QUERY_VALUE, &hkey) != ERROR_SUCCESS) - return; - - if (RegQueryValueEx(hkey, NULL, 0, NULL, (LPBYTE)sTemp, &len) == ERROR_SUCCESS) - aspell_config_replace(config, "prefix", sTemp); - - RegCloseKey(hkey); -} -#endif - - static void configure_response_cb(GtkDialog *dialog, gint response, gpointer user_data) { if (response == GTK_RESPONSE_OK || response == GTK_RESPONSE_APPLY) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

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

Plugins-Commits September 2009