diff options
| author | Tim Mayberry <mojofunk@gmail.com> | 2014-05-22 21:02:08 +1000 |
|---|---|---|
| committer | Tim Mayberry <mojofunk@gmail.com> | 2014-06-07 13:49:12 +1000 |
| commit | 35c8f5bab4477fda97ee00b1577fb4e61faba072 (patch) | |
| tree | ad62fe6aa8d64eddedb993a4e7cd4aed6e620298 /tools | |
| parent | 44ac7859c5fdf315d7ba4d76cb804b82aace5c3a (diff) | |
Only copy necessary config files to package directory
Also use -L flag so files are actually copied and not linked
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/windows_packaging/copydll-fedora.sh | 1 | ||||
| -rwxr-xr-x | tools/windows_packaging/package.sh | 14 |
2 files changed, 8 insertions, 7 deletions
diff --git a/tools/windows_packaging/copydll-fedora.sh b/tools/windows_packaging/copydll-fedora.sh index dcfbc41ac6..8ba3c0fb5c 100755 --- a/tools/windows_packaging/copydll-fedora.sh +++ b/tools/windows_packaging/copydll-fedora.sh @@ -2,7 +2,6 @@ function copydll () { if [ -f $MINGW_ROOT/bin/$1 ] ; then - echo "cp $MINGW_ROOT/bin/$1 $2" cp $MINGW_ROOT/bin/$1 $2 || return 1 return 0 fi diff --git a/tools/windows_packaging/package.sh b/tools/windows_packaging/package.sh index c6ad13c42b..6a8b394aaf 100755 --- a/tools/windows_packaging/package.sh +++ b/tools/windows_packaging/package.sh @@ -47,12 +47,14 @@ if test x$WITH_TESTS != x ; then cp -r $BASE/libs/ardour/test/data $PACKAGE_DIR/ardour_testdata fi -echo "Copying mingw config files to $PACKAGE_DIR ..." -# just copy it all for now -cp -r $MINGW_ROOT/etc $PACKAGE_DIR - -cp -r $MINGW_ROOT/lib/gtk-2.0 $PACKAGE_DIR/lib -cp -r $MINGW_ROOT/lib/gdk-pixbuf-2.0 $PACKAGE_DIR/lib +echo "Copying config files to $PACKAGE_DIR ..." +mkdir -p $PACKAGE_DIR/etc +cp -RL $MINGW_ROOT/etc/fonts $PACKAGE_DIR/etc +cp -RL $MINGW_ROOT/etc/gtk-2.0 $PACKAGE_DIR/etc +cp -RL $MINGW_ROOT/etc/pango $PACKAGE_DIR/etc + +cp -R $MINGW_ROOT/lib/gtk-2.0 $PACKAGE_DIR/lib +cp -R $MINGW_ROOT/lib/gdk-pixbuf-2.0 $PACKAGE_DIR/lib cp $TOOLS_DIR/loaders.cache $PACKAGE_DIR/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache if test x$WITH_PANGO_1_6 != x; then |