Fixed deployment script (DLL dependency computation).

This commit is contained in:
klayoutmatthias 2017-08-07 01:57:07 +02:00
parent ea5b9a8ba6
commit 742e2084af
1 changed files with 16 additions and 13 deletions

View File

@ -94,14 +94,10 @@ if ! [ -e $target/klayout.exe ]; then
fi
# ----------------------------------------------------------
# Binary dependencies
# Image formats
libs=$(ldd $target/klayout.exe | grep $mingw_inst | sed 's/ *=>.*//' | sort)
for l in $libs; do
echo "Copying binary installation partial $mingw_inst/$l -> $target/$l .."
cp $mingw_inst/bin/$l $target/$l
done
echo "Installing image format plugins .."
cp -R $mingw_inst/share/qt5/plugins/imageformats $target
# ----------------------------------------------------------
# Ruby dependencies
@ -136,12 +132,6 @@ done
echo '' >>$target/.ruby-paths.txt
echo ']' >>$target/.ruby-paths.txt
# ----------------------------------------------------------
# Image formats
echo "Installing image format plugins .."
cp -R $mingw_inst/share/qt5/plugins/imageformats $target
# ----------------------------------------------------------
# Python dependencies
@ -175,6 +165,19 @@ done
echo '' >>$target/.python-paths.txt
echo ']' >>$target/.python-paths.txt
# ----------------------------------------------------------
# Binary dependencies
# Analyze the dependencies of our components and add the corresponding libraries from $mingw_inst/bin
libs=$(find $target \( -name "*.dll" -or -name "*.so" \) -exec objdump -p "{}" ";" | grep "DLL Name:" | sort -u | sed 's/.*DLL Name: *//')
for l in $libs; do
if [ -e $mingw_inst/bin/$l ]; then
echo "Copying binary installation partial $mingw_inst/bin/$l -> $target/$l .."
cp $mingw_inst/bin/$l $target/$l
fi
done
# ----------------------------------------------------------
# Run NSIS