summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ardour.dox2
-rw-r--r--gtk2_ardour/SConscript48
-rw-r--r--gtk2_ardour/ardev_common.sh.in4
-rw-r--r--gtk2_ardour/ardour3.desktop.in (renamed from gtk2_ardour/ardour2.desktop.in)6
-rw-r--r--gtk2_ardour/ardour3.xml (renamed from gtk2_ardour/ardour2.xml)2
-rw-r--r--gtk2_ardour/theme_manager.cc2
-rw-r--r--libs/ardour/macosx/ardour.xcodeproj/project.pbxproj4
-rw-r--r--libs/ardour/source.cc4
-rw-r--r--libs/clearlooks-newer/SConscript2
-rw-r--r--libs/clearlooks-older/SConscript2
-rw-r--r--libs/surfaces/mackie/README4
-rw-r--r--libs/surfaces/mackie/SConscript2
-rw-r--r--libs/surfaces/wiimote/SConscript2
-rw-r--r--manual/xml/basic_recording.xml2
-rw-r--r--manual/xml/entities.ent.in2
-rw-r--r--manual/xml/key_bindings.xml2
-rw-r--r--manual/xml/mackie.xml4
-rwxr-xr-xtools/osx_packaging/app_build.rb58
-rwxr-xr-xtools/osx_packaging/bin/exporter6
-rwxr-xr-xtools/osx_packaging/script6
-rw-r--r--tools/osx_packaging/startup_script2
-rwxr-xr-xvst/ardevst2
-rw-r--r--vst/ardourvst.in4
23 files changed, 87 insertions, 85 deletions
diff --git a/ardour.dox b/ardour.dox
index 6b4f419a9e..b22768cee9 100644
--- a/ardour.dox
+++ b/ardour.dox
@@ -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
diff --git a/gtk2_ardour/SConscript b/gtk2_ardour/SConscript
index a97b45dc54..2667cfa5a5 100644
--- a/gtk2_ardour/SConscript
+++ b/gtk2_ardour/SConscript
@@ -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 +
diff --git a/gtk2_ardour/ardev_common.sh.in b/gtk2_ardour/ardev_common.sh.in
index b1281354ba..6b870fb4e2 100644
--- a/gtk2_ardour/ardev_common.sh.in
+++ b/gtk2_ardour/ardev_common.sh.in
@@ -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
diff --git a/gtk2_ardour/ardour2.desktop.in b/gtk2_ardour/ardour3.desktop.in
index b5911e89b4..d32cb1d153 100644
--- a/gtk2_ardour/ardour2.desktop.in
+++ b/gtk2_ardour/ardour3.desktop.in
@@ -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;
diff --git a/gtk2_ardour/ardour2.xml b/gtk2_ardour/ardour3.xml
index dd1c46ecf2..4b101c621b 100644
--- a/gtk2_ardour/ardour2.xml
+++ b/gtk2_ardour/ardour3.xml
@@ -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"/>
diff --git a/gtk2_ardour/theme_manager.cc b/gtk2_ardour/theme_manager.cc
index c1b3a853d1..0d13200513 100644
--- a/gtk2_ardour/theme_manager.cc
+++ b/gtk2_ardour/theme_manager.cc
@@ -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();
diff --git a/libs/ardour/macosx/ardour.xcodeproj/project.pbxproj b/libs/ardour/macosx/ardour.xcodeproj/project.pbxproj
index 4026b65f59..8786691730 100644
--- a/libs/ardour/macosx/ardour.xcodeproj/project.pbxproj
+++ b/libs/ardour/macosx/ardour.xcodeproj/project.pbxproj
@@ -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 = "";
diff --git a/libs/ardour/source.cc b/libs/ardour/source.cc
index a0ee2ac706..12a5e7c071 100644
--- a/libs/ardour/source.cc
+++ b/libs/ardour/source.cc
@@ -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
diff --git a/libs/clearlooks-newer/SConscript b/libs/clearlooks-newer/SConscript
index ca527c70da..6b71356dd2 100644
--- a/libs/clearlooks-newer/SConscript
+++ b/libs/clearlooks-newer/SConscript
@@ -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'],
diff --git a/libs/clearlooks-older/SConscript b/libs/clearlooks-older/SConscript
index 4feff6db90..dedf40f351 100644
--- a/libs/clearlooks-older/SConscript
+++ b/libs/clearlooks-older/SConscript
@@ -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'],
diff --git a/libs/surfaces/mackie/README b/libs/surfaces/mackie/README
index 5ed3a75fa5..5ffac15e5f 100644
--- a/libs/surfaces/mackie/README
+++ b/libs/surfaces/mackie/README
@@ -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
diff --git a/libs/surfaces/mackie/SConscript b/libs/surfaces/mackie/SConscript
index 96b37c2d6e..392fa2dcff 100644
--- a/libs/surfaces/mackie/SConscript
+++ b/libs/surfaces/mackie/SConscript
@@ -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' ] +
diff --git a/libs/surfaces/wiimote/SConscript b/libs/surfaces/wiimote/SConscript
index 8c8b3d4791..eee54f37e4 100644
--- a/libs/surfaces/wiimote/SConscript
+++ b/libs/surfaces/wiimote/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)
diff --git a/manual/xml/basic_recording.xml b/manual/xml/basic_recording.xml
index ba40c96ebc..e8deb17a17 100644
--- a/manual/xml/basic_recording.xml
+++ b/manual/xml/basic_recording.xml
@@ -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
diff --git a/manual/xml/entities.ent.in b/manual/xml/entities.ent.in
index 9d814bf0b2..7590a9b045 100644
--- a/manual/xml/entities.ent.in
+++ b/manual/xml/entities.ent.in
@@ -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">
diff --git a/manual/xml/key_bindings.xml b/manual/xml/key_bindings.xml
index 3aff10c6d4..4700c1164a 100644
--- a/manual/xml/key_bindings.xml
+++ b/manual/xml/key_bindings.xml
@@ -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" />
diff --git a/manual/xml/mackie.xml b/manual/xml/mackie.xml
index f04324b4c2..f8b7a64ba3 100644
--- a/manual/xml/mackie.xml
+++ b/manual/xml/mackie.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>
&lt;MIDI-port tag="mcu" device="/dev/snd/midiC2D0" type="alsa/raw" mode="duplex"/&gt;
@@ -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>
&lt;MIDI-port tag="mcu_xt_1" device="/dev/snd/midiC3D0" type="alsa/raw" mode="duplex"/&gt;
&lt;MIDI-port tag="mcu_xt_2" device="/dev/snd/midiC4D0" type="alsa/raw" mode="duplex"/&gt;
diff --git a/tools/osx_packaging/app_build.rb b/tools/osx_packaging/app_build.rb
index 83f07c08ae..a59cb6f688 100755
--- a/tools/osx_packaging/app_build.rb
+++ b/tools/osx_packaging/app_build.rb
@@ -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")
diff --git a/tools/osx_packaging/bin/exporter b/tools/osx_packaging/bin/exporter
index 0ac0370c82..d0bed83b27 100755
--- a/tools/osx_packaging/bin/exporter
+++ b/tools/osx_packaging/bin/exporter
@@ -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" "$@"
diff --git a/tools/osx_packaging/script b/tools/osx_packaging/script
index b003337418..4f927c2aa5 100755
--- a/tools/osx_packaging/script
+++ b/tools/osx_packaging/script
@@ -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
diff --git a/tools/osx_packaging/startup_script b/tools/osx_packaging/startup_script
index c7b9b5acf8..7482283521 100644
--- a/tools/osx_packaging/startup_script
+++ b/tools/osx_packaging/startup_script
@@ -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" "$*"
diff --git a/vst/ardevst b/vst/ardevst
index cc21cde05b..39d9bdface 100755
--- a/vst/ardevst
+++ b/vst/ardevst
@@ -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 "$@"
diff --git a/vst/ardourvst.in b/vst/ardourvst.in
index 2accc5cfb9..082be1c2fe 100644
--- a/vst/ardourvst.in
+++ b/vst/ardourvst.in
@@ -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 "$@"
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-28 23:46:06 +0000