зеркало из https://github.com/microsoft/AMBROSIA.git
Fix that OS test and make deleting dups faster on Windows
This commit is contained in:
Родитель
6cd14e8a97
Коммит
216a4460d1
|
@ -50,21 +50,22 @@ for dir in $secondary; do
|
|||
squish)
|
||||
echo -ne " Deleting dups: " ;;
|
||||
esac
|
||||
while read f; do
|
||||
echo -ne "."
|
||||
# Requires realpath from GNU coreutils:
|
||||
dirof=`dirname $f`
|
||||
relative=`realpath ../runtime/$f --relative-to=$dirof`
|
||||
# echo "ln -sf $relative $f"
|
||||
case $mode in
|
||||
symlink)
|
||||
ln -sf $relative $f ;;
|
||||
squish)
|
||||
rm -f $f ;;
|
||||
esac
|
||||
done < $dups
|
||||
echo
|
||||
|
||||
case $mode in
|
||||
squish)
|
||||
xargs rm -f < $dups
|
||||
;;
|
||||
symlink)
|
||||
while read f; do
|
||||
echo -ne "."
|
||||
# echo "ln -sf $relative $f"
|
||||
# Requires realpath from GNU coreutils:
|
||||
dirof=`dirname $f`
|
||||
relative=`realpath ../runtime/$f --relative-to=$dirof`
|
||||
ln -sf $relative $f
|
||||
done < $dups
|
||||
echo
|
||||
;;
|
||||
esac
|
||||
rm $diffs
|
||||
rm $dups
|
||||
done
|
||||
|
|
|
@ -78,7 +78,7 @@ buildit $OUTDIR/runtime Ambrosia/Ambrosia/Ambrosia.csproj
|
|||
buildit $OUTDIR/coord ImmortalCoordinator/ImmortalCoordinator.csproj
|
||||
buildit $OUTDIR/unsafedereg DevTools/UnsafeDeregisterInstance/UnsafeDeregisterInstance.csproj
|
||||
pushd $OUTDIR
|
||||
ln -s runtime/Ambrosia ambrosia
|
||||
ln -s runtime/Ambrosia Ambrosia
|
||||
ln -s coord/ImmortalCoordinator
|
||||
ln -s unsafedereg/UnsafeDeregisterInstance
|
||||
popd
|
||||
|
@ -118,10 +118,10 @@ fi
|
|||
# echo "----------------------------------------"
|
||||
# chmod -x ./bin/*.dll ./bin/*.so ./bin/*.dylib ./bin/*.a 2>/dev/null || echo
|
||||
|
||||
|
||||
echo
|
||||
echo "Deduplicating output produced by separate dotnet publish calls"
|
||||
echo "--------------------------------------------------------------"
|
||||
if [ "$OS" == "Windows_NT" ];
|
||||
if [ ${OS:-defined} ] && [ "$OS" == "Windows_NT" ];
|
||||
then ./Scripts/dedup_bindist.sh squish
|
||||
else ./Scripts/dedup_bindist.sh symlink
|
||||
fi
|
||||
|
|
Загрузка…
Ссылка в новой задаче