Created
December 11, 2012 20:50
-
-
Save eliotb/4262013 to your computer and use it in GitHub Desktop.
patch for jack2 wscript doxygen
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
--- /home/eliot/src/jack/jack-1.9.9.5/wscript | |
+++ /home/eliot/src/jack/wscript | |
@@ -115,7 +115,7 @@ | |
#if conf.env['IS_SUN']: | |
# conf.check_tool('compiler_cxx') | |
# conf.check_tool('compiler_cc') | |
- | |
+ | |
conf.env.append_unique('CXXFLAGS', '-Wall') | |
conf.env.append_unique('CFLAGS', '-Wall') | |
@@ -282,7 +282,7 @@ | |
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') | |
display_msg("Drivers directory", conf.env['ADDON_DIR'], 'CYAN') | |
@@ -307,7 +307,7 @@ | |
display_feature('Build with ALSA support', conf.env['BUILD_DRIVER_ALSA'] == True) | |
display_feature('Build with FireWire (FreeBob) support', conf.env['BUILD_DRIVER_FREEBOB'] == True) | |
display_feature('Build with FireWire (FFADO) support', conf.env['BUILD_DRIVER_FFADO'] == True) | |
- | |
+ | |
if conf.env['BUILD_JACKDBUS'] == True: | |
display_msg('D-Bus service install directory', conf.env['DBUS_SERVICES_DIR'], 'CYAN') | |
#display_msg('Settings persistence', xxx) | |
@@ -340,7 +340,7 @@ | |
bld.add_subdirs('man') | |
if bld.env['BUILD_JACKDBUS'] == True: | |
bld.add_subdirs('dbus') | |
- | |
+ | |
if bld.env['IS_MACOSX']: | |
bld.add_subdirs('macosx') | |
bld.add_subdirs('example-clients') | |
@@ -356,10 +356,10 @@ | |
bld.add_subdirs('dbus') | |
if bld.env['BUILD_DOXYGEN_DOCS'] == True: | |
- share_dir = bld.env.get_destdir() + bld.env['PREFIX'] + '/share/jack-audio-connection-kit' | |
+ share_dir = bld.options.destdir + bld.env['PREFIX'] + '/share/jack-audio-connection-kit' | |
html_docs_source_dir = "build/default/html" | |
html_docs_install_dir = share_dir + '/reference/html/' | |
- if Options.commands['install']: | |
+ if bld.cmd == 'install': | |
if os.path.isdir(html_docs_install_dir): | |
Logs.pprint('CYAN', "Removing old doxygen documentation installation...") | |
shutil.rmtree(html_docs_install_dir) | |
@@ -367,17 +367,17 @@ | |
Logs.pprint('CYAN', "Installing doxygen documentation...") | |
shutil.copytree(html_docs_source_dir, html_docs_install_dir) | |
Logs.pprint('CYAN', "Installing doxygen documentation done.") | |
- elif Options.commands['uninstall']: | |
+ elif bld.cmd =='uninstall': | |
Logs.pprint('CYAN', "Uninstalling doxygen documentation...") | |
if os.path.isdir(share_dir): | |
shutil.rmtree(share_dir) | |
Logs.pprint('CYAN', "Uninstalling doxygen documentation done.") | |
- elif Options.commands['clean']: | |
+ elif bld.cmd =='clean': | |
if os.access(html_docs_source_dir, os.R_OK): | |
Logs.pprint('CYAN', "Removing doxygen generated documentation...") | |
shutil.rmtree(html_docs_source_dir) | |
Logs.pprint('CYAN', "Removing doxygen generated documentation done.") | |
- elif Options.commands['build']: | |
+ elif bld.cmd =='build': | |
if not os.access(html_docs_source_dir, os.R_OK): | |
os.popen("doxygen").read() | |
else: |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment