diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2007-01-04 19:12:55 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2007-01-04 19:12:55 +0000 |
| commit | 119dc86f6fb8d5100ed49930fa9ff73c6322fa34 (patch) | |
| tree | 352ce436c0daa19daeeb147540faaca9a6412e3b /gtk2_ardour | |
| parent | 588910d8d7ff7698eaa02421775ee4b358cc13c1 (diff) | |
copy older versions of the session file, fix up ardev to work again using %VERSION%
git-svn-id: svn://localhost/ardour2/trunk@1268 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/SConscript | 11 | ||||
| -rwxr-xr-x | gtk2_ardour/ardev | 2 | ||||
| -rw-r--r-- | gtk2_ardour/ardev.in | 3 | ||||
| -rw-r--r-- | gtk2_ardour/ardour.sh.in | 2 |
4 files changed, 14 insertions, 4 deletions
diff --git a/gtk2_ardour/SConscript b/gtk2_ardour/SConscript index f2c51e18a0..375dba278b 100644 --- a/gtk2_ardour/SConscript +++ b/gtk2_ardour/SConscript @@ -4,7 +4,7 @@ import os import os.path import glob -Import('env install_prefix final_prefix config_prefix libraries i18n version') +Import('env install_prefix final_prefix config_prefix libraries i18n ardour_version') gtkardour = env.Copy() gtkmmtests = env.Copy() @@ -260,7 +260,7 @@ versionflag = '-DVERSIONSTRING=\\\"' + env['VERSION'] + '\\\"' gtkardour.Append(CXXFLAGS=versionflag) -executable = 'ardour.bin' +executable = 'ardour-' + ardour_version ardour = gtkardour.Program(target = executable, source = gtkardour_files + extra_sources) ardourlib = gtkardour.SharedLibrary(target = 'ardourgtk', source = gtkardour_files + extra_sources) @@ -273,10 +273,17 @@ tt = gtkmmtests.Program(target = 'tt', source = tt_files) my_subst_dict = { } my_subst_dict['%INSTALL_PREFIX%'] = final_prefix my_subst_dict['%LIBDIR%'] = env['LIBDIR'] +my_subst_dict['%VERSION%'] = ardour_version ardoursh = env.SubstInFile ('ardour.sh','ardour.sh.in', SUBST_DICT = my_subst_dict); env.AddPostAction (ardoursh, Chmod ('$TARGET', 0755)) +ardourdev = env.SubstInFile ('ardev','ardev.in', SUBST_DICT = my_subst_dict); +env.AddPostAction (ardourdev, Chmod ('$TARGET', 0755)) + +Default(ardourdev) +Default(ardoursh) + if env['VST']: Default(ardourlib) # the library - into the library dir diff --git a/gtk2_ardour/ardev b/gtk2_ardour/ardev index 04719908b4..73f6573228 100755 --- a/gtk2_ardour/ardev +++ b/gtk2_ardour/ardev @@ -1,3 +1,3 @@ #!/bin/sh . `dirname "$0"`/ardev_common.sh -exec gtk2_ardour/ardour.bin --novst $* +exec gtk2_ardour/ardour-2.0beta10 $* diff --git a/gtk2_ardour/ardev.in b/gtk2_ardour/ardev.in new file mode 100644 index 0000000000..d9ba8330bb --- /dev/null +++ b/gtk2_ardour/ardev.in @@ -0,0 +1,3 @@ +#!/bin/sh +. `dirname "$0"`/ardev_common.sh +exec gtk2_ardour/ardour-%VERSION% $* diff --git a/gtk2_ardour/ardour.sh.in b/gtk2_ardour/ardour.sh.in index 835cbd4582..1bf1ffa94b 100644 --- a/gtk2_ardour/ardour.sh.in +++ b/gtk2_ardour/ardour.sh.in @@ -6,6 +6,6 @@ export LD_LIBRARY_PATH=%INSTALL_PREFIX%/%LIBDIR%/ardour2:$LD_LIBRARY_PATH # DYLD_LIBRARY_PATH is for Darwin export DYLD_LIBRARY_PATH=$LD_LIBRARY_PATH -exec %INSTALL_PREFIX%/%LIBDIR%/ardour2/ardour.bin $* +exec %INSTALL_PREFIX%/%LIBDIR%/ardour2/ardour-%VERSION% $* |