From 49e57f64bfa330b5418e11826ae014c28d07ddf1 Mon Sep 17 00:00:00 2001 From: mintty Date: Sun, 6 Oct 2019 16:36:19 +0200 Subject: [PATCH] 3.0.6 --- VERSION | 2 +- makefile | 39 +++++++++++++++++++++------------------ 2 files changed, 22 insertions(+), 19 deletions(-) diff --git a/VERSION b/VERSION index eca690e..818bd47 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.0.5 +3.0.6 diff --git a/makefile b/makefile index 3e59942..b2bf8d8 100644 --- a/makefile +++ b/makefile @@ -8,29 +8,30 @@ # wsltty release -ver=3.0.5 +ver=3.0.6 # wsltty appx release - must have 4 parts! -verx=3.0.5.0 +verx=3.0.6.0 +# mintty release version +minttyver=3.0.6 + +# wslbridge release version +wslbridgever=0.4 + +############################## + +# mintty branch or commit version +#minttyver=master + +# wslbridge branch or commit to build from source; +wslbridge=wslbridge-frontend wslbridge-backend + +############################## # Windows SDK version for appx WINSDKKEY=/HKEY_LOCAL_MACHINE/SOFTWARE/WOW6432Node/Microsoft/.NET Framework Platform/Setup/Multi-Targeting Pack WINSDKVER=`regtool list '$(WINSDKKEY)' | sed -e '$$ q' -e d` -############################## -# mintty release version -minttyver=3.0.5 - -# or mintty branch or commit version -#minttyver=master - -############################## -# wslbridge binary package; may be overridden below -wslbridgever=0.3 - -# or wslbridge branch or commit to build from source; -wslbridge=wslbridge-frontend wslbridge-backend - ############################################################################# # default target @@ -101,16 +102,18 @@ wslbridge-source: wslbridge2-$(wslbridgever).zip wslbridge-frontend: wslbridge-source echo ------------- Compiling wslbridge2 frontend - cd wslbridge2-$(wslbridgever); make RELEASE=1 mkdir -p bin + rm -f bin/wslbridge2.exe bin/hvpty.exe + cd wslbridge2-$(wslbridgever); make RELEASE=1 cp wslbridge2-$(wslbridgever)/bin/wslbridge2.exe bin/ cp wslbridge2-$(wslbridgever)/bin/hvpty.exe bin/ wslbridge-backend: wslbridge-source echo ------------- Compiling wslbridge2 backend uname -m | grep x86_64 - cd wslbridge2-$(wslbridgever); cmd /C wsl -d Alpine make RELEASE=1 & (sleep 8; echo built backend) mkdir -p bin + rm -f bin/wslbridge2-backend bin/hvpty-backend + cd wslbridge2-$(wslbridgever); cmd /C wsl -d Alpine make RELEASE=1 < /dev/null cp wslbridge2-$(wslbridgever)/bin/wslbridge2-backend bin/ cp wslbridge2-$(wslbridgever)/bin/hvpty-backend bin/