From 83a9c12fc6933d156d0f727fb0fbc7119cbc82d8 Mon Sep 17 00:00:00 2001
From: Thomas Wolff <mintty@users.noreply.github.com>
Date: Wed, 30 Oct 2019 00:00:00 +0100
Subject: [PATCH] update to wslbridge2 release v0.5

---
 README.md         |  6 +++---
 config-distros.sh |  6 +++---
 install.bat       |  4 ----
 makefile          | 20 +++++++-------------
 makewinx.cfg      |  8 ++------
 5 files changed, 15 insertions(+), 29 deletions(-)

diff --git a/README.md b/README.md
index 9dd98f9..4d91557 100644
--- a/README.md
+++ b/README.md
@@ -85,10 +85,10 @@ WSLtty can be invoked with
 Starting the mintty terminal directly from the WSLtty installation location 
 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.
-Mintty automatically detects the WSL version and invokes the proper gateway.
+Terminal communication with WSL via its modes V1 or V2 is handled 
+automatically by wsltty (mintty and the wslbridge2 gateway).
 
 ---
 
diff --git a/config-distros.sh b/config-distros.sh
index 027751d..a9c8ffc 100755
--- a/config-distros.sh
+++ b/config-distros.sh
@@ -244,9 +244,9 @@ config () {
   if $ok && [ -n "$distro" ]
   then	# fix #163: backend missing +x with certain mount options
 	echo Setting +x wslbridge2 backends for distro "'$distro'"
-	(cd "$INSTDIR"; cd bin; wsl.exe -d "$distro" chmod +x wslbridge2-backend hvpty-backend)
-#	(cd "$LOCALAPPDATA/wsltty/bin"; wsl.exe -d "$distro" chmod +x wslbridge2-backend hvpty-backend)
-#	(cd ... ; "$SYSTEMROOT/System32/bash.exe" "$guid" -c 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)
+#	(cd ... ; "$SYSTEMROOT/System32/bash.exe" "$guid" -c chmod +x wslbridge2-backend)
   fi
 
   if $ok && $config
diff --git a/install.bat b/install.bat
index 12c301a..d0c9a91 100755
--- a/install.bat
+++ b/install.bat
@@ -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\wslbridge2.exe" wslbridge2.exe.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"
 
 :instbin
@@ -56,8 +54,6 @@ copy cygwin-console-helper.exe "%installdir%\bin"
 copy mintty.exe "%installdir%\bin"
 copy wslbridge2.exe "%installdir%\bin"
 copy wslbridge2-backend "%installdir%\bin"
-copy hvpty.exe "%installdir%\bin"
-copy hvpty-backend "%installdir%\bin"
 
 copy dash.exe "%installdir%\bin"
 copy regtool.exe "%installdir%\bin"
diff --git a/makefile b/makefile
index ba80b47..ba266b6 100644
--- a/makefile
+++ b/makefile
@@ -8,16 +8,16 @@
 
 
 # wsltty release
-ver=3.0.6
+ver=3.0.7
 
 # wsltty appx release - must have 4 parts!
-verx=3.0.6.0
+verx=3.0.7.0
 
 # mintty release version
-minttyver=3.0.6
+minttyver=3.0.7
 
-# wslbridge release version
-wslbridgever=0.4
+# wslbridge2 release version
+wslbridgever=0.5
 
 ##############################
 
@@ -103,12 +103,10 @@ wslbridge-source:	wslbridge2-$(wslbridgever).zip
 wslbridge-frontend:	wslbridge-source
 	echo ------------- Compiling wslbridge2 frontend
 	mkdir -p bin
-	rm -f bin/wslbridge2.exe bin/hvpty.exe
 	# frontend build
-	cd wslbridge2-$(wslbridgever); make RELEASE=1
+	cd wslbridge2-$(wslbridgever)/src; make -f Makefile.frontend RELEASE=1
 	# extract binaries
 	cp wslbridge2-$(wslbridgever)/bin/wslbridge2.exe bin/
-	cp wslbridge2-$(wslbridgever)/bin/hvpty.exe bin/
 
 # build backend on a musl-libc-based distribution
 BuildDistr=Alpine
@@ -117,14 +115,12 @@ wslbridge-backend:	wslbridge-source
 	echo ------------- Compiling wslbridge2 backend
 	uname -m | grep x86_64
 	mkdir -p bin
-	rm -f bin/wslbridge2-backend bin/hvpty-backend
 	# provide dependencies for backend build
 	cmd /C wsl -d $(BuildDistr) apk add make g++ linux-headers
 	# 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
 	cp wslbridge2-$(wslbridgever)/bin/wslbridge2-backend bin/
-	cp wslbridge2-$(wslbridgever)/bin/hvpty-backend bin/
 
 mintty-get:
 	$(wgeto) https://github.com/mintty/mintty/archive/$(minttyver).zip -o mintty-$(minttyver).zip
@@ -212,8 +208,6 @@ cop:	ver
 	cp charnames.txt rel/
 	cp bin/wslbridge2.exe rel/
 	cp bin/wslbridge2-backend rel/
-	cp bin/hvpty.exe rel/
-	cp bin/hvpty-backend rel/
 	cp mkshortcut.vbs rel/
 	#cp bin/mkshortcut.exe rel/
 	#cp bin/cygpopt-0.dll rel/
diff --git a/makewinx.cfg b/makewinx.cfg
index 77292f0..007ff85 100644
--- a/makewinx.cfg
+++ b/makewinx.cfg
@@ -37,8 +37,8 @@ FILE1="cygwin-console-helper.exe"
 FILE2="mintty.exe"
 FILE3="wslbridge2.exe"
 FILE4="wslbridge2-backend"
-FILE5="hvpty.exe"
-FILE6="hvpty-backend"
+FILE5="LICENSE.mintty"
+FILE6="LICENSE.wslbridge2"
 FILE7="config-distros.sh"
 FILE8="configure WSL shortcuts.lnk"
 FILE9="charnames.txt"
@@ -58,8 +58,6 @@ FILE22="themes.zoo"
 FILE23="sounds.zoo"
 FILE24="mintty.ico"
 FILE25="mkshortcut.vbs"
-FILE26="LICENSE.mintty"
-FILE27="LICENSE.wslbridge2"
 
 [SourceFiles]
 SourceFiles0=.
@@ -91,6 +89,4 @@ SourceFiles0=.
 %FILE23%=
 %FILE24%=
 %FILE25%=
-%FILE26%=
-%FILE27%=