Do not bundle default system_config (prefer built-in defaults)

Inside the bundle, those files are read-only, anyway.
This alleviates us from generating/updating the files with whenever
the built-in default changes and also makes architecture dependent
default-config (compile time #defines) work.

diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build
index ede766e495e4def51fde15988bc0c6a99c5a2a5a..15d7096f2c4fb3b13aa4c119421ab412fa6bd8d6 100755 (executable)
--- a/tools/linux_packaging/build
+++ b/tools/linux_packaging/build
@@ -620,8 +620,6 @@ cp $BUILD_ROOT/gtk2_ardour/default_ui_config $Etc
 
 mkdir ${Shared}/icons
 mkdir ${Shared}/resources
-cp ../../system_config $Etc/system_config
-cp ../../instant.xml $Shared/instant.xml
 cp ../../gtk2_ardour/icons/*.png ${Shared}/icons
 cp -r ../../gtk2_ardour/icons/cursor_* ${Shared}/icons/
 cp ../../gtk2_ardour/ArdourMono.ttf $Shared

diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build
index e7b9638ad92dd23143f657d2a4d3997c065e3054..d6b1896617eb701283a9a036f9e30840c44c0dfe 100755 (executable)
--- a/tools/osx_packaging/osx_build
+++ b/tools/osx_packaging/osx_build
@@ -472,8 +472,6 @@ cp $BUILD_ROOT/gtk2_ardour/clearlooks.rc $Resources
 
 mkdir ${Resources}/icons
 mkdir ${Resources}/resources
-cp ../../system_config $Resources/system_config
-cp ../../instant.xml $Resources/instant.xml
 cp ../../gtk2_ardour/icons/*.png ${Resources}/icons/
 cp -r ../../gtk2_ardour/icons/cursor_* ${Resources}/icons/
 cp ../../gtk2_ardour/ArdourMono.ttf $Shared

diff --git a/tools/x-win/package.sh b/tools/x-win/package.sh
index 9ea072e5857965d48adc720aefa9bb0a2a824c68..7830f06a6889f69b31f82187c985be1d78da565c 100755 (executable)
--- a/tools/x-win/package.sh
+++ b/tools/x-win/package.sh
@@ -192,6 +192,9 @@ cp COPYING $DESTDIR/share/
 cp gtk2_ardour/icons/${PRODUCT_ICON} $DESTDIR/share/
 cp gtk2_ardour/icons/ardour_bug.ico $DESTDIR/share/
 
+#prefer built-in defaults
+rm -f $DESTDIR/share/${LOWERCASE_DIRNAME}/system_config
+
 # replace default cursor with square version (sans hotspot file)
 cp gtk2_ardour/icons/cursor_square/* $DESTDIR/share/${LOWERCASE_DIRNAME}/icons/