diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..90db7d79 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +build/ +man/*.1 +.waf* +.lock* diff --git a/common/wscript b/common/wscript index 7a79a8a8..fae39108 100644 --- a/common/wscript +++ b/common/wscript @@ -16,12 +16,13 @@ def configure(conf): def create_jack_process_obj(bld, target, sources, uselib = None): process = bld.new_task_gen('cxx', 'shlib') + process.features += 'cxx' process.env['shlib_PATTERN'] = '%s.so' process.defines = ['HAVE_CONFIG_H','SERVER_SIDE'] if bld.env['IS_MACOSX']: env_includes = ['../macosx', '../posix', '../macosx/coreaudio'] if bld.env['IS_LINUX']: - env_includes = ['../linux', '../posix', '../linux/alsa'] + env_includes = ['../linux', '../posix', '../linux/alsa'] if bld.env['IS_SUN']: env_includes = ['../solaris', '../posix', '../solaris/oss'] process.includes = ['.'] + env_includes + ['jack', '..'] @@ -46,7 +47,7 @@ def build(bld): 'JackConnectionManager.cpp', 'ringbuffer.c', 'JackError.cpp', - 'JackException.cpp', + 'JackException.cpp', 'JackFrameTimer.cpp', 'JackGraphManager.cpp', 'JackPort.cpp', @@ -56,7 +57,7 @@ def build(bld): 'JackMidiAPI.cpp', 'JackEngineControl.cpp', 'JackShmMem.cpp', - 'JackGenericClientChannel.cpp', + 'JackGenericClientChannel.cpp', 'shm.c', 'JackGlobals.cpp', 'JackDebugClient.cpp', @@ -75,7 +76,7 @@ def build(bld): '../posix/JackPosixThread.cpp', '../posix/JackPosixSemaphore.cpp', '../posix/JackPosixProcessSync.cpp', - '../posix/JackPosixMutex.cpp', + '../posix/JackPosixMutex.cpp', '../posix/JackSocket.cpp', '../linux/JackLinuxTime.c', ] @@ -117,7 +118,7 @@ def build(bld): serverlib.source = [] + common_libsources serverlib.source += [ 'JackAudioDriver.cpp', - 'JackTimedDriver.cpp', + 'JackTimedDriver.cpp', 'JackMidiDriver.cpp', 'JackDriver.cpp', 'JackEngine.cpp', @@ -135,7 +136,7 @@ def build(bld): 'JackNetTool.cpp', 'JackNetInterface.cpp', 'JackArgParser.cpp', - 'JackRequestDecoder.cpp', + 'JackRequestDecoder.cpp', 'JackMidiAsyncQueue.cpp', 'JackMidiAsyncWaitQueue.cpp', 'JackMidiBufferReadQueue.cpp', @@ -201,7 +202,7 @@ def build(bld): 'JackNetAPI.cpp', 'JackNetInterface.cpp', 'JackNetTool.cpp', - 'JackException.cpp', + 'JackException.cpp', 'JackAudioAdapterInterface.cpp', 'JackLibSampleRateResampler.cpp', 'JackResampler.cpp', @@ -273,7 +274,7 @@ def build(bld): clientlib.env.append_value("LINKFLAGS", "-lnsl -lsocket") if bld.env['BUILD_WITH_32_64']: - print "create 32bit lib..." + print("create 32bit lib...") clientlib32bit = clientlib.clone('lib32') create_jack_process_obj(bld, 'netmanager', 'JackNetManager.cpp', serverlib) @@ -319,11 +320,10 @@ def build(bld): #audio_adapter_sources += ['../windows/JackPortAudioAdapter.cpp'] #process = create_jack_process_obj(bld, 'audioadapter', audio_adapter_sources, serverlib) - bld.install_files('${PREFIX}/include/jack', 'jack/*.h') + bld.install_files('${PREFIX}/include/jack', bld.path.ant_glob('jack/*.h')) # process jack.pc.in -> jack.pc - import misc - obj = bld.new_task_gen('subst') + obj = bld.new_task_gen('subst_pc') obj.source = '../jack.pc.in' obj.target = 'jack.pc' obj.dict = {'PREFIX': bld.env['PREFIX'], @@ -333,4 +333,3 @@ def build(bld): 'JACK_VERSION': bld.env['JACK_VERSION'], } obj.install_path = '${LIBDIR}/pkgconfig/' - obj.fun = misc.subst_func diff --git a/dbus/wscript b/dbus/wscript index 703c52c7..0362ca2b 100644 --- a/dbus/wscript +++ b/dbus/wscript @@ -13,12 +13,12 @@ def configure(conf): conf.env['BUILD_JACKDBUS'] = False if not conf.check_cfg(package='dbus-1', atleast_version='1.0.0', args='--cflags --libs') or not conf.is_defined('HAVE_DBUS_1'): - print Logs.colors.RED + 'WARNING !! jackdbus will not be built because libdbus-dev is missing' + Logs.colors.NORMAL + print(Logs.colors.RED + 'WARNING !! jackdbus will not be built because libdbus-dev is missing' + Logs.colors.NORMAL) return dbus_dir = conf.check_cfg(package='dbus-1', args='--variable=session_bus_services_dir') if not dbus_dir: - print Logs.colors.RED + 'WARNING !! jackdbus will not be built because service dir is unknown' + Logs.colors.NORMAL + print(Logs.colors.RED + 'WARNING !! jackdbus will not be built because service dir is unknown' + Logs.colors.NORMAL) return dbus_dir = dbus_dir.strip() @@ -29,20 +29,19 @@ def configure(conf): else: conf.env['DBUS_SERVICES_DIR'] = os.path.normpath(conf.env['PREFIX'] + '/share/dbus-1/services') - conf.check_tool('misc') - conf.check(header_name='expat.h', define_name="HAVE_EXPAT") if conf.is_defined('HAVE_EXPAT'): conf.env['LIB_EXPAT'] = ['expat'] else: - print Logs.colors.RED + 'WARNING !! jackdbus will not be built because of expat is missing' + Logs.colors.NORMAL + print(Logs.colors.RED + 'WARNING !! jackdbus will not be built because of expat is missing' + Logs.colors.NORMAL) return conf.env['BUILD_JACKDBUS'] = True def build(bld): obj = bld.new_task_gen('cc', 'program') + obj.features += 'cc' if bld.env['IS_LINUX']: sysdeps_dbus_include = ['../linux', '../posix'] if bld.env['IS_MACOSX']: @@ -75,10 +74,9 @@ def build(bld): obj.target = 'jackdbus' # process org.jackaudio.service.in -> org.jackaudio.service - import misc - obj = bld.new_task_gen('subst') - obj.source = 'org.jackaudio.service.in' - obj.target = 'org.jackaudio.service' - obj.dict = {'BINDIR': bld.env['PREFIX'] + '/bin'} - obj.install_path = '${DBUS_SERVICES_DIR}/' - obj.fun = misc.subst_func + obj = bld( + features = 'subst', + source = 'org.jackaudio.service.in', + target = 'org.jackaudio.service', + install_path = '${DBUS_SERVICES_DIR}/', + BINDIR = bld.env['PREFIX'] + '/bin') diff --git a/example-clients/wscript b/example-clients/wscript index 51cc1caf..dc204734 100644 --- a/example-clients/wscript +++ b/example-clients/wscript @@ -63,7 +63,7 @@ def build(bld): os_incdir = ['../macosx', '../posix'] if bld.env['IS_SUN']: os_incdir = ['../solaris', '../posix'] - for example_program, example_program_source in example_programs.items(): + for example_program, example_program_source in list(example_programs.items()): if example_program == 'jack_server_control': uselib_local = 'serverlib' elif example_program == 'jack_net_slave': @@ -105,12 +105,13 @@ def build(bld): if bld.env['IS_LINUX']: prog.uselib = 'RT READLINE NCURSES' if bld.env['IS_MACOSX']: - prog.uselib = 'READLINE NCURSES' + prog.uselib = 'READLINE NCURSES' prog.uselib_local = 'clientlib' prog.target = 'jack_transport' if bld.env['BUILD_EXAMPLE_CLIENT_REC']: prog = bld.new_task_gen('cc', 'program') + prog.features += 'cc' prog.includes = os_incdir + ['../common/jack', '../common'] prog.source = 'capture_client.c' if bld.env['IS_MACOSX']: @@ -127,6 +128,7 @@ def build(bld): if bld.env['IS_LINUX'] or bld.env['IS_MACOSX']: prog = bld.new_task_gen('cc', 'program') + prog.features += 'cc' prog.includes = os_incdir + ['../common/jack', '../common'] prog.source = ['netsource.c', '../common/netjack_packet.c'] prog.env.append_value("CCFLAGS", "-DNO_JACK_ERROR") @@ -135,24 +137,27 @@ def build(bld): prog.target = 'jack_netsource' if bld.env['IS_LINUX'] and bld.env['BUILD_EXAMPLE_ALSA_IO']: - prog = bld.new_task_gen('cc', 'program') - prog.includes = os_incdir + ['../common/jack', '../common'] - prog.source = ['alsa_in.c', '../common/memops.c'] - prog.env.append_value("CCFLAGS", "-DNO_JACK_ERROR") - prog.uselib = 'ALSA SAMPLERATE' - prog.uselib_local = 'clientlib' - prog.target = 'alsa_in' - - prog = bld.new_task_gen('cc', 'program') - prog.includes = os_incdir + ['../common/jack', '../common'] - prog.source = ['alsa_out.c', '../common/memops.c'] - prog.env.append_value("CCFLAGS", "-DNO_JACK_ERROR") - prog.uselib = 'ALSA SAMPLERATE' - prog.uselib_local = 'clientlib' - prog.target = 'alsa_out' - - for example_lib, example_lib_source in example_libs.items(): + prog = bld.new_task_gen('cc', 'program') + prog.features += 'cc' + prog.includes = os_incdir + ['../common/jack', '../common'] + prog.source = ['alsa_in.c', '../common/memops.c'] + prog.env.append_value("CCFLAGS", "-DNO_JACK_ERROR") + prog.uselib = 'ALSA SAMPLERATE' + prog.uselib_local = 'clientlib' + prog.target = 'alsa_in' + + prog = bld.new_task_gen('cc', 'program') + prog.features += 'cc' + prog.includes = os_incdir + ['../common/jack', '../common'] + prog.source = ['alsa_out.c', '../common/memops.c'] + prog.env.append_value("CCFLAGS", "-DNO_JACK_ERROR") + prog.uselib = 'ALSA SAMPLERATE' + prog.uselib_local = 'clientlib' + prog.target = 'alsa_out' + + for example_lib, example_lib_source in list(example_libs.items()): lib = bld.new_task_gen('cc', 'shlib') + lib.features += 'cc' lib.env['shlib_PATTERN'] = '%s.so' lib.includes = os_incdir + ['../common/jack', '../common'] lib.target = example_lib @@ -162,10 +167,10 @@ def build(bld): #lib.env.append_value("LINKFLAGS", "-arch i386 -arch ppc -arch x86_64") lib.env.append_value("LINKFLAGS", "") if bld.env['IS_SUN']: - lib.env.append_value("LINKFLAGS", "-lm") + lib.env.append_value("LINKFLAGS", "-lm") lib.uselib_local = 'serverlib' lib.install_path = '${ADDON_DIR}/' bld.symlink_as('${PREFIX}/bin/jack_disconnect', 'jack_connect') - bld.install_files('${PREFIX}/bin', 'jack_control', chmod=0755) + bld.install_files('${PREFIX}/bin', 'jack_control', chmod=0o755) diff --git a/linux/wscript b/linux/wscript index 79384737..b49af34c 100644 --- a/linux/wscript +++ b/linux/wscript @@ -2,13 +2,13 @@ # encoding: utf-8 def configure(conf): - conf.check_cfg(package='alsa', atleast_version='1.0.18', args='--cflags --libs') + conf.check_cfg(package='alsa', atleast_version='1.0.18', args='--cflags --libs', mandatory=False) conf.env['BUILD_DRIVER_ALSA'] = conf.is_defined('HAVE_ALSA') - conf. check_cfg(package='libfreebob', atleast_version='1.0.0', args='--cflags --libs') + conf. check_cfg(package='libfreebob', atleast_version='1.0.0', args='--cflags --libs', mandatory=False) conf.env['BUILD_DRIVER_FREEBOB'] = conf.is_defined('HAVE_LIBFREEBOB') - conf. check_cfg(package='libffado', atleast_version='1.999.17', args='--cflags --libs') + conf. check_cfg(package='libffado', atleast_version='1.999.17', args='--cflags --libs', mandatory=False) conf.env['BUILD_DRIVER_FFADO'] = conf.is_defined('HAVE_LIBFFADO') conf.define('HAVE_PPOLL', 1 ) @@ -21,7 +21,7 @@ def create_jack_driver_obj(bld, target, sources, uselib = None): #driver.defines = ['HAVE_CONFIG_H','SERVER_SIDE', 'HAVE_PPOLL'] driver.defines = ['HAVE_CONFIG_H','SERVER_SIDE', 'HAVE_PPOLL', 'HAVE_TIMERFD'] - driver.includes = ['.', '../linux', '../posix', '../common', '../common/jack', '../dbus'] + driver.includes = ['.', '../linux', '../posix', '../common', '../common/jack', '../dbus', '../'] driver.target = target driver.source = sources driver.install_path = '${ADDON_DIR}/' @@ -33,13 +33,14 @@ def create_jack_driver_obj(bld, target, sources, uselib = None): def build(bld): if bld.env['BUILD_JACKD'] == True: jackd = bld.new_task_gen('cxx', 'program') - jackd.includes = ['../linux', '../posix', '../common/jack', '../common', '../dbus'] + jackd.features += 'cxx' + jackd.includes = ['../linux', '../posix', '../common/jack', '../common', '../dbus', '../'] jackd.defines = ['HAVE_CONFIG_H','SERVER_SIDE'] jackd.source = ['../common/Jackdmp.cpp'] - if bld.env['IS_LINUX'] and bld.env['BUILD_JACKDBUS']: + if bld.env['IS_LINUX'] and bld.env['BUILD_JACKDBUS']: jackd.source += ['../dbus/reserve.c', '../dbus/audio_reserve.c'] jackd.uselib = 'PTHREAD DL RT DBUS-1' - else: + else: jackd.uselib = 'PTHREAD DL RT' jackd.uselib_local = 'serverlib' jackd.target = 'jackd' diff --git a/man/wscript b/man/wscript index 31bd60f3..b71455b0 100644 --- a/man/wscript +++ b/man/wscript @@ -4,10 +4,9 @@ import Build import re import os -import misc def build(bld): bld.exec_command("cd man ; sh fill_template %s" % bld.env['JACK_VERSION']) - bld.install_files(bld.env['MANDIR'], '*.1') + bld.install_files(bld.env['MANDIR'], bld.path.ant_glob('*.1')) diff --git a/tests/wscript b/tests/wscript index c52907b8..85c54a04 100644 --- a/tests/wscript +++ b/tests/wscript @@ -14,7 +14,7 @@ test_programs = { } def build(bld): - for test_program, test_program_sources in test_programs.items(): + for test_program, test_program_sources in list(test_programs.items()): prog = bld.new_task_gen('cxx', 'program') prog.features.append('cc') if bld.env['IS_MACOSX']: @@ -29,6 +29,6 @@ def build(bld): if bld.env['IS_MACOSX']: prog.env.append_value("CPPFLAGS", "-mmacosx-version-min=10.4 -arch i386 -arch ppc -arch x86_64") #prog.env.append_value("LINKFLAGS", "-arch i386 -arch ppc -arch x86_64") - prog.env.append_value("LINKFLAGS", "") + prog.env.append_value("LINKFLAGS", "") prog.uselib_local = 'clientlib' prog.target = test_program diff --git a/waf b/waf index f0f7f632..e1e34d43 100755 Binary files a/waf and b/waf differ diff --git a/wscript b/wscript index e2d18c57..9cc83587 100644 --- a/wscript +++ b/wscript @@ -1,15 +1,17 @@ #! /usr/bin/env python # encoding: utf-8 +from __future__ import print_function import os import Utils import Options -import commands +import subprocess g_maxlen = 40 import shutil import Task import re import Logs +import sys VERSION='1.9.9' APPNAME='jack' @@ -24,10 +26,10 @@ def display_msg(msg, status = None, color = None): global g_maxlen g_maxlen = max(g_maxlen, len(msg)) if status: - print "%s :" % msg.ljust(g_maxlen), - Utils.pprint(color, status) + Logs.pprint('NORMAL', "%s :" % msg.ljust(g_maxlen), sep=' ') + Logs.pprint(color, status) else: - print "%s" % msg.ljust(g_maxlen) + print("%s" % msg.ljust(g_maxlen)) def display_feature(msg, build): if build: @@ -36,26 +38,26 @@ def display_feature(msg, build): display_msg(msg, "no", 'YELLOW') def create_svnversion_task(bld, header='svnversion.h', define=None): - import Constants, Build - cmd = '../svnversion_regenerate.sh ${TGT}' if define: cmd += " " + define - cls = Task.simple_task_type('svnversion', cmd, color='BLUE', before='cc') - cls.runnable_status = lambda self: Constants.RUN_ME - def post_run(self): sg = Utils.h_file(self.outputs[0].abspath(self.env)) #print sg.encode('hex') Build.bld.node_sigs[self.env.variant()][self.outputs[0].id] = sg - cls.post_run = post_run - - tsk = cls(bld.env.copy()) - tsk.inputs = [] - tsk.outputs = [bld.path.find_or_declare(header)] -def set_options(opt): + bld( + rule = cmd, + name = 'svnversion', + runnable_status = Task.RUN_ME, + before = 'cc', + color = 'BLUE', + post_run = post_run, + target = [bld.path.find_or_declare(header)] + ) + +def options(opt): # options provided by the modules opt.tool_options('compiler_cxx') opt.tool_options('compiler_cc') @@ -77,19 +79,19 @@ def set_options(opt): opt.sub_options('dbus') def configure(conf): - platform = Utils.detect_platform() + platform = sys.platform conf.env['IS_MACOSX'] = platform == 'darwin' - conf.env['IS_LINUX'] = platform == 'linux' or platform == 'posix' + conf.env['IS_LINUX'] = platform == 'linux' or platform == 'linux2' or platform == 'posix' conf.env['IS_SUN'] = platform == 'sunos' if conf.env['IS_LINUX']: - Utils.pprint('CYAN', "Linux detected") + Logs.pprint('CYAN', "Linux detected") if conf.env['IS_MACOSX']: - Utils.pprint('CYAN', "MacOS X detected") + Logs.pprint('CYAN', "MacOS X detected") if conf.env['IS_SUN']: - Utils.pprint('CYAN', "SunOS detected") + Logs.pprint('CYAN', "SunOS detected") if conf.env['IS_LINUX']: conf.check_tool('compiler_cxx') @@ -135,25 +137,25 @@ def configure(conf): conf.sub_config('example-clients') - if conf.check_cfg(package='celt', atleast_version='0.11.0', args='--cflags --libs'): + if conf.check_cfg(package='celt', atleast_version='0.11.0', args='--cflags --libs', mandatory=False): conf.define('HAVE_CELT', 1) conf.define('HAVE_CELT_API_0_11', 1) conf.define('HAVE_CELT_API_0_8', 0) conf.define('HAVE_CELT_API_0_7', 0) conf.define('HAVE_CELT_API_0_5', 0) - elif conf.check_cfg(package='celt', atleast_version='0.8.0', args='--cflags --libs'): + elif conf.check_cfg(package='celt', atleast_version='0.8.0', args='--cflags --libs', mandatory=False): conf.define('HAVE_CELT', 1) conf.define('HAVE_CELT_API_0_11', 0) conf.define('HAVE_CELT_API_0_8', 1) conf.define('HAVE_CELT_API_0_7', 0) conf.define('HAVE_CELT_API_0_5', 0) - elif conf.check_cfg(package='celt', atleast_version='0.7.0', args='--cflags --libs'): + elif conf.check_cfg(package='celt', atleast_version='0.7.0', args='--cflags --libs', mandatory=False): conf.define('HAVE_CELT', 1) conf.define('HAVE_CELT_API_0_11', 0) conf.define('HAVE_CELT_API_0_8', 0) conf.define('HAVE_CELT_API_0_7', 1) conf.define('HAVE_CELT_API_0_5', 0) - elif conf.check_cfg(package='celt', atleast_version='0.5.0', args='--cflags --libs', required=True): + elif conf.check_cfg(package='celt', atleast_version='0.5.0', args='--cflags --libs', mandatory=False): conf.define('HAVE_CELT', 1) conf.define('HAVE_CELT_API_0_11', 0) conf.define('HAVE_CELT_API_0_8', 0) @@ -238,17 +240,17 @@ def configure(conf): conf.env['LIBDIR'] = conf.env['PREFIX'] + '/lib32' conf.write_config_header('config.h') - print + print() display_msg("==================") version_msg = "JACK " + VERSION if svnrev: version_msg += " exported from r" + svnrev else: version_msg += " svn revision will checked and eventually updated during build" - print version_msg + print(version_msg) - print "Build with a maximum of %d JACK clients" % conf.env['CLIENT_NUM'] - print "Build with a maximum of %d ports per application" % conf.env['PORT_NUM_FOR_CLIENT'] + print("Build with a maximum of %d JACK clients" % Options.options.clients) + print("Build with a maximum of %d ports per application" % Options.options.application_ports) display_msg("Install prefix", conf.env['PREFIX'], 'CYAN') display_msg("Library directory", conf.env['LIBDIR'], 'CYAN') @@ -265,8 +267,8 @@ def configure(conf): display_feature('Build D-Bus JACK (jackdbus)', conf.env['BUILD_JACKDBUS']) if conf.env['BUILD_JACKDBUS'] and conf.env['BUILD_JACKD']: - print Logs.colors.RED + 'WARNING !! mixing both jackd and jackdbus may cause issues:' + Logs.colors.NORMAL - print Logs.colors.RED + 'WARNING !! jackdbus does not use .jackdrc nor qjackctl settings' + Logs.colors.NORMAL + print(Logs.colors.RED + 'WARNING !! mixing both jackd and jackdbus may cause issues:' + Logs.colors.NORMAL) + print(Logs.colors.RED + 'WARNING !! jackdbus does not use .jackdrc nor qjackctl settings' + Logs.colors.NORMAL) if conf.env['IS_LINUX']: display_feature('Build with ALSA support', conf.env['BUILD_DRIVER_ALSA'] == True) @@ -278,21 +280,21 @@ def configure(conf): #display_msg('Settings persistence', xxx) if conf.env['DBUS_SERVICES_DIR'] != conf.env['DBUS_SERVICES_DIR_REAL']: - print - print Logs.colors.RED + "WARNING: D-Bus session services directory as reported by pkg-config is" - print Logs.colors.RED + "WARNING:", - print Logs.colors.CYAN + conf.env['DBUS_SERVICES_DIR_REAL'] - print Logs.colors.RED + 'WARNING: but service file will be installed in' - print Logs.colors.RED + "WARNING:", - print Logs.colors.CYAN + conf.env['DBUS_SERVICES_DIR'] - print Logs.colors.RED + 'WARNING: You may need to adjust your D-Bus configuration after installing jackdbus' - print 'WARNING: You can override dbus service install directory' - print 'WARNING: with --enable-pkg-config-dbus-service-dir option to this script' - print Logs.colors.NORMAL, - print + print() + print(Logs.colors.RED + "WARNING: D-Bus session services directory as reported by pkg-config is") + print(Logs.colors.RED + "WARNING:", end=' ') + print(Logs.colors.CYAN + conf.env['DBUS_SERVICES_DIR_REAL']) + print(Logs.colors.RED + 'WARNING: but service file will be installed in') + print(Logs.colors.RED + "WARNING:", end=' ') + print(Logs.colors.CYAN + conf.env['DBUS_SERVICES_DIR']) + print(Logs.colors.RED + 'WARNING: You may need to adjust your D-Bus configuration after installing jackdbus') + print('WARNING: You can override dbus service install directory') + print('WARNING: with --enable-pkg-config-dbus-service-dir option to this script') + print(Logs.colors.NORMAL, end=' ') + print() def build(bld): - print ("make[1]: Entering directory `" + os.getcwd() + "/" + blddir + "'" ) + print(("make[1]: Entering directory `" + os.getcwd() + "/" + blddir + "'" )) if not os.access('svnversion.h', os.R_OK): create_svnversion_task(bld) @@ -326,27 +328,27 @@ def build(bld): html_docs_install_dir = share_dir + '/reference/html/' if Options.commands['install']: if os.path.isdir(html_docs_install_dir): - Utils.pprint('CYAN', "Removing old doxygen documentation installation...") + Logs.pprint('CYAN', "Removing old doxygen documentation installation...") shutil.rmtree(html_docs_install_dir) - Utils.pprint('CYAN', "Removing old doxygen documentation installation done.") - Utils.pprint('CYAN', "Installing doxygen documentation...") + Logs.pprint('CYAN', "Removing old doxygen documentation installation done.") + Logs.pprint('CYAN', "Installing doxygen documentation...") shutil.copytree(html_docs_source_dir, html_docs_install_dir) - Utils.pprint('CYAN', "Installing doxygen documentation done.") + Logs.pprint('CYAN', "Installing doxygen documentation done.") elif Options.commands['uninstall']: - Utils.pprint('CYAN', "Uninstalling doxygen documentation...") + Logs.pprint('CYAN', "Uninstalling doxygen documentation...") if os.path.isdir(share_dir): shutil.rmtree(share_dir) - Utils.pprint('CYAN', "Uninstalling doxygen documentation done.") + Logs.pprint('CYAN', "Uninstalling doxygen documentation done.") elif Options.commands['clean']: if os.access(html_docs_source_dir, os.R_OK): - Utils.pprint('CYAN', "Removing doxygen generated documentation...") + Logs.pprint('CYAN', "Removing doxygen generated documentation...") shutil.rmtree(html_docs_source_dir) - Utils.pprint('CYAN', "Removing doxygen generated documentation done.") + Logs.pprint('CYAN', "Removing doxygen generated documentation done.") elif Options.commands['build']: if not os.access(html_docs_source_dir, os.R_OK): os.popen("doxygen").read() else: - Utils.pprint('CYAN', "doxygen documentation already built.") + Logs.pprint('CYAN', "doxygen documentation already built.") def dist_hook(): os.remove('svnversion_regenerate.sh')