diff --git a/templates/16 Tracks/16 Tracks.template.in b/templates/16 Tracks/16 Tracks.template.in deleted file mode 100644 index 2b157dcb42..0000000000 --- a/templates/16 Tracks/16 Tracks.template.in +++ /dev/null @@ -1,617 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/templates/2 Track/2 Track.template.in b/templates/2 Track/2 Track.template.in deleted file mode 100644 index bdf60c7f35..0000000000 --- a/templates/2 Track/2 Track.template.in +++ /dev/null @@ -1,155 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/templates/32 Tracks/32 Tracks.template.in b/templates/32 Tracks/32 Tracks.template.in deleted file mode 100644 index 5d7740bcd9..0000000000 --- a/templates/32 Tracks/32 Tracks.template.in +++ /dev/null @@ -1,881 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/templates/4 Tracks/4 Tracks.template.in b/templates/4 Tracks/4 Tracks.template.in deleted file mode 100644 index c64d098ed9..0000000000 --- a/templates/4 Tracks/4 Tracks.template.in +++ /dev/null @@ -1,221 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/templates/8 Tracks/8 Tracks.template.in b/templates/8 Tracks/8 Tracks.template.in deleted file mode 100644 index fe0dd6f009..0000000000 --- a/templates/8 Tracks/8 Tracks.template.in +++ /dev/null @@ -1,353 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/templates/wscript b/templates/wscript index dd60d401a5..8dff100d1a 100644 --- a/templates/wscript +++ b/templates/wscript @@ -1,5 +1,22 @@ #!/usr/bin/python +# +# Paul notes (April 2013) +# +# There seems to be little point in including templates with Ardour +# until or as long as the input connections of tracks depends on +# the user's hardware configuration. This makes any pre-existing +# templates potentially wrong/useless/annoying for anyone who +# uses a different hardware input configuration than was used +# to create the templates. +# +# Templates should be created by the user, not by us. +# +# I modified the code below, but have not tested it. For now +# this directory will be removed from the top level wscript's +# list of children. +# + import os top = '.' @@ -10,21 +27,15 @@ def configure(conf): def build(bld): - if bld.is_defined('COREAUDIO_SUPPORT'): - subst_dict = {'JACK_INPUT': 'coreaudio:Built-in Audio:in', 'JACK_OUTPUT': 'coreaudio:Built-in Audio:out'} - else: - subst_dict = {'JACK_INPUT': 'system:playback_','JACK_OUTPUT': 'system:capture_'} - - templates = bld.path.ant_glob('*/*.template.in') + templates = bld.path.ant_glob('*/*.template') for t in templates: - dir_name = os.path.basename(t.srcpath()).replace('.template.in', '') - file_name = os.path.basename(t.srcpath()).replace('.in', '') + file_name = os.path.basename(t.srcpath()) + dir_name = os.path.dirname(t.srcpath()) obj = bld(features = 'subst', name = 'template', source = [ t ], target = [ os.path.join(dir_name, file_name) ], install_path = os.path.join(bld.env['DATADIR'], 'ardour3', os.path.join('templates', dir_name))) - obj.__dict__.update(subst_dict) def options(opt): pass diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build index e039767934..1928fadd8f 100755 --- a/tools/linux_packaging/build +++ b/tools/linux_packaging/build @@ -192,7 +192,6 @@ mkdir -p $MackieControl mkdir -p $ExportFormats mkdir -p $Panners mkdir -p $Templates -mkdir -p $Shared/templates mkdir -p $Shared/doc # maybe set variables @@ -363,11 +362,11 @@ for x in $BUILD_ROOT/../mcp/*.device $BUILD_ROOT/../mcp/*.profile ; do done # Templates -for f in $BUILD_ROOT/../templates/* ; do - if [ -d "$f" ] ; then - echo Template: $f ; cp -r "$f" $Templates ; - fi -done +#for f in $BUILD_ROOT/../templates/* ; do +# if [ -d "$f" ] ; then +# echo Template: $f ; cp -r "$f" $Templates ; +# fi +#done # ExportFormats # got to be careful with names here diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build index bd504a5579..d750674d36 100755 --- a/tools/osx_packaging/osx_build +++ b/tools/osx_packaging/osx_build @@ -126,7 +126,6 @@ mkdir -p $MidiMaps mkdir -p $ExportFormats mkdir -p $Templates mkdir -p $Frameworks/modules -mkdir -p $Shared/templates mkdir -p $Etc mkdir -p $MackieControl @@ -306,11 +305,11 @@ for f in $BUILD_ROOT/../export/*.preset $BUILD_ROOT/../export/*.format ; do done # Session and Route templates -for f in $BUILD_ROOT/../templates/* ; do - if [ -d "$f" ] ; then - cp -r "$f" $Templates ; - fi -done +#for f in $BUILD_ROOT/../templates/* ; do +# if [ -d "$f" ] ; then +# cp -r "$f" $Templates ; +# fi +#done # MidiMaps # got to be careful with names here diff --git a/wscript b/wscript index 4d261769cf..c0d518cbe6 100644 --- a/wscript +++ b/wscript @@ -42,7 +42,6 @@ children = [ 'libs/clearlooks-newer', 'libs/audiographer', 'gtk2_ardour', - 'templates', 'export', 'midi_maps', 'mcp',