LADI
/
ladish
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'stable' into main

This commit is contained in:
Nedko Arnaudov 2023-11-18 18:12:44 +02:00
parent 71c8e1cf23 4ee9d9e8cd
commit ad9f04acbc
2 changed files with 55 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
waf vendored
View File

File diff suppressed because one or more lines are too long

98
wscript
View File

@ -43,7 +43,6 @@ def yesno(bool):
def options(opt): def options(opt):
opt.load('compiler_c') opt.load('compiler_c')
opt.load('compiler_cxx') opt.load('compiler_cxx')
opt.load('boost')
opt.load('python') opt.load('python')
opt.add_option('--enable-pkg-config-dbus-service-dir', action='store_true', default=False, help='force D-Bus service install dir to be one returned by pkg-config') opt.add_option('--enable-pkg-config-dbus-service-dir', action='store_true', default=False, help='force D-Bus service install dir to be one returned by pkg-config')
opt.add_option('--enable-gladish', action='store_true', default=False, help='Build gladish') opt.add_option('--enable-gladish', action='store_true', default=False, help='Build gladish')
@ -93,7 +92,6 @@ def create_service_taskgen(bld, target, opath, binary):
def configure(conf): def configure(conf):
conf.load('compiler_c') conf.load('compiler_c')
conf.load('compiler_cxx') conf.load('compiler_cxx')
conf.load('boost')
conf.load('python') conf.load('python')
conf.load('intltool') conf.load('intltool')
if parallel_debug: if parallel_debug:
@ -169,58 +167,56 @@ def configure(conf):
conf.env['LIB_EXPAT'] = ['expat'] conf.env['LIB_EXPAT'] = ['expat']
build_gui = True if Options.options.enable_gladish:
conf.check_cfg(
package = 'glib-2.0',
errmsg = "not installed, see http://www.gtk.org/",
args = '--cflags --libs')
conf.check_cfg(
package = 'dbus-glib-1',
errmsg = "not installed, see http://dbus.freedesktop.org/",
args = '--cflags --libs')
conf.check_cfg(
package = 'gtk+-2.0',
atleast_version = '2.20.0',
errmsg = "not installed, see http://www.gtk.org/",
args = '--cflags --libs')
conf.check_cfg(
package = 'gtkmm-2.4',
atleast_version = '2.10.0',
errmsg = "not installed, see http://www.gtkmm.org",
args = '--cflags --libs')
if build_gui and not conf.check_cfg( conf.check_cfg(
package = 'glib-2.0', package = 'libgnomecanvasmm-2.6',
mandatory = False, atleast_version = '2.6.0',
errmsg = "not installed, see http://www.gtk.org/", errmsg = "not installed, see http://www.gtkmm.org",
args = '--cflags --libs'): args = '--cflags --libs')
build_gui = False
if build_gui and not conf.check_cfg( #autowaf.check_pkg(conf, 'libgvc', uselib_store='AGRAPH', atleast_version='2.8', mandatory=False)
package = 'dbus-glib-1',
mandatory = False,
errmsg = "not installed, see http://dbus.freedesktop.org/",
args = '--cflags --libs'):
build_gui = False
if build_gui and not conf.check_cfg( # The boost headers package (e.g. libboost-dev) is needed
package = 'gtk+-2.0', conf.multicheck(
mandatory = False, {'header_name': "boost/shared_ptr.hpp"},
atleast_version = '2.20.0', {'header_name': "boost/weak_ptr.hpp"},
errmsg = "not installed, see http://www.gtk.org/", {'header_name': "boost/enable_shared_from_this.hpp"},
args = '--cflags --libs'): {'header_name': "boost/utility.hpp"},
build_gui = False msg = "Checking for boost headers",
mandatory = False)
if build_gui and not conf.check_cfg( display_msg(conf, 'Found boost/shared_ptr.hpp',
package = 'gtkmm-2.4', yesno(conf.env['HAVE_BOOST_SHARED_PTR_HPP']))
mandatory = False, display_msg(conf, 'Found boost/weak_ptr.hpp',
atleast_version = '2.10.0', yesno(conf.env['HAVE_BOOST_WEAK_PTR_HPP']))
errmsg = "not installed, see http://www.gtkmm.org", display_msg(conf, 'Found boost/enable_shared_from_this.hpp',
args = '--cflags --libs'): yesno(conf.env['HAVE_BOOST_ENABLE_SHARED_FROM_THIS_HPP']))
build_gui = False display_msg(conf, 'Found boost/utility.hpp',
yesno(conf.env['HAVE_BOOST_UTILITY_HPP']))
if build_gui and not conf.check_cfg( if not (conf.env['HAVE_BOOST_SHARED_PTR_HPP'] and \
package = 'libgnomecanvasmm-2.6', conf.env['HAVE_BOOST_WEAK_PTR_HPP'] and \
mandatory = False, conf.env['HAVE_BOOST_ENABLE_SHARED_FROM_THIS_HPP'] and \
atleast_version = '2.6.0', conf.env['HAVE_BOOST_UTILITY_HPP']):
errmsg = "not installed, see http://www.gtkmm.org", display_line(conf, "One or more boost headers not found, see http://boost.org/")
args = '--cflags --libs'): sys.exit(1)
build_gui = False
#autowaf.check_pkg(conf, 'gtkmm-2.4', uselib_store='GLIBMM', atleast_version='2.10.0', mandatory=True)
#autowaf.check_pkg(conf, 'libgnomecanvasmm-2.6', uselib_store='GNOMECANVASMM', atleast_version='2.6.0', mandatory=True)
#autowaf.check_pkg(conf, 'libgvc', uselib_store='AGRAPH', atleast_version='2.8', mandatory=False)
if build_gui:
# We need the boost headers package (e.g. libboost-dev)
# shared_ptr.hpp and weak_ptr.hpp
conf.check_boost(
mandatory = False,
errmsg="not found, see http://boost.org/")
build_gui = not not conf.env['BOOST_VERSION']
conf.env['BUILD_GLADISH'] = Options.options.enable_gladish conf.env['BUILD_GLADISH'] = Options.options.enable_gladish
conf.env['BUILD_LIBLASH'] = Options.options.enable_liblash conf.env['BUILD_LIBLASH'] = Options.options.enable_liblash