diff options
| author | Robin Gareus <robin@gareus.org> | 2017-02-23 16:23:10 +0100 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2017-02-23 16:26:17 +0100 |
| commit | ac40945ff96f27606ff5d3600cf06b0ba663a5e1 (patch) | |
| tree | eb3d216c11f1254f0baf592192ff1e1242120bae /tools | |
| parent | f484e8a92301cb4874c27c8c15d2998002086f31 (diff) | |
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.
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/linux_packaging/build | 2 | ||||
| -rwxr-xr-x | tools/osx_packaging/osx_build | 2 | ||||
| -rwxr-xr-x | tools/x-win/package.sh | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build index ede766e495..15d7096f2c 100755 --- 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 e7b9638ad9..d6b1896617 100755 --- 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 9ea072e585..7830f06a68 100755 --- 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/ |