luke
/
klayout
mirror of https://github.com/KLayout/klayout.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Generalization of the ucrt build script

This commit is contained in:
Matthias Koefferlein 2023-12-17 22:03:02 +01:00
parent 2c59d4190f
commit 6127dd1dd6
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
scripts/deploy-win-ucrt64.sh
View File

@ -26,7 +26,6 @@ fi
pwd=$(pwd) pwd=$(pwd)
enable64bit=1
args="" args=""
suffix="" suffix=""
@ -42,7 +41,7 @@ while [ "$1" != "" ]; do
echo "Options:" echo "Options:"
echo " -s <suffix> Binary suffix" echo " -s <suffix> Binary suffix"
echo "" echo ""
echo "By default, both 32 and 64 bit builds are performed" echo "Only 64 bit builds are performed."
exit 0 exit 0
elif [ "$1" = "-s" ]; then elif [ "$1" = "-s" ]; then
shift shift
@ -67,9 +66,7 @@ if [ "$KLAYOUT_BUILD_IN_PROGRESS" == "" ]; then
# Run ourself in UCRT64 system for the win64 build # Run ourself in UCRT64 system for the win64 build
if [ "$enable64bit" != "0" ]; then MSYSTEM=UCRT64 bash --login -c "cd $pwd ; $self"
MSYSTEM=UCRT64 bash --login -c "cd $pwd ; $self"
fi
exit 0 exit 0
@ -79,9 +76,20 @@ fi
# Actual build branch # Actual build branch
if [ "$MSYSTEM" == "UCRT64" ]; then if [ "$MSYSTEM" == "UCRT64" ]; then
arch=win64-ucrt arch=win64-ucrt
ucrt_inst=/ucrt64 ucrt_inst=/ucrt64
ucrt_vssdk="C:/Program Files (x86)/Windows Kits/10/Redist/10.0.22621.0/ucrt/DLLs/x64"
shopt -s nullglob
ucrt_vssdk=(/c/Program\ Files\ \(x86\)/Windows\ Kits/10/Redist/10.0.*)
shopt -u nullglob
ucrt_vssdk=${ucrt_vssdk[0]}
if [ "$ucrt_vssdk" = "" ]; then
echo "ERROR: ucrt64 DLLs not found"
exit 1
fi
ucrt_vssdk=$(cygpath -w "${a[0]}")
else else
echo "ERROR: not in ucrt64 system." echo "ERROR: not in ucrt64 system."
fi fi
@ -105,6 +113,8 @@ echo " version = $KLAYOUT_VERSION"
echo " build args = $KLAYOUT_BUILD_ARGS" echo " build args = $KLAYOUT_BUILD_ARGS"
echo " suffix = $KLAYOUT_BUILD_SUFFIX" echo " suffix = $KLAYOUT_BUILD_SUFFIX"
echo "" echo ""
echo " UCRT libs = $ucrt_vssdk"
echo ""
rm -rf $target rm -rf $target
./build.sh -python $python -ruby $ruby -bin $target -build $build -j2$KLAYOUT_BUILD_ARGS ./build.sh -python $python -ruby $ruby -bin $target -build $build -j2$KLAYOUT_BUILD_ARGS