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

#434 fixed, properly including Ruby gems and providing NumPy+SciPy with Python installation (this not in git but happens through the build process)

This commit is contained in:
Matthias Köfferlein 2019-12-01 23:55:53 +01:00
parent 20976d7521
commit 446b2f15b0
1 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
scripts/deploy-win-mingw.sh
View File

@ -147,6 +147,8 @@ done
# ---------------------------------------------------------- # ----------------------------------------------------------
# Ruby dependencies # Ruby dependencies
rubys=$($ruby -e 'puts $:' | sort)
rm -rf $target/.ruby-paths.txt rm -rf $target/.ruby-paths.txt
echo '# Builds the Ruby paths.' >$target/.ruby-paths.txt echo '# Builds the Ruby paths.' >$target/.ruby-paths.txt
echo '# KLayout will load the paths listed in this file into $0' >>$target/.ruby-paths.txt echo '# KLayout will load the paths listed in this file into $0' >>$target/.ruby-paths.txt
@ -154,16 +156,17 @@ echo '# Use KLayout EXPRESSIONS syntax to specify a list of file paths.' >>$targ
echo '[' >>$target/.ruby-paths.txt echo '[' >>$target/.ruby-paths.txt
first=1 first=1
rubys=$($ruby -e 'puts $:' | sort)
for p in $rubys; do for p in $rubys; do
p=$(cygpath $p) p=$(cygpath $p)
if [[ $p == "$mingw_inst"* ]] && [ -e "$p" ]; then if [[ $p == "$mingw_inst"* ]] && [ -e "$p" ]; then
rp=${p/"$mingw_inst/"} rp=${p/"$mingw_inst/"}
if [ $first == "0" ]; then # Apparently adding the paths to the interpreter isn't required -
echo "," >>$target/.ruby-paths.txt # Ruby can figure out it's own paths
fi # if [ $first == "0" ]; then
first=0 # echo "," >>$target/.ruby-paths.txt
echo -n " combine(inst_path, '$rp')" >>$target/.ruby-paths.txt # fi
# first=0
# echo -n " combine(inst_path, '$rp')" >>$target/.ruby-paths.txt
echo "Copying Ruby installation partial $p -> $target/$rp .." echo "Copying Ruby installation partial $p -> $target/$rp .."
rm -rf $target/$rp rm -rf $target/$rp
mkdir -p $target/$rp mkdir -p $target/$rp
@ -176,9 +179,24 @@ done
echo '' >>$target/.ruby-paths.txt echo '' >>$target/.ruby-paths.txt
echo ']' >>$target/.ruby-paths.txt echo ']' >>$target/.ruby-paths.txt
# don't forget the gem directory (specifications and gems)
p=$(ruby -e 'puts Gem::dir')
p=$(cygpath $p)
if [[ $p == "$mingw_inst"* ]] && [ -e "$p" ]; then
rp=${p/"$mingw_inst/"}
echo "Copying Ruby gems $p -> $target/$rp .."
rm -rf $target/$rp
mkdir -p $target/$rp
rmdir $target/$rp
cp -vR $p $target/$rp | sed -u 's/.*/echo -n ./' | sh
echo ""
fi
# ---------------------------------------------------------- # ----------------------------------------------------------
# Python dependencies # Python dependencies
pythons=$($python -c "import sys; print('\n'.join(sys.path))" | sort)
rm -rf $target/.python-paths.txt rm -rf $target/.python-paths.txt
echo '# Builds the Python paths.' >$target/.python-paths.txt echo '# Builds the Python paths.' >$target/.python-paths.txt
echo '# KLayout will load the paths listed in this file into sys.path' >>$target/.python-paths.txt echo '# KLayout will load the paths listed in this file into sys.path' >>$target/.python-paths.txt
@ -187,7 +205,6 @@ echo '# Use KLayout EXPRESSIONS syntax to specify a list of file paths.' >>$targ
echo '[' >>$target/.python-paths.txt echo '[' >>$target/.python-paths.txt
first=1 first=1
pythons=$($python -c "import sys; print('\n'.join(sys.path))" | sort)
for p in $pythons; do for p in $pythons; do
p=$(cygpath $p) p=$(cygpath $p)
rp="" rp=""