Branch: refs/heads/master
Author: Jiří Techet <techet(a)gmail.com>
Committer: Jiří Techet <techet(a)gmail.com>
Date: Mon, 13 Apr 2015 21:00:43 UTC
Commit: f6fbda768e67ec7ac943dc5381eaf8b4aef7129c
https://github.com/geany/geany/commit/f6fbda768e67ec7ac943dc5381eaf8b4aef71…
Log Message:
-----------
waf: explicitly set the location of signallist.i and geany.html in the build tree
On OS X signallist.i is always rebuilt because waf looks for it in the build
tree but generates it inside the source tree for some reason so it's
always missing in the build tree. Set the target explicitly to the
build tree to fix the problem.
Similarly, set the target for geany.html to the build tree. Thanks to this
waf also creates the 'doc' directory in the build tree which is otherwise
missing and the cwd command fails for this reason (e.g. when the
_build_ directory is removed).
These two task generators are the only ones that don't use the 'features'
parameter - the features in the other task generators should already
handle the source/build tree problems for us (see the Waf Book section
6.3.3. Nodes, tasks, and task generators).
Modified Paths:
--------------
wscript
Modified: wscript
4 lines changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -477,7 +477,7 @@ def build(bld):
# signallist.i
bld(
source = 'data/geany.glade',
- target = 'src/signallist.i',
+ target = bld.path.get_bld().make_node('src/signallist.i'),
name = 'signallist.i',
rule = gen_signallist)
@@ -536,7 +536,7 @@ def build(bld):
bld(
source = ['doc/geany.txt'],
deps = ['doc/geany.css'],
- target = 'doc/geany.html',
+ target = bld.path.get_bld().make_node('doc/geany.html'),
name = 'geany.html',
cwd = os.path.join(bld.path.abspath(), 'doc'),
rule = '%s -stg --stylesheet=geany.css geany.txt %s' % (rst2html, html_doc_filename))
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Matthew Brush <matt(a)geany.org>
Committer: Matthew Brush <matt(a)geany.org>
Date: Mon, 13 Apr 2015 01:05:28 UTC
Commit: bdc082cb7782828bd3be5992ca2e6006f2330890
https://github.com/geany/geany/commit/bdc082cb7782828bd3be5992ca2e6006f2330…
Log Message:
-----------
Bump min. version of GTK2 to 2.24 and GLib to 2.28
Note: This is mostly search and replace. I've only tested with my
GTK+ 2.24.20 and not at all the Waf build system.
Modified Paths:
--------------
HACKING
README
configure.ac
data/geany.glade
doc/geany.txt
wscript
Modified: HACKING
10 lines changed, 5 insertions(+), 5 deletions(-)
===================================================================
@@ -167,16 +167,16 @@ unmanageable diffs.
GTK versions & API documentation
--------------------------------
-Geany requires GTK >= 2.16 and GLib >= 2.20. API symbols from newer
+Geany requires GTK >= 2.24 and GLib >= 2.28. API symbols from newer
GTK/GLib versions should be avoided or made optional to keep the source
code building on older systems.
-The official GTK 2.16 API documentation may not be available online
+The official GTK 2.24 API documentation may not be available online
anymore, so we put it on http://www.geany.org/manual/gtk/. There
is also a tarball with all available files for download and use with
devhelp.
-Using the 2.16 API documentation of the GTK libs (including GLib, GDK
+Using the 2.24 API documentation of the GTK libs (including GLib, GDK
and Pango) has the advantages that you don't get confused by any
newer API additions and you don't have to take care about whether
you can use them or not.
@@ -187,8 +187,8 @@ Coding
them down into smaller static functions where possible. This makes code
much easier to read and maintain.
* Use GLib types and functions - gint not int, g_free() not free().
-* Your code should build against GLib 2.20 and GTK 2.16. At least for the
- moment, we want to keep the minimum requirement for GTK at 2.16 (of
+* Your code should build against GLib 2.27.3 and GTK 2.24. At least for the
+ moment, we want to keep the minimum requirement for GTK at 2.24 (of
course, you can use the GTK_CHECK_VERSION macro to protect code using
later versions).
* Variables should be declared before statements. You can use
Modified: README
4 lines changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -28,8 +28,8 @@ The basic features of Geany are:
Requirements
------------
-For compiling Geany yourself, you will need the GTK (>= 2.16.0)
-libraries and header files. You will also need its dependency libraries
+For compiling Geany yourself, you will need the GTK2 (>= 2.24) or
+GTK3 libraries and header files. You will also need its dependency libraries
and header files, such as Pango, Glib and ATK. All these files are
available at http://www.gtk.org.
Modified: configure.ac
4 lines changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -70,12 +70,12 @@ AS_IF([test "x$enable_gtk3" = xyes],
[gtk_package=gtk+-3.0
gtk_min_version=3.0],
[gtk_package=gtk+-2.0
- gtk_min_version=2.16])
+ gtk_min_version=2.24])
AM_CONDITIONAL([GTK3], [test "x$gtk_package" = "xgtk+-3.0"])
# GTK/GLib/GIO checks
gtk_modules="$gtk_package >= $gtk_min_version glib-2.0 >= 2.20"
-gtk_modules_private="gio-2.0 >= 2.20 gmodule-no-export-2.0"
+gtk_modules_private="gio-2.0 >= 2.28 gmodule-no-export-2.0"
PKG_CHECK_MODULES([GTK], [$gtk_modules $gtk_modules_private])
AC_SUBST([DEPENDENCIES], [$gtk_modules])
AC_SUBST([GTK_CFLAGS])
Modified: data/geany.glade
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <requires lib="gtk+" version="2.16"/>
+ <requires lib="gtk+" version="2.24"/>
<!-- interface-naming-policy project-wide -->
<object class="GtkAccelGroup" id="accelgroup1"/>
<object class="GtkAdjustment" id="adjustment1">
Modified: doc/geany.txt
4 lines changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -103,7 +103,7 @@ Installation
Requirements
------------
-You will need the GTK (>= 2.16.0) libraries and their dependencies
+You will need the GTK (>= 2.24) libraries and their dependencies
(Pango, GLib and ATK). Your distro should provide packages for these,
usually installed by default. For Windows, you can download an installer
from the website which bundles these libraries.
@@ -120,7 +120,7 @@ Source compilation
------------------
Compiling Geany is quite easy.
-To do so, you need the GTK (>= 2.16.0) libraries and header files.
+To do so, you need the GTK (>= 2.24) libraries and header files.
You also need the Pango, GLib and ATK libraries and header files.
All these files are available at http://www.gtk.org, but very often
your distro will provide development packages to save the trouble of
Modified: wscript
4 lines changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -54,9 +54,9 @@ from waflib.Tools.compiler_cxx import cxx_compiler
APPNAME = 'geany'
VERSION = '1.25'
LINGUAS_FILE = os.path.join('po', 'LINGUAS')
-MINIMUM_GTK_VERSION = '2.16.0'
+MINIMUM_GTK_VERSION = '2.24.0'
MINIMUM_GTK3_VERSION = '3.0.0'
-MINIMUM_GLIB_VERSION = '2.20.0'
+MINIMUM_GLIB_VERSION = '2.28.0'
GEANY_LIB_VERSION = '0.0.0'
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).