projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove duplicate header includes in gtk2_ardour
[ardour.git]
/
gtk2_ardour
/
wscript
diff --git
a/gtk2_ardour/wscript
b/gtk2_ardour/wscript
index d55945087b97802ed20becb49663354b99617816..3e6df3709d72196d4c7f4b6d3d96cf8489615f1d 100644
(file)
--- a/
gtk2_ardour/wscript
+++ b/
gtk2_ardour/wscript
@@
-35,7
+35,9
@@
gtk2_ardour_sources = [
'ardour_dialog.cc',
'ardour_display.cc',
'ardour_dropdown.cc',
'ardour_dialog.cc',
'ardour_display.cc',
'ardour_dropdown.cc',
+ 'ardour_http.cc',
'ardour_knob.cc',
'ardour_knob.cc',
+ 'ardour_spinner.cc',
'ardour_ui.cc',
'ardour_ui2.cc',
'ardour_ui_dependents.cc',
'ardour_ui.cc',
'ardour_ui2.cc',
'ardour_ui_dependents.cc',
@@
-153,7
+155,6
@@
gtk2_ardour_sources = [
'midi_velocity_dialog.cc',
'missing_file_dialog.cc',
'missing_plugin_dialog.cc',
'midi_velocity_dialog.cc',
'missing_file_dialog.cc',
'missing_plugin_dialog.cc',
- 'mixer_actor.cc',
'mixer_group_tabs.cc',
'mixer_strip.cc',
'mixer_ui.cc',
'mixer_group_tabs.cc',
'mixer_strip.cc',
'mixer_ui.cc',
@@
-310,6
+311,12
@@
def enoify (major, minor):
return "\\n\\\"Before and After Science\\\""
elif minor == 1:
return "\\n\\\"After the Heat\\\""
return "\\n\\\"Before and After Science\\\""
elif minor == 1:
return "\\n\\\"After the Heat\\\""
+ elif minor == 2:
+ return "\\n\\\"Music for Airports\\\""
+ elif minor == 3:
+ return "\\n\\\"Music for Films\\\""
+ elif minor == 4:
+ return "\\n\\\"In a Land of Clear Colours\\\""
return "\\\"\\\""
def options(opt):
return "\\\"\\\""
def options(opt):
@@
-816,8
+823,8
@@
def build(bld):
# Default UI configuration
bld.install_files(bld.env['CONFDIR'], 'default_ui_config')
# Default UI configuration
bld.install_files(bld.env['CONFDIR'], 'default_ui_config')
- # Color Themes. Find each color file for this program
, strip the program name
- # and install
.
+ # Color Themes. Find each color file for this program
only
+ # and install
bld.install_files (os.path.join(bld.env['DATADIR'], 'themes'), bld.path.ant_glob ('themes/*-' + Options.options.program_name.lower() + '.colors'));
# Default export stuff
bld.install_files (os.path.join(bld.env['DATADIR'], 'themes'), bld.path.ant_glob ('themes/*-' + Options.options.program_name.lower() + '.colors'));
# Default export stuff
@@
-864,7
+871,10
@@
def appdata_i18n_pot(bld):
adsource = os.path.join(bld.top_dir, 'gtk2_ardour',
'ardour.appdata.xml.in.in')
Logs.info('Updating ' + potfile)
adsource = os.path.join(bld.top_dir, 'gtk2_ardour',
'ardour.appdata.xml.in.in')
Logs.info('Updating ' + potfile)
- subprocess.call(('itstool', '-i', itsfile, '-o', potfile, adsource))
+ try:
+ subprocess.call(('itstool', '-i', itsfile, '-o', potfile, adsource))
+ except:
+ print ('Error processing appdata pot file - ignored')
elif bld.cmd == 'clean' and os.path.exists(potfile):
Logs.info('Removing Ardour appdata pot file')
os.remove(potfile)
elif bld.cmd == 'clean' and os.path.exists(potfile):
Logs.info('Removing Ardour appdata pot file')
os.remove(potfile)