sascha/wsltty
1
0
Fork 0
mirror of https://github.com/mintty/wsltty.git synced 2025-02-23 13:28:27 +00:00
Code Issues Releases Wiki Activity

update to wslbridge2 release v0.5

Browse Source
This commit is contained in:
Thomas Wolff 2019-10-30 00:00:00 +01:00
parent 79d9ab6f70
commit 83a9c12fc6
5 changed files with 15 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@ -85,10 +85,10 @@ WSLtty can be invoked with
Starting the mintty terminal directly from the WSLtty installation location Starting the mintty terminal directly from the WSLtty installation location
is discouraged because that would bypass essential options. is discouraged because that would bypass essential options.
#### WSL 2 #### #### WSL V2 ####
The new wslbridge2 gateway provides two versions, for WSL V1 and V2 mode, respectively. Terminal communication with WSL via its modes V1 or V2 is handled
Mintty automatically detects the WSL version and invokes the proper gateway. automatically by wsltty (mintty and the wslbridge2 gateway).
--- ---

6
config-distros.sh
View File

@ -244,9 +244,9 @@ config () {
if $ok && [ -n "$distro" ] if $ok && [ -n "$distro" ]
then # fix #163: backend missing +x with certain mount options then # fix #163: backend missing +x with certain mount options
echo Setting +x wslbridge2 backends for distro "'$distro'" echo Setting +x wslbridge2 backends for distro "'$distro'"
(cd "$INSTDIR"; cd bin; wsl.exe -d "$distro" chmod +x wslbridge2-backend hvpty-backend) (cd "$INSTDIR"; cd bin; wsl.exe -d "$distro" chmod +x wslbridge2-backend)
# (cd "$LOCALAPPDATA/wsltty/bin"; wsl.exe -d "$distro" chmod +x wslbridge2-backend hvpty-backend) # (cd "$LOCALAPPDATA/wsltty/bin"; wsl.exe -d "$distro" chmod +x wslbridge2-backend)
# (cd ... ; "$SYSTEMROOT/System32/bash.exe" "$guid" -c chmod +x wslbridge2-backend hvpty-backend) # (cd ... ; "$SYSTEMROOT/System32/bash.exe" "$guid" -c chmod +x wslbridge2-backend)
fi fi
if $ok && $config if $ok && $config

4
install.bat
View File

@ -45,8 +45,6 @@ ren "%installdir%\bin\cygwin-console-helper.exe" cygwin-console-helper.exe.old
ren "%installdir%\bin\mintty.exe" mintty.exe.old ren "%installdir%\bin\mintty.exe" mintty.exe.old
ren "%installdir%\bin\wslbridge2.exe" wslbridge2.exe.old ren "%installdir%\bin\wslbridge2.exe" wslbridge2.exe.old
ren "%installdir%\bin\wslbridge2-backend" wslbridge2-backend.old ren "%installdir%\bin\wslbridge2-backend" wslbridge2-backend.old
ren "%installdir%\bin\hvpty.exe" hvpty.exe.old
ren "%installdir%\bin\hvpty-backend" hvpty-backend.old
del /Q "%installdir%\bin\*.old" del /Q "%installdir%\bin\*.old"
:instbin :instbin
@ -56,8 +54,6 @@ copy cygwin-console-helper.exe "%installdir%\bin"
copy mintty.exe "%installdir%\bin" copy mintty.exe "%installdir%\bin"
copy wslbridge2.exe "%installdir%\bin" copy wslbridge2.exe "%installdir%\bin"
copy wslbridge2-backend "%installdir%\bin" copy wslbridge2-backend "%installdir%\bin"
copy hvpty.exe "%installdir%\bin"
copy hvpty-backend "%installdir%\bin"
copy dash.exe "%installdir%\bin" copy dash.exe "%installdir%\bin"
copy regtool.exe "%installdir%\bin" copy regtool.exe "%installdir%\bin"

20
makefile
View File

@ -8,16 +8,16 @@
# wsltty release # wsltty release
ver=3.0.6 ver=3.0.7
# wsltty appx release - must have 4 parts! # wsltty appx release - must have 4 parts!
verx=3.0.6.0 verx=3.0.7.0
# mintty release version # mintty release version
minttyver=3.0.6 minttyver=3.0.7
# wslbridge release version # wslbridge2 release version
wslbridgever=0.4 wslbridgever=0.5
############################## ##############################
@ -103,12 +103,10 @@ wslbridge-source: wslbridge2-$(wslbridgever).zip
wslbridge-frontend: wslbridge-source wslbridge-frontend: wslbridge-source
echo ------------- Compiling wslbridge2 frontend echo ------------- Compiling wslbridge2 frontend
mkdir -p bin mkdir -p bin
rm -f bin/wslbridge2.exe bin/hvpty.exe
# frontend build # frontend build
cd wslbridge2-$(wslbridgever); make RELEASE=1 cd wslbridge2-$(wslbridgever)/src; make -f Makefile.frontend RELEASE=1
# extract binaries # extract binaries
cp wslbridge2-$(wslbridgever)/bin/wslbridge2.exe bin/ cp wslbridge2-$(wslbridgever)/bin/wslbridge2.exe bin/
cp wslbridge2-$(wslbridgever)/bin/hvpty.exe bin/
# build backend on a musl-libc-based distribution # build backend on a musl-libc-based distribution
BuildDistr=Alpine BuildDistr=Alpine
@ -117,14 +115,12 @@ 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
rm -f bin/wslbridge2-backend bin/hvpty-backend
# provide dependencies for backend build # provide dependencies for backend build
cmd /C wsl -d $(BuildDistr) apk add make g++ linux-headers cmd /C wsl -d $(BuildDistr) apk add make g++ linux-headers
# invoke backend build # invoke backend build
cd wslbridge2-$(wslbridgever); cmd /C wsl -d $(BuildDistr) make RELEASE=1 < /dev/null cd wslbridge2-$(wslbridgever)/src; cmd /C wsl -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/
cp wslbridge2-$(wslbridgever)/bin/hvpty-backend bin/
mintty-get: mintty-get:
$(wgeto) https://github.com/mintty/mintty/archive/$(minttyver).zip -o mintty-$(minttyver).zip $(wgeto) https://github.com/mintty/mintty/archive/$(minttyver).zip -o mintty-$(minttyver).zip
@ -212,8 +208,6 @@ cop: ver
cp charnames.txt rel/ cp charnames.txt rel/
cp bin/wslbridge2.exe rel/ cp bin/wslbridge2.exe rel/
cp bin/wslbridge2-backend rel/ cp bin/wslbridge2-backend rel/
cp bin/hvpty.exe rel/
cp bin/hvpty-backend rel/
cp mkshortcut.vbs rel/ cp mkshortcut.vbs rel/
#cp bin/mkshortcut.exe rel/ #cp bin/mkshortcut.exe rel/
#cp bin/cygpopt-0.dll rel/ #cp bin/cygpopt-0.dll rel/

8
makewinx.cfg
View File

@ -37,8 +37,8 @@ FILE1="cygwin-console-helper.exe"
FILE2="mintty.exe" FILE2="mintty.exe"
FILE3="wslbridge2.exe" FILE3="wslbridge2.exe"
FILE4="wslbridge2-backend" FILE4="wslbridge2-backend"
FILE5="hvpty.exe" FILE5="LICENSE.mintty"
FILE6="hvpty-backend" FILE6="LICENSE.wslbridge2"
FILE7="config-distros.sh" FILE7="config-distros.sh"
FILE8="configure WSL shortcuts.lnk" FILE8="configure WSL shortcuts.lnk"
FILE9="charnames.txt" FILE9="charnames.txt"
@ -58,8 +58,6 @@ FILE22="themes.zoo"
FILE23="sounds.zoo" FILE23="sounds.zoo"
FILE24="mintty.ico" FILE24="mintty.ico"
FILE25="mkshortcut.vbs" FILE25="mkshortcut.vbs"
FILE26="LICENSE.mintty"
FILE27="LICENSE.wslbridge2"
[SourceFiles] [SourceFiles]
SourceFiles0=. SourceFiles0=.
@ -91,6 +89,4 @@ SourceFiles0=.
%FILE23%= %FILE23%=
%FILE24%= %FILE24%=
%FILE25%= %FILE25%=
%FILE26%=
%FILE27%=