Revision: 6016
http://geany.svn.sourceforge.net/geany/?rev=6016&view=rev
Author: eht16
Date: 2011-10-06 20:45:53 +0000 (Thu, 06 Oct 2011)
Log Message:
-----------
Remove obsolete branch
Removed Paths:
-------------
branches/0.20.1/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 6011
http://geany.svn.sourceforge.net/geany/?rev=6011&view=rev
Author: ntrel
Date: 2011-10-06 12:02:38 +0000 (Thu, 06 Oct 2011)
Log Message:
-----------
Initialize invalid matches for safety.
Modified Paths:
--------------
trunk/tagmanager/lregex.c
Modified: trunk/tagmanager/lregex.c
===================================================================
--- trunk/tagmanager/lregex.c 2011-10-06 00:46:09 UTC (rev 6010)
+++ trunk/tagmanager/lregex.c 2011-10-06 12:02:38 UTC (rev 6011)
@@ -470,9 +470,10 @@
int i;
for (i = 0 ; i < BACK_REFERENCE_COUNT ; ++i)
{
- int so, eo;
- if (!g_match_info_fetch_pos(minfo, i, &so, &eo))
- break;
+ int so = -1, eo = -1;
+ /* with GRegex we could get the real match count, but that might
+ * cause incompatibilities with CTags */
+ g_match_info_fetch_pos(minfo, i, &so, &eo);
matches [i].start = so;
matches [i].length = eo - so;
/* a valid match may have both offsets == -1,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 6010
http://geany.svn.sourceforge.net/geany/?rev=6010&view=rev
Author: colombanw
Date: 2011-10-06 00:46:09 +0000 (Thu, 06 Oct 2011)
Log Message:
-----------
Move configure check for The Force to its own file
Modified Paths:
--------------
trunk/ChangeLog
trunk/configure.ac
Added Paths:
-----------
trunk/m4/geany-the-force.m4
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2011-10-06 00:45:49 UTC (rev 6009)
+++ trunk/ChangeLog 2011-10-06 00:46:09 UTC (rev 6010)
@@ -5,7 +5,7 @@
* configure.ac, m4/geany-revision.m4, m4/geany-binreloc.m4,
m4/geany-gnu-regex.m4, m4/geany-plugins.m4, m4/geany-i18n.m4,
m4/geany-mingw.m4, m4/geany-socket.m4, m4/geany-vte.m4,
- m4/geany-utils.m4, m4/geany-status.m4:
+ m4/geany-utils.m4, m4/geany-status.m4, m4/geany-the-force.m4:
Extract some configure logic to separate files for better
readability.
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2011-10-06 00:45:49 UTC (rev 6009)
+++ trunk/configure.ac 2011-10-06 00:46:09 UTC (rev 6010)
@@ -88,20 +88,8 @@
GEANY_CHECK_SOCKET
GEANY_CHECK_VTE
+GEANY_CHECK_THE_FORCE dnl hehe
-# just for a laugh (it has absolutely no effect)
-AC_ARG_ENABLE([the-force],
- [AS_HELP_STRING([--enable-the-force],
- [enable if you are Luke Skywalker and the force is with you [default=no]])],
- [be_luke="$enableval"],
- [be_luke="no"])
-AC_MSG_CHECKING([whether the force is with you])
-if test "x$be_luke" = "xyes"; then
- AC_MSG_RESULT([yes])
-else
- AC_MSG_RESULT([no])
-fi
-
# i18n
GEANY_I18N
Added: trunk/m4/geany-the-force.m4
===================================================================
--- trunk/m4/geany-the-force.m4 (rev 0)
+++ trunk/m4/geany-the-force.m4 2011-10-06 00:46:09 UTC (rev 6010)
@@ -0,0 +1,17 @@
+dnl GEANY_CHECK_THE_FORCE
+dnl just for a laugh (it has absolutely no effect)
+AC_DEFUN([GEANY_CHECK_THE_FORCE],
+[
+ AC_ARG_ENABLE([the-force],
+ [AS_HELP_STRING([--enable-the-force],
+ [enable if you are Luke Skywalker and the force is with you [default=no]])],
+ [be_luke="$enableval"],
+ [be_luke="no"])
+
+ AC_MSG_CHECKING([whether the force is with you])
+ if test "x$be_luke" = "xyes"; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ fi
+])
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 6007
http://geany.svn.sourceforge.net/geany/?rev=6007&view=rev
Author: colombanw
Date: 2011-10-06 00:45:08 +0000 (Thu, 06 Oct 2011)
Log Message:
-----------
Move various tricky configure logic to their own file
Modified Paths:
--------------
trunk/ChangeLog
trunk/configure.ac
Added Paths:
-----------
trunk/m4/geany-utils.m4
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2011-10-06 00:44:48 UTC (rev 6006)
+++ trunk/ChangeLog 2011-10-06 00:45:08 UTC (rev 6007)
@@ -4,7 +4,8 @@
Modernize configure.ac a bit.
* configure.ac, m4/geany-revision.m4, m4/geany-binreloc.m4,
m4/geany-gnu-regex.m4, m4/geany-plugins.m4, m4/geany-i18n.m4,
- m4/geany-mingw.m4, m4/geany-socket.m4, m4/geany-vte.m4:
+ m4/geany-mingw.m4, m4/geany-socket.m4, m4/geany-vte.m4,
+ m4/geany-utils.m4:
Extract some configure logic to separate files for better
readability.
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2011-10-06 00:44:48 UTC (rev 6006)
+++ trunk/configure.ac 2011-10-06 00:45:08 UTC (rev 6007)
@@ -42,6 +42,8 @@
# autoscan end
+GEANY_PREFIX
+GEANY_DOCDIR
# check for SVN revision
GEANY_CHECK_REVISION([dnl force debug mode for a SVN working copy
@@ -107,19 +109,6 @@
GEANY_I18N
-# Set ${datadir}
-if test "x${datadir}" = 'x${prefix}/share' -o "x${datarootdir}" = 'x${prefix}/share'; then
- if test "x${prefix}" = "xNONE"; then
- prefix=${ac_default_prefix}
- fi
-fi
-
-# Set ${docdir} if it is empty
-if test -z "${docdir}"; then
- docdir='${datadir}/doc/${PACKAGE}'
- AC_SUBST([docdir])
-fi
-
GEANY_DATA_DIR=`eval echo ${datarootdir}/geany`
AC_SUBST([GEANY_DATA_DIR])
Added: trunk/m4/geany-utils.m4
===================================================================
--- trunk/m4/geany-utils.m4 (rev 0)
+++ trunk/m4/geany-utils.m4 2011-10-06 00:45:08 UTC (rev 6007)
@@ -0,0 +1,26 @@
+dnl GEANY_PREFIX
+dnl Ensures $prefix and $exec_prefix are set to something sensible
+dnl
+dnl Logic taken from Geany-Plugins' build/expansions.m4
+AC_DEFUN([GEANY_PREFIX],
+[
+ if test "x$prefix" = xNONE; then
+ prefix=$ac_default_prefix
+ fi
+
+ if test "x$exec_prefix" = xNONE; then
+ exec_prefix=$prefix
+ fi
+])
+
+dnl GEANY_DOCDIR
+dnl Ensures $docdir is set and AC_SUBSTed
+dnl
+dnl FIXME: is this really useful?
+AC_DEFUN([GEANY_DOCDIR],
+[
+ if test -z "${docdir}"; then
+ docdir='${datadir}/doc/${PACKAGE}'
+ AC_SUBST([docdir])
+ fi
+])
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.