Deploy Session-templates

5 files changed, 6 insertions, 55 deletions

diff --git a/templates/.stub b/templates/.stub
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/templates/.stub
diff --git a/templates/wscript b/templates/wscript
deleted file mode 100644
index ab7e8d0768..0000000000
--- a/templates/wscript
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/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 = '.'
-out = 'build'
-
-def configure(conf):
-    pass
-
-def build(bld):
-
-    templates = bld.path.ant_glob('*/*.template')
-    for t in templates:
-        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'], os.path.join('templates', dir_name)))
-
-def options(opt):
-    pass
diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build
index 7491ebdf0b..81b661812f 100755
--- a/tools/linux_packaging/build
+++ b/tools/linux_packaging/build
@@ -231,7 +231,6 @@ mkdir -p $OSC
 mkdir -p $ExportFormats
 mkdir -p $Panners
 mkdir -p $Backends
-mkdir -p $Templates
 mkdir -p $Shared/doc
 
 # maybe set variables
@@ -398,12 +397,8 @@ for x in $BUILD_ROOT/../osc/*.preset ; do
     cp "$x" $OSC
 done
 
-# Templates
-#for f in $BUILD_ROOT/../templates/* ; do
-#    if [ -d "$f" ] ; then
-#	echo Template: $f ; cp -r "$f" $Templates ;
-#    fi
-#done
+#Session templates
+cp -av $BUILD_ROOT/../templates $Templates
 
 # ExportFormats
 # got to be careful with names here
diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build
index 3e9b587c33..2f14b07bee 100755
--- a/tools/osx_packaging/osx_build
+++ b/tools/osx_packaging/osx_build
@@ -180,7 +180,6 @@ mkdir -p $Panners
 mkdir -p $Backends
 mkdir -p $MidiMaps
 mkdir -p $ExportFormats
-mkdir -p $Templates
 mkdir -p $Frameworks/modules
 mkdir -p $Etc
 mkdir -p $MackieControl
@@ -349,12 +348,8 @@ for f in $BUILD_ROOT/../export/*.preset $BUILD_ROOT/../export/*.format ; do
     cp "$f" $ExportFormats ; 
 done
 
-# Session and Route templates
-#for f in $BUILD_ROOT/../templates/* ; do 
-#    if [ -d "$f" ] ; then
-#        cp -r "$f" $Templates ; 
-#    fi
-#done
+#Session templates
+cp -av $BUILD_ROOT/../templates $Templates
 
 # MidiMaps
 # got to be careful with names here
diff --git a/wscript b/wscript
index c8ee117c80..fa0fb113bb 100644
--- a/wscript
+++ b/wscript
@@ -1351,6 +1351,8 @@ def build(bld):
             
     bld.install_files (bld.env['CONFDIR'], 'system_config')
 
+    bld.install_files (os.path.join (bld.env['DATADIR'], 'templates'), bld.path.ant_glob ('templates/**'))
+
     if bld.env['RUN_TESTS']:
         bld.add_post_fun(test)