Merge branch 'ardour'

libs/pbd/file_utils.cc

@@ -82,14 +82,15 @@ run_functor_for_paths (vector<string>& result,
                        bool recurse)
 {
 	for (vector<string>::const_iterator i = paths.begin(); i != paths.end(); ++i) {
-		string expanded_path = path_expand (*i);
-		DEBUG_TRACE (DEBUG::FileUtils,
-				string_compose("Find files in expanded path: %1\n", expanded_path));
-
-		if (!Glib::file_test (expanded_path, Glib::FILE_TEST_IS_DIR)) continue;
-
 		try
 		{
+			string expanded_path = path_expand (*i);
+
+			DEBUG_TRACE (DEBUG::FileUtils,
+					string_compose("Find files in expanded path: %1\n", expanded_path));
+
+			if (!Glib::file_test (expanded_path, Glib::FILE_TEST_IS_DIR)) continue;
+
 			Glib::Dir dir(expanded_path);
 
 			for (Glib::DirIterator di = dir.begin(); di != dir.end(); di++) {
@@ -137,10 +138,18 @@ run_functor_for_paths (vector<string>& result,
 			}
 		}
 		catch (Glib::FileError const& err) {
+#ifndef NDEBUG
 			warning << string_compose (_("Cannot access file: %1"), err.what()) << endmsg;
+#endif
 		}
 		catch (Glib::ConvertError const& err) {
+#ifndef NDEBUG
 			warning << string_compose (_("Could not convert filename: %1"), err.what()) << endmsg;
+#endif
+		} catch (...) {
+#ifndef NDEBUG
+			warning << string_compose (_("Could not convert filename: '%1'"), *i) << endmsg;
+#endif
 		}
 	}
 }

tools/linux_packaging/build

@@ -656,6 +656,10 @@ cp $BUILD_ROOT/gtk2_ardour/ardour.menus $Etc
 cp $BUILD_ROOT/gtk2_ardour/clearlooks.rc $Etc
 cp $BUILD_ROOT/gtk2_ardour/default_ui_config $Etc
 
+if test -n "$LIVETRAX"; then
+	cp $BUILD_ROOT/gtk2_ardour/livetrax.keys $Resources
+fi
+
 # Copied directly from source tree
 
 mkdir ${Shared}/icons

tools/osx_packaging/osx_build

@@ -515,6 +515,10 @@ cp $BUILD_ROOT/gtk2_ardour/ardour.menus $Resources
 cp $BUILD_ROOT/gtk2_ardour/default_ui_config $Resources
 cp $BUILD_ROOT/gtk2_ardour/clearlooks.rc $Resources
 
+if test -n "$LIVETRAX"; then
+	cp $BUILD_ROOT/gtk2_ardour/livetrax.keys $Resources
+fi
+
 # Copied directly from source tree
 
 mkdir ${Resources}/icons