Fix ardour2 -> ardour3 issues.
git-svn-id: svn://localhost/ardour2/branches/3.0@4622 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
2463be97f7
commit
227eca4054
|
|
@ -17,7 +17,7 @@
|
|||
# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
|
||||
# by quotes) that should identify the project.
|
||||
|
||||
PROJECT_NAME = Ardour2
|
||||
PROJECT_NAME = Ardour3
|
||||
|
||||
# The PROJECT_NUMBER tag can be used to enter a project or revision number.
|
||||
# This could be handy for archiving the generated documentation or
|
||||
|
|
|
|||
|
|
@ -532,36 +532,36 @@ env.Alias ('version', gtkardour.VersionBuild(['version.cc','version.h'], []))
|
|||
if env['FREEDESKTOP']:
|
||||
desktop_icon_install_prefix = install_prefix + '/share/icons/hicolor'
|
||||
# Install the desktop icons to the default locations #
|
||||
env.Alias('install', env.InstallAs(os.path.join(desktop_icon_install_prefix, '16x16', 'apps', 'ardour2.png'), 'icons/ardour_icon_16px.png'))
|
||||
env.Alias('install', env.InstallAs(os.path.join(desktop_icon_install_prefix, '22x22', 'apps', 'ardour2.png'), 'icons/ardour_icon_22px.png'))
|
||||
env.Alias('install', env.InstallAs(os.path.join(desktop_icon_install_prefix, '32x32', 'apps', 'ardour2.png'), 'icons/ardour_icon_32px.png'))
|
||||
env.Alias('install', env.InstallAs(os.path.join(desktop_icon_install_prefix, '48x48', 'apps', 'ardour2.png'), 'icons/ardour_icon_48px.png'))
|
||||
env.Alias('install', env.InstallAs(os.path.join(desktop_icon_install_prefix, '16x16', 'apps', 'ardour3.png'), 'icons/ardour_icon_16px.png'))
|
||||
env.Alias('install', env.InstallAs(os.path.join(desktop_icon_install_prefix, '22x22', 'apps', 'ardour3.png'), 'icons/ardour_icon_22px.png'))
|
||||
env.Alias('install', env.InstallAs(os.path.join(desktop_icon_install_prefix, '32x32', 'apps', 'ardour3.png'), 'icons/ardour_icon_32px.png'))
|
||||
env.Alias('install', env.InstallAs(os.path.join(desktop_icon_install_prefix, '48x48', 'apps', 'ardour3.png'), 'icons/ardour_icon_48px.png'))
|
||||
# Install the mime type xml file and its icon #
|
||||
env.Alias('install', env.Install(os.path.join(install_prefix, 'share', 'mime', 'packages'), 'ardour2.xml'))
|
||||
env.Alias('install', env.InstallAs(os.path.join(desktop_icon_install_prefix, '16x16', 'mimetypes', 'application-x-ardour2.png'), 'icons/application-x-ardour_16px.png'))
|
||||
env.Alias('install', env.InstallAs(os.path.join(desktop_icon_install_prefix, '22x22', 'mimetypes', 'application-x-ardour2.png'), 'icons/application-x-ardour_22px.png'))
|
||||
env.Alias('install', env.InstallAs(os.path.join(desktop_icon_install_prefix, '32x32', 'mimetypes', 'application-x-ardour2.png'), 'icons/application-x-ardour_32px.png'))
|
||||
env.Alias('install', env.InstallAs(os.path.join(desktop_icon_install_prefix, '48x48', 'mimetypes', 'application-x-ardour2.png'), 'icons/application-x-ardour_48px.png'))
|
||||
env.Alias('install', env.Install(os.path.join(install_prefix, 'share', 'mime', 'packages'), 'ardour3.xml'))
|
||||
env.Alias('install', env.InstallAs(os.path.join(desktop_icon_install_prefix, '16x16', 'mimetypes', 'application-x-ardour3.png'), 'icons/application-x-ardour_16px.png'))
|
||||
env.Alias('install', env.InstallAs(os.path.join(desktop_icon_install_prefix, '22x22', 'mimetypes', 'application-x-ardour3.png'), 'icons/application-x-ardour_22px.png'))
|
||||
env.Alias('install', env.InstallAs(os.path.join(desktop_icon_install_prefix, '32x32', 'mimetypes', 'application-x-ardour3.png'), 'icons/application-x-ardour_32px.png'))
|
||||
env.Alias('install', env.InstallAs(os.path.join(desktop_icon_install_prefix, '48x48', 'mimetypes', 'application-x-ardour3.png'), 'icons/application-x-ardour_48px.png'))
|
||||
env.Alias('install', env.Command (os.path.join(install_prefix, 'share', 'mime'), [], 'update-mime-database $TARGET'))
|
||||
# Update the icon cache #
|
||||
env.Alias('install', env.Command (desktop_icon_install_prefix, [], 'touch --no-create $TARGET'))
|
||||
env.Alias('install', env.Command (desktop_icon_install_prefix, [], 'gtk-update-icon-cache $TARGET'))
|
||||
# Make the ardour2.desktop file and install it #
|
||||
env.Alias('install', env.Command ('ardour2.desktop', 'ardour2.desktop.in', 'cat $SOURCES > $TARGET'))
|
||||
env.Alias('install', env.Install(os.path.join(install_prefix, 'share', 'applications'), 'ardour2.desktop'))
|
||||
# Make the ardour3.desktop file and install it #
|
||||
env.Alias('install', env.Command ('ardour3.desktop', 'ardour3.desktop.in', 'cat $SOURCES > $TARGET'))
|
||||
env.Alias('install', env.Install(os.path.join(install_prefix, 'share', 'applications'), 'ardour3.desktop'))
|
||||
env.Alias('install', env.Command (os.path.join(install_prefix, 'share', 'applications'), [], 'update-desktop-database $TARGET'))
|
||||
# uninstall target.. needed to run update-mime-database and update-desktop-database after removal. #`
|
||||
remove_desktop_files = env.Command ('another_frobnicatory_decoy', [],
|
||||
[ Delete (install_prefix + '/share/mime/packages/ardour2.xml'),
|
||||
Delete (install_prefix + '/share/applications/ardour2.desktop'),
|
||||
Delete (desktop_icon_install_prefix + '/16x16/apps/ardour2.png'),
|
||||
Delete (desktop_icon_install_prefix + '/22x22/apps/ardour2.png'),
|
||||
Delete (desktop_icon_install_prefix + '/32x32/apps/ardour2.png'),
|
||||
Delete (desktop_icon_install_prefix + '/48x48/apps/ardour2.png'),
|
||||
Delete (desktop_icon_install_prefix + '/16x16/mimetypes/application-x-ardour2.png'),
|
||||
Delete (desktop_icon_install_prefix + '/22x22/mimetypes/application-x-ardour2.png'),
|
||||
Delete (desktop_icon_install_prefix + '/32x32/mimetypes/application-x-ardour2.png'),
|
||||
Delete (desktop_icon_install_prefix + '/48x48/mimetypes/application-x-ardour2.png'),
|
||||
[ Delete (install_prefix + '/share/mime/packages/ardour3.xml'),
|
||||
Delete (install_prefix + '/share/applications/ardour3.desktop'),
|
||||
Delete (desktop_icon_install_prefix + '/16x16/apps/ardour3.png'),
|
||||
Delete (desktop_icon_install_prefix + '/22x22/apps/ardour3.png'),
|
||||
Delete (desktop_icon_install_prefix + '/32x32/apps/ardour3.png'),
|
||||
Delete (desktop_icon_install_prefix + '/48x48/apps/ardour3.png'),
|
||||
Delete (desktop_icon_install_prefix + '/16x16/mimetypes/application-x-ardour3.png'),
|
||||
Delete (desktop_icon_install_prefix + '/22x22/mimetypes/application-x-ardour3.png'),
|
||||
Delete (desktop_icon_install_prefix + '/32x32/mimetypes/application-x-ardour3.png'),
|
||||
Delete (desktop_icon_install_prefix + '/48x48/mimetypes/application-x-ardour3.png'),
|
||||
Action ('update-mime-database ' + install_prefix + '/share/mime'),
|
||||
Action ('gtk-update-icon-cache ' + desktop_icon_install_prefix),
|
||||
Action ('update-desktop-database ' + install_prefix + '/share/applications')])
|
||||
|
|
@ -589,8 +589,8 @@ env.Alias ('tarball', env.Distribute (env['DISTTREE'],
|
|||
'SAE-de-nokeypad.bindings.in',
|
||||
'ardour3_ui_default.conf',
|
||||
'editor_xpms',
|
||||
'ardour2.xml',
|
||||
'ardour2.desktop.in'
|
||||
'ardour3.xml',
|
||||
'ardour3.desktop.in'
|
||||
] +
|
||||
gtkardour_files +
|
||||
vst_files +
|
||||
|
|
|
|||
|
|
@ -7,10 +7,10 @@ export ARDOUR_SURFACES_PATH=libs/surfaces/osc:libs/surfaces/generic_midi:libs/su
|
|||
export ARDOUR_DATA_PATH=gtk2_ardour:.
|
||||
if test -d $HOME/gtk/inst ; then
|
||||
echo USING NEW CLEARLOOKS
|
||||
export GTK_PATH=~/.ardour2:libs/clearlooks-newer
|
||||
export GTK_PATH=~/.ardour3:libs/clearlooks-newer
|
||||
else
|
||||
echo USING OLD CLEARLOOKS
|
||||
export GTK_PATH=~/.ardour2:libs/clearlooks-older
|
||||
export GTK_PATH=~/.ardour3:libs/clearlooks-older
|
||||
fi
|
||||
export VAMP_PATH=libs/vamp-plugins:$VAMP_PATH
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
[Desktop Entry]
|
||||
Name=Ardour
|
||||
Comment=Ardour Digital Audio Workstation
|
||||
Exec=ardour2
|
||||
Icon=ardour2
|
||||
Exec=ardour3
|
||||
Icon=ardour3
|
||||
Terminal=false
|
||||
MimeType=application/x-ardour2;
|
||||
MimeType=application/x-ardour3;
|
||||
Type=Application
|
||||
Categories=AudioVideo;Audio;X-Recorders;X-Multitrack;X-Jack;
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
|
||||
<mime-type type="application/x-ardour2">
|
||||
<mime-type type="application/x-ardour3">
|
||||
<sub-class-of type="application/xml"/>
|
||||
<comment>Ardour session file</comment>
|
||||
<glob pattern="*.ardour"/>
|
||||
|
|
@ -275,7 +275,7 @@ ThemeManager::setup_theme ()
|
|||
ColorsChanged.emit();
|
||||
|
||||
bool env_defined = false;
|
||||
string rcfile = Glib::getenv("ARDOUR2_UI_RC", env_defined);
|
||||
string rcfile = Glib::getenv("ARDOUR3_UI_RC", env_defined);
|
||||
|
||||
if(!env_defined) {
|
||||
rcfile = ARDOUR_UI::config()->ui_rc_file.get();
|
||||
|
|
|
|||
|
|
@ -1080,7 +1080,7 @@
|
|||
/Library/Frameworks/SampleRate.framework/Headers,
|
||||
/Library/Frameworks/Raptor.framework/Headers,
|
||||
/Library/Frameworks/LRdf.framework/Headers,
|
||||
/opt/ardour/src/ardour2/libs/surfaces/control_protocol,
|
||||
/opt/ardour/src/ardour3/libs/surfaces/control_protocol,
|
||||
);
|
||||
INSTALL_PATH = "@executable_path/../Frameworks";
|
||||
MACOSX_DEPLOYMENT_TARGET = "";
|
||||
|
|
@ -1138,7 +1138,7 @@
|
|||
/Library/Frameworks/SampleRate.framework/Headers,
|
||||
/Library/Frameworks/Raptor.framework/Headers,
|
||||
/Library/Frameworks/LRdf.framework/Headers,
|
||||
/opt/ardour/src/ardour2/libs/surfaces/control_protocol,
|
||||
/opt/ardour/src/ardour3/libs/surfaces/control_protocol,
|
||||
);
|
||||
INSTALL_PATH = "@executable_path/../Frameworks";
|
||||
MACOSX_DEPLOYMENT_TARGET = "";
|
||||
|
|
|
|||
|
|
@ -161,7 +161,9 @@ Source::add_playlist (boost::shared_ptr<Playlist> pl)
|
|||
res.first->second++;
|
||||
}
|
||||
|
||||
pl->GoingAway.connect (bind (mem_fun (*this, &Source::remove_playlist), boost::weak_ptr<Playlist> (pl)));
|
||||
pl->GoingAway.connect (bind (
|
||||
mem_fun (*this, &Source::remove_playlist),
|
||||
boost::weak_ptr<Playlist> (pl)));
|
||||
}
|
||||
|
||||
void
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ else:
|
|||
Default (usable_libclearlooks)
|
||||
|
||||
env.Alias('install', env.Install (
|
||||
os.path.join(install_prefix,env['LIBDIR'], 'ardour2', 'engines'),
|
||||
os.path.join(install_prefix,env['LIBDIR'], 'ardour3', 'engines'),
|
||||
libclearlooks))
|
||||
|
||||
env.Alias('tarball', env.Distribute (env['DISTTREE'],
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ usable_libclearlooks = clearlooks.Install ('engines', libclearlooks)
|
|||
Default (usable_libclearlooks)
|
||||
|
||||
env.Alias('install',
|
||||
env.Install(os.path.join(install_prefix,env['LIBDIR'], 'ardour2', 'engines'),
|
||||
env.Install(os.path.join(install_prefix,env['LIBDIR'], 'ardour3', 'engines'),
|
||||
libclearlooks))
|
||||
|
||||
env.Alias('tarball', env.Distribute (env['DISTTREE'],
|
||||
|
|
|
|||
|
|
@ -10,8 +10,8 @@ NOTES:
|
|||
|
||||
* support for alsa/sequencer ports is currently broken. We're working on it.
|
||||
|
||||
* you'll need to make port changes in etc/ardour2/ardour_system.rc and
|
||||
etc/ardour2/ardour.rc, otherwise they don't stay changed in ~/.ardour2/ardour.rc
|
||||
* you'll need to make port changes in etc/ardour3/ardour_system.rc and
|
||||
etc/ardour3/ardour.rc, otherwise they don't stay changed in ~/.ardour3/ardour.rc
|
||||
|
||||
|
||||
John Anderson
|
||||
|
|
|
|||
|
|
@ -79,7 +79,7 @@ if mackie['SURFACES']:
|
|||
Default(libardour_mackie)
|
||||
if env['NLS']:
|
||||
i18n (mackie, mackie_files, env)
|
||||
env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2','surfaces'), libardour_mackie))
|
||||
env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3','surfaces'), libardour_mackie))
|
||||
|
||||
env.Alias('tarball', env.Distribute (env['DISTTREE'],
|
||||
[ 'SConscript' ] +
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@ libardour_wiimote = wiimote.SharedLibrary('ardour_wiimote', wiimote_files)
|
|||
|
||||
if wiimote['WIIMOTE']:
|
||||
Default(libardour_wiimote)
|
||||
env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2', 'surfaces'), libardour_wiimote))
|
||||
env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3', 'surfaces'), libardour_wiimote))
|
||||
|
||||
if env['NLS']:
|
||||
i18n (wiimote, wiimote_files, env)
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@
|
|||
of the transport bar.
|
||||
<note>
|
||||
<para>
|
||||
In Ardour2, there is no <guibutton>Editor Mixer</guibutton>
|
||||
In Ardour3, there is no <guibutton>Editor Mixer</guibutton>
|
||||
button, but you can make the mixer strip visible by selecting
|
||||
<menuchoice> <guimenu>View</guimenu> <guisubmenu>Show Editor
|
||||
Mixer</guisubmenu> </menuchoice>, or by pressing
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
<!ENTITY ARDOUR_NAME "ardour">
|
||||
<!ENTITY ARDOUR_VERSION "%VERSION%">
|
||||
<!ENTITY ARDOUR_COMMAND "<command>ardour2</command>">
|
||||
<!ENTITY ARDOUR_COMMAND "<command>ardour3</command>">
|
||||
<!ENTITY ARDOUR_APPLICATION "<application>&ARDOUR_NAME;</application>">
|
||||
<!ENTITY COPYRIGHT_HOLDER "&ARDOUR_NAME; Foundation">
|
||||
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
<para>
|
||||
Note that all keyboard bindings can be changed in either the system or
|
||||
the user's Ardour key bindings file
|
||||
(<filename>$HOME/.ardour2/ardour.bindings</filename>).
|
||||
(<filename>$HOME/.ardour3/ardour.bindings</filename>).
|
||||
</para>
|
||||
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
|
||||
href="general_key_bindings.xml" />
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@
|
|||
|
||||
<para>
|
||||
While ardour is not running, edit your
|
||||
<filename>.ardour2/ardour.rc</filename> and add at the top, with the
|
||||
<filename>.ardour3/ardour.rc</filename> and add at the top, with the
|
||||
other ports:
|
||||
<programlisting>
|
||||
<MIDI-port tag="mcu" device="/dev/snd/midiC2D0" type="alsa/raw" mode="duplex"/>
|
||||
|
|
@ -55,7 +55,7 @@
|
|||
<para>
|
||||
It is also possible to add MCU extenders, although this is untested
|
||||
because nobody we know has access to one right now. To do this, add
|
||||
the following lines to <filename>~/.ardour2/ardour.rc</filename>
|
||||
the following lines to <filename>~/.ardour3/ardour.rc</filename>
|
||||
<programlisting>
|
||||
<MIDI-port tag="mcu_xt_1" device="/dev/snd/midiC3D0" type="alsa/raw" mode="duplex"/>
|
||||
<MIDI-port tag="mcu_xt_2" device="/dev/snd/midiC4D0" type="alsa/raw" mode="duplex"/>
|
||||
|
|
|
|||
|
|
@ -191,56 +191,56 @@ if File.exist?(ppc_libdir) and File.exist?(i386_libdir) then
|
|||
lipo_platforms_recurse(i386_libdir, ppc_libdir, "lib")
|
||||
lipo_platforms_recurse(i386_bindir+'/ardour', ppc_bindir+'/ardour', "bin/ardour")
|
||||
|
||||
# remove existing Ardour2.app
|
||||
`rm -rf Ardour2.app`
|
||||
# remove existing Ardour3.app
|
||||
`rm -rf Ardour3.app`
|
||||
|
||||
$stdout.print("\nRunning Playtpus to create Ardour2.app ...\n");
|
||||
$stdout.print("\nRunning Playtpus to create Ardour3.app ...\n");
|
||||
|
||||
`/usr/local/bin/platypus -D -X 'ardour' -a 'Ardour2' -t 'shell' -o 'None' -u 'Paul Davis' -i '/bin/sh' -V "#{version}" -s 'ArDr' -I 'org.ardour.Ardour2' -f 'bin' -f 'lib' -i 'Ardour2.icns' -f 'MenuBar.nib' -f 'ProgressWindow.nib' -f 'init' -f 'openDoc' 'script' 'Ardour2.app'`
|
||||
`/usr/local/bin/platypus -D -X 'ardour' -a 'Ardour3' -t 'shell' -o 'None' -u 'Paul Davis' -i '/bin/sh' -V "#{version}" -s 'ArDr' -I 'org.ardour.Ardour3' -f 'bin' -f 'lib' -i 'Ardour3.icns' -f 'MenuBar.nib' -f 'ProgressWindow.nib' -f 'init' -f 'openDoc' 'script' 'Ardour3.app'`
|
||||
|
||||
$stdout.print("\nCopying other stuff to Ardour2.app ...\n");
|
||||
$stdout.print("\nCopying other stuff to Ardour3.app ...\n");
|
||||
|
||||
if not File.exist?("Ardour2.app/Contents/Resources/etc") then
|
||||
Dir.mkdir "Ardour2.app/Contents/Resources/etc"
|
||||
if not File.exist?("Ardour3.app/Contents/Resources/etc") then
|
||||
Dir.mkdir "Ardour3.app/Contents/Resources/etc"
|
||||
end
|
||||
|
||||
if not File.exist?("Ardour2.app/Contents/Resources/etc/ardour2") then
|
||||
Dir.mkdir "Ardour2.app/Contents/Resources/etc/ardour2"
|
||||
if not File.exist?("Ardour3.app/Contents/Resources/etc/ardour3") then
|
||||
Dir.mkdir "Ardour3.app/Contents/Resources/etc/ardour3"
|
||||
end
|
||||
`cp ../../gtk2_ardour/ardour.bindings ../../gtk2_ardour/ardour.colors ../../gtk2_ardour/ardour.menus Ardour2.app/Contents/Resources/etc/ardour2/`
|
||||
`cp ../../ardour.rc ../../ardour_system.rc Ardour2.app/Contents/Resources/etc/ardour2/`
|
||||
`cp ardour2_mac_ui.rc Ardour2.app/Contents/Resources/etc/ardour2/ardour2_ui.rc`
|
||||
`cp ../../gtk2_ardour/ardour.bindings ../../gtk2_ardour/ardour.colors ../../gtk2_ardour/ardour.menus Ardour3.app/Contents/Resources/etc/ardour3/`
|
||||
`cp ../../ardour.rc ../../ardour_system.rc Ardour3.app/Contents/Resources/etc/ardour3/`
|
||||
`cp ardour3_mac_ui.rc Ardour3.app/Contents/Resources/etc/ardour3/ardour3_ui.rc`
|
||||
|
||||
# copy other etc stuff
|
||||
if not File.exist?("Ardour2.app/Contents/Resources/etc/gtk-2.0") then
|
||||
`cp -R etc/gtk-2.0 Ardour2.app/Contents/Resources/etc/`
|
||||
if not File.exist?("Ardour3.app/Contents/Resources/etc/gtk-2.0") then
|
||||
`cp -R etc/gtk-2.0 Ardour3.app/Contents/Resources/etc/`
|
||||
end
|
||||
if not File.exist?("Ardour2.app/Contents/Resources/etc/pango") then
|
||||
`cp -R etc/pango Ardour2.app/Contents/Resources/etc/`
|
||||
if not File.exist?("Ardour3.app/Contents/Resources/etc/pango") then
|
||||
`cp -R etc/pango Ardour3.app/Contents/Resources/etc/`
|
||||
end
|
||||
if not File.exist?("Ardour2.app/Contents/Resources/etc/fonts") then
|
||||
`cp -R /opt/local/etc/fonts Ardour2.app/Contents/Resources/etc/`
|
||||
if not File.exist?("Ardour3.app/Contents/Resources/etc/fonts") then
|
||||
`cp -R /opt/local/etc/fonts Ardour3.app/Contents/Resources/etc/`
|
||||
end
|
||||
|
||||
if not File.exist?("Ardour2.app/Contents/Resources/etc/profile.d") then
|
||||
`cp -R etc/profile.d Ardour2.app/Contents/Resources/etc/`
|
||||
if not File.exist?("Ardour3.app/Contents/Resources/etc/profile.d") then
|
||||
`cp -R etc/profile.d Ardour3.app/Contents/Resources/etc/`
|
||||
end
|
||||
|
||||
# share stuff
|
||||
|
||||
if not File.exist?("Ardour2.app/Contents/Resources/share") then
|
||||
Dir.mkdir "Ardour2.app/Contents/Resources/share"
|
||||
if not File.exist?("Ardour3.app/Contents/Resources/share") then
|
||||
Dir.mkdir "Ardour3.app/Contents/Resources/share"
|
||||
end
|
||||
|
||||
if not File.exist?("Ardour2.app/Contents/Resources/share/ardour2") then
|
||||
Dir.mkdir "Ardour2.app/Contents/Resources/share/ardour2"
|
||||
Dir.mkdir "Ardour2.app/Contents/Resources/share/ardour2/templates"
|
||||
`cp -R ../../gtk2_ardour/icons ../../gtk2_ardour/pixmaps ../../gtk2_ardour/splash.png Ardour2.app/Contents/Resources/share/ardour2/`
|
||||
`cp ../../templates/*.template Ardour2.app/Contents/Resources/share/ardour2/templates/`
|
||||
if not File.exist?("Ardour3.app/Contents/Resources/share/ardour3") then
|
||||
Dir.mkdir "Ardour3.app/Contents/Resources/share/ardour3"
|
||||
Dir.mkdir "Ardour3.app/Contents/Resources/share/ardour3/templates"
|
||||
`cp -R ../../gtk2_ardour/icons ../../gtk2_ardour/pixmaps ../../gtk2_ardour/splash.png Ardour3.app/Contents/Resources/share/ardour3/`
|
||||
`cp ../../templates/*.template Ardour3.app/Contents/Resources/share/ardour3/templates/`
|
||||
end
|
||||
|
||||
# go through and recursively remove any .svn dirs in the bundle
|
||||
svndirs = `find Ardour2.app -name .svn -type dir`.split("\n")
|
||||
svndirs = `find Ardour3.app -name .svn -type dir`.split("\n")
|
||||
svndirs.each do |svndir|
|
||||
`rm -rf #{svndir}`
|
||||
end
|
||||
|
|
@ -248,7 +248,7 @@ if File.exist?(ppc_libdir) and File.exist?(i386_libdir) then
|
|||
# make DMG
|
||||
`rm -rf macdist`
|
||||
Dir.mkdir("macdist")
|
||||
`cp -r README.rtf COPYING Ardour2.app macdist/`
|
||||
`cp -r README.rtf COPYING Ardour3.app macdist/`
|
||||
dmgname = "Ardour-#{version}"
|
||||
`rm -f #{dmgname}.dmg`
|
||||
$stdout.print("\nCreating DMG\n")
|
||||
|
|
|
|||
|
|
@ -18,11 +18,11 @@ export "GS_LIB=$TOP/share/ghostscript/8.51/lib:$TOP/share/ghostscript/fonts"
|
|||
export LANG=`grep '\b'\`defaults read .GlobalPreferences AppleCollationOrder\`_\
|
||||
/usr/share/locale/locale.alias | sed -n 's/.*\(.._..\)\..*/\1/p;1q'`
|
||||
|
||||
export ARDOUR2_UI_RC=ardour2_ui.rc
|
||||
export ARDOUR3_UI_RC=ardour3_ui.rc
|
||||
export ARDOUR_CONFIG_PATH="$TOP/etc"
|
||||
export ARDOUR_MODULE_PATH="$TOP/lib/"
|
||||
export ARDOUR_DATA_PATH="$TOP/share"
|
||||
export ARDOUR_GLADE_PATH="$TOP/share/ardour2/glade"
|
||||
export ARDOUR_GLADE_PATH="$TOP/share/ardour3/glade"
|
||||
|
||||
export ARDOUR_PATH="$TOP/share/ardour/icons:$TOP/share/ardour/pixmaps"
|
||||
|
||||
|
|
@ -41,6 +41,6 @@ sed 's|${CWD}|'"$TOP|g" "$TOP/etc/gtk-2.0/gdk-pixbuf.loaders" \
|
|||
> "$ETC/gdk-pixbuf.loaders"
|
||||
|
||||
# to prevent complaining
|
||||
mkdir -p "$HOME/.ardour2/templates"
|
||||
mkdir -p "$HOME/.ardour3/templates"
|
||||
|
||||
exec "$CWD/ardour" "$@"
|
||||
|
|
|
|||
|
|
@ -4,12 +4,12 @@
|
|||
|
||||
if [ ! -x /Applications/Utilities/X11.app ] ; then
|
||||
if [ -f /usr/include/X11/X.h ] ; then
|
||||
osascript -e 'tell application "Ardour2"
|
||||
osascript -e 'tell application "Ardour3"
|
||||
display dialog "You have installed the X11 SDK, but not X11 itself.\
|
||||
Please install X11 before running Ardour" buttons["OK"]
|
||||
end tell'
|
||||
else
|
||||
osascript -e 'tell application "Ardour2"
|
||||
osascript -e 'tell application "Ardour3"
|
||||
display dialog "Please install X11 before running Ardour" buttons["OK"]
|
||||
end tell'
|
||||
fi
|
||||
|
|
@ -17,7 +17,7 @@ end tell'
|
|||
fi
|
||||
|
||||
if [ ! -x /usr/local/bin/jackd -a ! -x /usr/bin/jackd ] ; then
|
||||
osascript -e 'tell application "Ardour2"
|
||||
osascript -e 'tell application "Ardour3"
|
||||
display dialog "You do not appear to have JACK installed.\nPlease install it before running Ardour" buttons["OK"]
|
||||
end tell'
|
||||
exit 1
|
||||
|
|
|
|||
|
|
@ -21,4 +21,4 @@ fi
|
|||
# in folders likes /home/user/Frank's Wild Years
|
||||
|
||||
CWD="`/usr/bin/dirname \"$0\"`"
|
||||
exec "$CWD/Ardour2.bin" "$*"
|
||||
exec "$CWD/Ardour3.bin" "$*"
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
#!/bin/sh
|
||||
export ARDOUR_PATH=../gtk2_ardour/icons:../gtk2_ardour/pixmaps:../gtk2_ardour
|
||||
export LD_LIBRARY_PATH=../gtk2_ardour:../libs/surfaces/control_protocol:../libs/ardour:../libs/midi++2:../libs/pbd:../libs/soundtouch:../libs/gtkmm2ext:../libs/sigc++2:../libs/glibmm2:../libs/gtkmm2/atk:../libs/gtkmm2/pango:../libs/gtkmm2/gdk:../libs/gtkmm2/gtk:../libs/libgnomecanvasmm:../libs/libsndfile:../libs/appleutility:../libs/rubberband:../libs/vamp-sdk:$LD_LIBRARY_PATH
|
||||
export GTK_PATH=$PWD/../libs/clearlooks:~/.ardour2
|
||||
export GTK_PATH=$PWD/../libs/clearlooks:~/.ardour3
|
||||
exec wine ./ardour_vst.exe.so "$@"
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
# but somehow scons puts leading /'s on INSTALL_PREFIX and that causes
|
||||
# wine to be unable to find the .exe.so file
|
||||
|
||||
export GTK_PATH=%PREFIX%/lib/ardour2:$GTK_PATH
|
||||
export GTK_PATH=%PREFIX%/lib/ardour3:$GTK_PATH
|
||||
|
||||
LD_LIBRARY_PATH=%PREFIX%/lib/ardour2:$LD_LIBRARY_PATH exec wine %PREFIX%/lib/ardour2/ardour_vst.exe.so "$@"
|
||||
LD_LIBRARY_PATH=%PREFIX%/lib/ardour3:$LD_LIBRARY_PATH exec wine %PREFIX%/lib/ardour3/ardour_vst.exe.so "$@"
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user