diff --git a/VERSION b/VERSION index 972ef76..27f9cd3 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.7.9 +1.8.0 diff --git a/WSL % in Mintty.lnk b/WSL % in Mintty.lnk deleted file mode 100755 index f51f7cf..0000000 Binary files a/WSL % in Mintty.lnk and /dev/null differ diff --git a/WSL -l in Mintty.lnk b/WSL -l in Mintty.lnk deleted file mode 100755 index 0c75c1c..0000000 Binary files a/WSL -l in Mintty.lnk and /dev/null differ diff --git a/WSL ~ in Mintty.lnk b/WSL ~ in Mintty.lnk deleted file mode 100755 index 9b666e6..0000000 Binary files a/WSL ~ in Mintty.lnk and /dev/null differ diff --git a/makefile b/makefile index 26f7324..223d4df 100644 --- a/makefile +++ b/makefile @@ -9,25 +9,27 @@ all: check pkg # wsltty release -ver=1.7.9 +ver=1.8.0 # mintty release version -minttyver=2.7.9 +minttyver=2.8.0 #minttyver=master # wslbridge backend version -wslbridgever=0.2.3 +wslbridgever=0.2.4 # wslbridge frontend version # release 0.2.0 does not have cygwin_internal(CW_SYNC_WINENV) yet; # therefore using "master" below #wslbridge-frontend=wslbridge-frontend # release 0.2.1 is updated and complete, no separate frontend build needed: -#wslbridge-frontend= -#wslbridge-commit=master -# use --distro-guid option: -wslbridge-frontend=wslbridge-frontend -wslbridge-commit=cb22e3f6f989cefe5b6599d3c04422ded74db664 +wslbridge-frontend= +# only used if wslbridge-frontend non-empty: +wslbridge-commit=master + +# use --distro-guid option (merged into 0.2.4): +#wslbridge-frontend=wslbridge-frontend +#wslbridge-commit=cb22e3f6f989cefe5b6599d3c04422ded74db664 ############################################################################# # target checking and some defs @@ -91,8 +93,11 @@ mintty-get: $(wgeto) https://github.com/mintty/mintty/archive/$(minttyver).zip -o mintty-$(minttyver).zip unzip -o mintty-$(minttyver).zip +wslbuild=LDFLAGS="-static -static-libgcc -s" +wslversion=VERSION_SUFFIX="– wsltty $(ver)" WSLTTY_VERSION="$(ver)" + mintty-build: - cd mintty-$(minttyver)/src; make LDFLAGS="-static -static-libgcc -s" VERSION_SUFFIX="– wsltty $(ver)" + cd mintty-$(minttyver)/src; make $(wslbuild) $(wslversion) mkdir -p bin cp mintty-$(minttyver)/bin/mintty.exe bin/ cp mintty-$(minttyver)/LICENSE LICENSE.mintty diff --git a/wsl-l.bat b/wsl-l.bat deleted file mode 100755 index 9aa084d..0000000 --- a/wsl-l.bat +++ /dev/null @@ -1,13 +0,0 @@ -@echo off - -rem Start mintty terminal for WSL with login shell - -if "%installdir%" == "" set installdir=%LOCALAPPDATA%\wsltty -if "%configdir%" == "" set configdir=%APPDATA%\wsltty - -rem To enable invocation of this script from WIN+R or from cmd.exe, -rem you may want to copy this script into "%SYSTEMROOT%\System32", -rem or include the installation folder "%LOCALAPPDATA%\wsltty" in your PATH - -"%installdir%\bin\mintty.exe" --wsl -h err "--configdir=%configdir%" -o Locale=C -o Charset=UTF-8 -i "%LOCALAPPDATA%\wsltty\wsl.ico" /bin/wslbridge -t /bin/bash -l - diff --git a/wsl.bat b/wsl.bat deleted file mode 100755 index af4ed8c..0000000 --- a/wsl.bat +++ /dev/null @@ -1,13 +0,0 @@ -@echo off - -rem Start mintty terminal for WSL in current directory - -if "%installdir%" == "" set installdir=%LOCALAPPDATA%\wsltty -if "%configdir%" == "" set configdir=%APPDATA%\wsltty - -rem To enable invocation of this script from WIN+R or from cmd.exe, -rem you may want to copy this script into "%SYSTEMROOT%\System32", -rem or include the installation folder "%LOCALAPPDATA%\wsltty" in your PATH - -"%installdir%\bin\mintty.exe" --wsl -h err "--configdir=%configdir%" -o Locale=C -o Charset=UTF-8 -i "%LOCALAPPDATA%\wsltty\wsl.ico" /bin/wslbridge -t /bin/bash - diff --git a/wsl~.bat b/wsl~.bat deleted file mode 100755 index 47f64d1..0000000 --- a/wsl~.bat +++ /dev/null @@ -1,13 +0,0 @@ -@echo off - -rem Start mintty terminal for WSL in WSL home directory - -if "%installdir%" == "" set installdir=%LOCALAPPDATA%\wsltty -if "%configdir%" == "" set configdir=%APPDATA%\wsltty - -rem To enable invocation of this script from WIN+R or from cmd.exe, -rem you may want to copy this script into "%SYSTEMROOT%\System32", -rem or include the installation folder "%LOCALAPPDATA%\wsltty" in your PATH - -"%installdir%\bin\mintty.exe" --wsl -h err "--configdir=%configdir%" -o Locale=C -o Charset=UTF-8 -i "%LOCALAPPDATA%\wsltty\wsl.ico" /bin/wslbridge -C~ -t /bin/bash -