Branch: refs/heads/master Author: Enrico Tröger enrico.troeger@uvena.de Committer: Enrico Tröger enrico.troeger@uvena.de Date: Mon, 11 Mar 2013 18:54:28 UTC Commit: 0c5442b6253a9441f563de5046b6bcb1300e354f https://github.com/geany/geany/commit/0c5442b6253a9441f563de5046b6bcb1300e35...
Log Message: ----------- More GTK3 Waf build system adjustments
Install the src/gtkcompat.h header and install data/geany.css if necessary.
Modified Paths: -------------- wscript
Modified: wscript 15 files changed, 10 insertions(+), 5 deletions(-) =================================================================== @@ -212,8 +212,8 @@ def configure(conf): _load_intltool_if_available(conf)
# GTK / GIO version check - gtk_package_name = 'gtk+-3.0' if conf.options.gtk3 else 'gtk+-2.0' - minimum_gtk_version = MINIMUM_GTK3_VERSION if conf.options.gtk3 else MINIMUM_GTK_VERSION + gtk_package_name = 'gtk+-3.0' if conf.options.use_gtk3 else 'gtk+-2.0' + minimum_gtk_version = MINIMUM_GTK3_VERSION if conf.options.use_gtk3 else MINIMUM_GTK_VERSION conf.check_cfg(package=gtk_package_name, atleast_version=minimum_gtk_version, uselib_store='GTK', mandatory=True, args='--cflags --libs') conf.check_cfg(package='glib-2.0', atleast_version=MINIMUM_GLIB_VERSION, uselib_store='GLIB', @@ -226,6 +226,7 @@ def configure(conf): # remember GTK version for the build step conf.env['gtk_package_name'] = gtk_package_name conf.env['minimum_gtk_version'] = minimum_gtk_version + conf.env['use_gtk3'] = conf.options.use_gtk3
# Windows specials if is_win32: @@ -316,7 +317,7 @@ def options(opt): dest='no_vte') opt.add_option('--enable-gtk3', action='store_true', default=False, help='compile with GTK3 support (experimental) [[default: No]', - dest='gtk3') + dest='use_gtk3') # Paths opt.add_option('--mandir', type='string', default='', help='man documentation', dest='mandir') @@ -499,7 +500,7 @@ def build(bld): src/document.h src/editor.h src/encodings.h src/filetypes.h src/geany.h src/highlighting.h src/keybindings.h src/msgwindow.h src/plugindata.h src/prefs.h src/project.h src/search.h src/stash.h src/support.h - src/templates.h src/toolbar.h src/ui_utils.h src/utils.h src/build.h + src/templates.h src/toolbar.h src/ui_utils.h src/utils.h src/build.h src/gtkcompat.h plugins/geanyplugin.h plugins/geanyfunctions.h''') bld.install_files('${PREFIX}/include/geany/scintilla', ''' scintilla/include/SciLexer.h scintilla/include/Scintilla.h @@ -536,9 +537,13 @@ def build(bld): bld.install_files('${DATADIR}/%s' % data_dir, start_dir.ant_glob('filetype*'), cwd=start_dir) bld.install_files('${DATADIR}/%s' % data_dir, start_dir.ant_glob('*.tags'), cwd=start_dir) bld.install_files('${DATADIR}/%s' % data_dir, 'data/geany.glade') - bld.install_files('${DATADIR}/%s' % data_dir, 'data/geany.gtkrc') bld.install_files('${DATADIR}/%s' % data_dir, 'data/snippets.conf') bld.install_files('${DATADIR}/%s' % data_dir, 'data/ui_toolbar.xml') + if bld.env['use_gtk3']: + bld.install_files('${DATADIR}/%s' % data_dir, 'data/geany.css') + else: + bld.install_files('${DATADIR}/%s' % data_dir, 'data/geany.gtkrc') + start_dir = bld.path.find_dir('data/colorschemes') template_dest = '${DATADIR}/%s/colorschemes' % data_dir bld.install_files(template_dest, start_dir.ant_glob('*'), cwd=start_dir)
-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).