X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fpbd%2Fwscript;h=05c2deb1aedfd135c02c3a9b573972e311148d62;hb=b51321bd7dcf34055ba523506b35e2f38300cbb0;hp=6b3e12b5396e9818f680c03c784a5cfc5ee24b57;hpb=8f930477be9e2c88859a8ea30b213fba3f7fc443;p=ardour.git diff --git a/libs/pbd/wscript b/libs/pbd/wscript index 6b3e12b539..05c2deb1ae 100644 --- a/libs/pbd/wscript +++ b/libs/pbd/wscript @@ -16,6 +16,7 @@ LIBPBD_VERSION = "%s.%s.%s" % (MAJOR, MINOR, MICRO) # minor increment <=> compatible changes (additions) # micro increment <=> no interface changes LIBPBD_LIB_VERSION = '4.1.0' +LIBPBD_MAJOR_VERSION = '4' # Variables for 'waf dist' APPNAME = 'libpbd' @@ -34,90 +35,119 @@ libpbd_sources = [ 'boost_debug.cc', 'cartesian.cc', 'command.cc', + 'configuration_variable.cc', 'convert.cc', 'controllable.cc', - 'controllable_descriptor.cc', - 'clear_dir.cc', + 'crossthread.cc', 'cpus.cc', 'debug.cc', + 'demangle.cc', 'enumwriter.cc', 'event_loop.cc', 'enums.cc', 'epa.cc', 'error.cc', 'ffs.cc', - 'file_manager.cc', + 'file_archive.cc', 'file_utils.cc', 'fpu.cc', - 'glib_semaphore.cc', 'id.cc', 'locale_guard.cc', 'localtime_r.cc', 'malign.cc', + 'md5.cc', 'mountpoint.cc', 'openuri.cc', 'pathexpand.cc', - 'pathscanner.cc', 'pbd.cc', 'pool.cc', 'property_list.cc', 'pthread_utils.cc', + 'reallocpool.cc', 'receiver.cc', 'resource.cc', 'search_path.cc', 'semutils.cc', 'shortpath.cc', 'signals.cc', - 'sndfile_manager.cc', 'stacktrace.cc', 'stateful_diff_command.cc', 'stateful.cc', 'strreplace.cc', 'strsplit.cc', + 'system_exec.cc', 'textreceiver.cc', + 'timer.cc', + 'timing.cc', + 'tlsf.cc', 'transmitter.cc', 'undo.cc', 'uuid.cc', - 'version.cc', 'whitespace.cc', 'xml++.cc', ] def options(opt): + opt.load('compiler_cxx') autowaf.set_options(opt) + opt.add_option('--ppc', action='store_true', default=False, dest='ppc', + help='Compile with -arch ppc (OS X ONLY)') + opt.add_option('--dist-target', type='string', default='auto', dest='dist_target', + help='Specify the target for cross-compiling [auto,none,x86,i386,i686,x86_64,tiger,leopard,mingw,msvc]') + opt.add_option('--internal-shared-libs', action='store_true', default=True, dest='internal_shared_libs', + help='Build internal libs as shared libraries') def configure(conf): conf.load('compiler_cxx') - autowaf.build_version_files(path_prefix+'pbd/version.h', path_prefix+'version.cc', - 'libpbd', MAJOR, MINOR, MICRO, 'LIBPBD_API', 'pbd/libpbd_visibility.h') autowaf.configure(conf) autowaf.check_pkg(conf, 'libxml-2.0', uselib_store='XML') autowaf.check_pkg(conf, 'sigc++-2.0', uselib_store='SIGCPP', atleast_version='2.0') + autowaf.check_pkg(conf, 'libcurl', uselib_store='CURL', atleast_version='7.0.0', mandatory=True) + autowaf.check_pkg(conf, 'libarchive', uselib_store='ARCHIVE', atleast_version='3.0.0', mandatory=True) + autowaf.check_pkg(conf, 'glibmm-2.4', uselib_store='GLIBMM', atleast_version='2.32.0', mandatory=True) + autowaf.check_pkg(conf, 'giomm-2.4', uselib_store='GIOMM', atleast_version='2.2', mandatory=True) conf.check(function_name='getmntent', header_name='mntent.h', define_name='HAVE_GETMNTENT',mandatory=False) conf.check(header_name='execinfo.h', define_name='HAVE_EXECINFO',mandatory=False) conf.check(header_name='unistd.h', define_name='HAVE_UNISTD',mandatory=False) - conf.check_cc(function_name='posix_memalign', header_name='stdlib.h', cflags='-D_XOPEN_SOURCE=600', define_name='HAVE_POSIX_MEMALIGN', mandatory=False) + if not Options.options.ppc: + conf.check_cc(function_name='posix_memalign', header_name='stdlib.h', cflags='-D_XOPEN_SOURCE=600', define_name='HAVE_POSIX_MEMALIGN', mandatory=False) conf.check(function_name='localtime_r', header_name='time.h', define_name='HAVE_LOCALTIME_R',mandatory=False) - conf.write_config_header('libpbd-config.h', remove=False) - # Boost headers autowaf.check_header(conf, 'cxx', 'boost/shared_ptr.hpp') autowaf.check_header(conf, 'cxx', 'boost/weak_ptr.hpp') + if Options.options.dist_target == 'mingw': + conf.check(compiler='cxx', + lib='ole32', + mandatory=True, + uselib_store='OLE') + + if Options.options.internal_shared_libs: + conf.define('INTERNAL_SHARED_LIBS', 1) + + conf.write_config_header('libpbd-config.h', remove=False) def build(bld): - + if not autowaf.is_child(): # Building standalone, install dev stuff + # C++ Headers + includedir = '${INCLUDEDIR}/pbd-%s/pbd' % LIBPBD_MAJOR_VERSION + bld.install_files(includedir, bld.path.ant_glob('pbd/*.h')) + bld.install_files(includedir, 'build/pbd/signals_generated.h') + + # Pkgconfig file + autowaf.build_pc(bld, 'libpbd', LIBPBD_VERSION, LIBPBD_MAJOR_VERSION, [], + {'LIBPBD_VERSION' : LIBPBD_VERSION, + 'LIBPBD_MAJOR_VERSION' : LIBPBD_MAJOR_VERSION}) + # Make signals_generated.h using signals.py - bld(rule = 'python ${SRC} ${TGT}', source = 'pbd/signals.py', target = 'pbd/signals_generated.h') + bld(rule = sys.executable + ' ${SRC} ${TGT}', source = 'pbd/signals.py', target = 'pbd/signals_generated.h') # Library if bld.is_defined ('INTERNAL_SHARED_LIBS'): - print('BUILD SHARED LIB') obj = bld.shlib(features = 'cxx cxxshlib', source=libpbd_sources) obj.defines = [ 'LIBPBD_DLL_EXPORTS=1' ] else: - print('BUILD STATIC LIB') obj = bld.stlib(features = 'cxx cxxstlib', source=libpbd_sources) obj.cxxflags = [ '-fPIC' ] obj.cflags = [ '-fPIC' ] @@ -126,25 +156,31 @@ def build(bld): if bld.is_defined('DEBUG_RT_ALLOC'): obj.source += 'debug_rt_alloc.c' - if bld.env['build_target'] != 'mingw': - obj.source += [ 'crossthread.cc' ] - obj.export_includes = ['.'] obj.includes = ['.'] obj.name = 'libpbd' obj.target = 'pbd' - obj.uselib = 'GLIBMM SIGCPP XML UUID SNDFILE GIOMM' + obj.uselib = 'GLIBMM SIGCPP XML UUID SNDFILE GIOMM ARCHIVE CURL' if sys.platform == 'darwin': TaskGen.task_gen.mappings['.mm'] = TaskGen.task_gen.mappings['.cc'] if 'cocoa_open_uri.mm' not in obj.source: obj.source += [ 'cocoa_open_uri.mm' ] obj.uselib += ' OSX' obj.vnum = LIBPBD_LIB_VERSION - obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3') + obj.install_path = bld.env['LIBDIR'] obj.defines += [ 'PACKAGE="' + I18N_PACKAGE + '"' ] - + + if sys.platform.startswith('netbsd'): + obj.linkflags = '-lexecinfo' + if bld.env['build_target'] == 'x86_64': obj.defines += [ 'USE_X86_64_ASM' ] + if bld.env['build_target'] == 'mingw': + obj.defines += [ 'NO_POSIX_MEMALIGN' ] + obj.source += [ 'windows_special_dirs.cc' ] + obj.source += [ 'windows_timer_utils.cc' ] + obj.source += [ 'windows_mmcss.cc' ] + obj.uselib += ' OLE' if bld.env['BUILD_TESTS'] and bld.is_defined('HAVE_CPPUNIT'): # Unit tests @@ -157,16 +193,18 @@ def build(bld): test/signals_test.cc test/convert_test.cc test/filesystem_test.cc + test/natsort_test.cc + test/reallocpool_test.cc + test/xml_test.cc test/test_common.cc '''.split() + if bld.env['build_target'] == 'mingw': + testobj.source += [ 'test/windows_timer_utils_test.cc' ] testobj.target = 'run-tests' testobj.includes = obj.includes + ['test', '../pbd'] testobj.uselib = 'CPPUNIT XML SNDFILE' testobj.use = 'libpbd' testobj.name = 'libpbd-tests' + testobj.defines = [ 'PACKAGE="' + I18N_PACKAGE + '"' ] if sys.platform != 'darwin' and bld.env['build_target'] != 'mingw': testobj.linkflags = ['-lrt'] - - -def shutdown(): - autowaf.shutdown()