GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-07-31 21:41:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

just used completely different processing if WXDIR is used.

Browse Source
This commit is contained in:
Joseph Lenox 2017-04-02 14:37:04 -05:00
parent 6bbf56641e
commit c77c524c07
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
package/linux/make_archive.sh
View File

@ -10,12 +10,7 @@ if [ "$#" -ne 1 ]; then
echo "Usage: $(basename $0) arch_name" echo "Usage: $(basename $0) arch_name"
exit 1; exit 1;
fi fi
if [ -z ${WXDIR+x} ]; then libdirs=$(find ./local-lib -iname *.so -exec dirname {} \; | sort -u | paste -sd ";" -)
libdirs=$(find ./local-lib -iname *.so -exec dirname {} \; | sort -u | paste -sd ";" -)
else
echo "WXDIR => $WXDIR"
libdirs=$(find {$WXDIR,./local-lib} -iname *.so -exec dirname {} \; | sort -u | paste -sd ";" -)
fi
WD=./$(dirname $0) WD=./$(dirname $0)
source $(dirname $0)/../common/util.sh source $(dirname $0)/../common/util.sh
# Determine if this is a tagged (release) commit. # Determine if this is a tagged (release) commit.
@ -74,13 +69,20 @@ cp -fRP $SLIC3R_DIR/local-lib $archivefolder/local-lib
cp -fRP $SLIC3R_DIR/lib/* $archivefolder/local-lib/lib/perl5/ cp -fRP $SLIC3R_DIR/lib/* $archivefolder/local-lib/lib/perl5/
mkdir $archivefolder/bin mkdir $archivefolder/bin
echo "Symlinking libraries to $archivefolder/bin ..." echo "Installing libraries to $archivefolder/bin ..."
for bundle in $(find $archivefolder/local-lib/lib/perl5 -name '*.so' | grep "Wx") $(find $archivefolder/local-lib/lib/perl5 -name '*.so' -type f | grep "wxWidgets"); do if [ -z ${WXDIR+x} ]; then
echo "$(LD_LIBRARY_PATH=$libdirs ldd $bundle | grep .so | grep local-lib | awk '{print $3}')" for bundle in $(find $archivefolder/local-lib/lib/perl5 -name '*.so' | grep "Wx") $(find $archivefolder/local-lib/lib/perl5 -name '*.so' -type f | grep "wxWidgets"); do
for dylib in $(LD_LIBRARY_PATH=$libdirs ldd $bundle | grep .so | grep local-lib | awk '{print $3}'); do echo "$(LD_LIBRARY_PATH=$libdirs ldd $bundle | grep .so | grep local-lib | awk '{print $3}')"
for dylib in $(LD_LIBRARY_PATH=$libdirs ldd $bundle | grep .so | grep local-lib | awk '{print $3}'); do
install -v $dylib $archivefolder/bin
done
done
else
echo "Copying libraries from $WXDIR/lib to $archivefolder/bin"
for dylib in $(find $WXDIR/lib -type f | grep "so"); do
install -v $dylib $archivefolder/bin install -v $dylib $archivefolder/bin
done done
done fi
echo "Copying startup script..." echo "Copying startup script..."
cp -f $WD/startup_script.sh $archivefolder/$appname cp -f $WD/startup_script.sh $archivefolder/$appname