sascha/wsltty
1
0
Fork 0
mirror of https://github.com/mintty/wsltty.git synced 2025-01-18 12:05:47 +00:00
Code Issues Releases Wiki Activity

3.1.0.3; fix wsl invocation from cygwin32

Browse Source
This commit is contained in:
mintty 2020-02-15 13:44:53 +01:00
parent 67b1596fd2
commit 6397307878
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
3.1.0.2 3.1.0.3

10
makefile
View File

@ -8,10 +8,10 @@
# wsltty release # wsltty release
ver=3.1.0.2 ver=3.1.0.3
# wsltty appx release - must have 4 parts! # wsltty appx release - must have 4 parts!
verx=3.1.0.2 verx=3.1.0.3
# mintty release version # mintty release version
minttyver=3.1.0 minttyver=3.1.0
@ -117,14 +117,16 @@ wslbridge-frontend: wslbridge-source
# build backend on a musl-libc-based distribution # build backend on a musl-libc-based distribution
BuildDistr=Alpine BuildDistr=Alpine
windir=$(shell cd "${WINDIR}"; pwd)
wslbridge-backend: wslbridge-source wslbridge-backend: wslbridge-source
echo ------------- Compiling wslbridge2 backend echo ------------- Compiling wslbridge2 backend
#uname -m | grep x86_64 #uname -m | grep x86_64
mkdir -p bin mkdir -p bin
# provide dependencies for backend build # provide dependencies for backend build
PATH="${WINDIR}/Sysnative:${PATH}" cmd /C wsl.exe -u root -d $(BuildDistr) $(shell env | grep http_proxy=) apk add make g++ linux-headers < /dev/null PATH="$(windir)/Sysnative:${PATH}" cmd /C wsl.exe -u root -d $(BuildDistr) $(shell env | grep http_proxy=) apk add make g++ linux-headers < /dev/null
# invoke backend build # invoke backend build
cd wslbridge2-$(wslbridgever)/src; PATH="${WINDIR}/Sysnative:${PATH}" cmd /C wsl.exe -d $(BuildDistr) make -f Makefile.backend RELEASE=1 < /dev/null cd wslbridge2-$(wslbridgever)/src; PATH="$(windir)/Sysnative:${PATH}" cmd /C wsl.exe -d $(BuildDistr) make -f Makefile.backend RELEASE=1 < /dev/null
# extract binaries # extract binaries
cp wslbridge2-$(wslbridgever)/bin/wslbridge2-backend bin/ cp wslbridge2-$(wslbridgever)/bin/wslbridge2-backend bin/