mirror of
https://github.com/mintty/wsltty.git
synced 2025-11-03 08:31:51 +00:00
Compare commits
31 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
2ddd2cd1ff | ||
|
|
d1fa49985b | ||
|
|
76fad756e1 | ||
|
|
600df69bb8 | ||
|
|
97dc68d64a | ||
|
|
9469b2b5f5 | ||
|
|
5b27a3d3c8 | ||
|
ab46c2b1b0 | ||
|
2e56730282 | ||
|
|
d67ce45c3e | ||
|
|
6e74ab4d5b | ||
|
|
ee4e403f4c | ||
|
|
a332cf8eaa | ||
|
|
07aa6c692d | ||
|
|
74dad091ce | ||
|
|
8d896ceb36 | ||
|
|
90cf6f5d15 | ||
|
|
2cd6d190d6 | ||
|
|
38b8a5e93d | ||
|
|
105d0b4ec5 | ||
|
|
6c5a0f1fba | ||
|
|
f31eae1a41 | ||
|
|
600e6e69ba | ||
|
|
9c9b88d416 | ||
|
|
9feb6b7187 | ||
|
|
416fcd1d0d | ||
|
|
2457a1fb10 | ||
|
|
8e09414b4b | ||
|
|
4a0b7328da | ||
|
|
afd3d6d9e8 | ||
|
|
9c6d75b09e |
226
0001-notify-size-change-inband.patch
Normal file
226
0001-notify-size-change-inband.patch
Normal file
@@ -0,0 +1,226 @@
|
||||
diff --git a/src/wslbridge2-backend.cpp b/src/wslbridge2-backend.cpp
|
||||
index 8b86cc6..63a19e5 100644
|
||||
--- a/src/wslbridge2-backend.cpp
|
||||
+++ b/src/wslbridge2-backend.cpp
|
||||
@@ -17,6 +17,7 @@
|
||||
#include <sys/wait.h>
|
||||
#include <unistd.h>
|
||||
#include <wordexp.h>
|
||||
+#include <limits.h> // PIPE_BUF
|
||||
|
||||
#include <string>
|
||||
#include <vector>
|
||||
@@ -196,6 +197,7 @@ int main(int argc, char *argv[])
|
||||
|
||||
ssize_t readRet = 0, writeRet = 0;
|
||||
char data[1024]; /* Buffer to hold raw data from pty */
|
||||
+ assert(sizeof data <= PIPE_BUF);
|
||||
|
||||
do
|
||||
{
|
||||
@@ -206,8 +208,85 @@ int main(int argc, char *argv[])
|
||||
if (fds[0].revents & POLLIN)
|
||||
{
|
||||
readRet = recv(ioSockets.inputSock, data, sizeof data, 0);
|
||||
- if (readRet > 0)
|
||||
- writeRet = write(mfd_dp, data, readRet);
|
||||
+ char * s = data;
|
||||
+ int len = readRet;
|
||||
+ writeRet = 1;
|
||||
+ while (writeRet > 0 && len > 0)
|
||||
+ {
|
||||
+ if (!*s)
|
||||
+ {
|
||||
+ // dispatch NUL escaped inband information
|
||||
+ s++;
|
||||
+ len--;
|
||||
+
|
||||
+ if (len < 9 && s + 9 >= data + sizeof data)
|
||||
+ {
|
||||
+ // make room for additional loading
|
||||
+ memcpy(data, s, len);
|
||||
+ s = data;
|
||||
+ }
|
||||
+
|
||||
+ // ensure 1 more byte is loaded to dispatch on
|
||||
+ if (!len)
|
||||
+ {
|
||||
+ readRet = recv(ioSockets.inputSock, s, 1, 0);
|
||||
+ if (readRet > 0)
|
||||
+ {
|
||||
+ len += readRet;
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ writeRet = -1;
|
||||
+ break;
|
||||
+ }
|
||||
+ }
|
||||
+ if (*s == 2)
|
||||
+ {
|
||||
+ // STX: escaped NUL
|
||||
+ s++;
|
||||
+ len--;
|
||||
+ writeRet = write(mfd_dp, "", 1);
|
||||
+ }
|
||||
+ else if (*s == 16)
|
||||
+ {
|
||||
+ // DLE: terminal window size change
|
||||
+ s++;
|
||||
+ len--;
|
||||
+ // ensure 8 more bytes are loaded for winsize
|
||||
+ while (readRet > 0 && len < 8)
|
||||
+ {
|
||||
+ readRet = recv(ioSockets.inputSock, s + len, 8 - len, 0);
|
||||
+ if (readRet > 0)
|
||||
+ {
|
||||
+ len += readRet;
|
||||
+ }
|
||||
+ }
|
||||
+ if (readRet <= 0)
|
||||
+ {
|
||||
+ writeRet = -1;
|
||||
+ break;
|
||||
+ }
|
||||
+ struct winsize * winsp = (struct winsize *)s;
|
||||
+ s += 8;
|
||||
+ len -= 8;
|
||||
+ winsp->ws_xpixel = 0;
|
||||
+ winsp->ws_ypixel = 0;
|
||||
+ ret = ioctl(mfd, TIOCSWINSZ, winsp);
|
||||
+ if (ret != 0)
|
||||
+ perror("ioctl(TIOCSWINSZ)");
|
||||
+ }
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ int n = strnlen(s, len);
|
||||
+ writeRet = write(mfd_dp, s, n);
|
||||
+ if (writeRet > 0)
|
||||
+ {
|
||||
+ s += writeRet;
|
||||
+ len -= writeRet;
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
}
|
||||
|
||||
/* Resize window when buffer received in control socket */
|
||||
diff --git a/src/wslbridge2.cpp b/src/wslbridge2.cpp
|
||||
index 300ad57..3ba9096 100644
|
||||
--- a/src/wslbridge2.cpp
|
||||
+++ b/src/wslbridge2.cpp
|
||||
@@ -43,19 +43,41 @@ union IoSockets
|
||||
/* global variable */
|
||||
static volatile union IoSockets g_ioSockets = { 0 };
|
||||
|
||||
+#define dont_debug_inband
|
||||
+#define dont_use_controlsocket
|
||||
+
|
||||
static void resize_window(int signum)
|
||||
{
|
||||
+#ifdef use_controlsocket
|
||||
+#warning this may crash for unknown reason, maybe terminate the backend
|
||||
struct winsize winp;
|
||||
+ ioctl(STDIN_FILENO, TIOCGWINSZ, &winp);
|
||||
|
||||
/* Send terminal window size to control socket */
|
||||
- ioctl(STDIN_FILENO, TIOCGWINSZ, &winp);
|
||||
send(g_ioSockets.controlSock, (char *)&winp, sizeof winp, 0);
|
||||
+#else
|
||||
+ static char wins[2 + sizeof(struct winsize)] = {0, 16};
|
||||
+ static struct winsize * winsp = (struct winsize *)&wins[2];
|
||||
+ ioctl(STDIN_FILENO, TIOCGWINSZ, winsp);
|
||||
+
|
||||
+#ifdef debug_inband
|
||||
+ /* Send terminal window size inband, visualized as ESC sequence */
|
||||
+ char resizesc[55];
|
||||
+ //sprintf(resizesc, "\e_8;%u;%u\a", winsp->ws_row, winsp->ws_col);
|
||||
+ sprintf(resizesc, "^[_8;%u;%u^G", winsp->ws_row, winsp->ws_col);
|
||||
+ send(g_ioSockets.inputSock, resizesc, strlen(resizesc), 0);
|
||||
+#else
|
||||
+ /* Send terminal window size inband, with NUL escape */
|
||||
+ send(g_ioSockets.inputSock, wins, sizeof wins, 0);
|
||||
+#endif
|
||||
+#endif
|
||||
}
|
||||
|
||||
static void* send_buffer(void *param)
|
||||
{
|
||||
int ret;
|
||||
char data[1024];
|
||||
+ assert(sizeof data <= PIPE_BUF);
|
||||
|
||||
while (1)
|
||||
{
|
||||
@@ -65,8 +87,33 @@ static void* send_buffer(void *param)
|
||||
closesocket(g_ioSockets.inputSock);
|
||||
break;
|
||||
}
|
||||
- if (!send(g_ioSockets.inputSock, data, ret, 0))
|
||||
- break;
|
||||
+ char * s = data;
|
||||
+ int len = ret;
|
||||
+ while (ret > 0 && len > 0)
|
||||
+ {
|
||||
+ if (!*s)
|
||||
+ {
|
||||
+ // send NUL STX
|
||||
+#ifdef debug_inband
|
||||
+ ret = send(g_ioSockets.inputSock, (void*)"nul", 3, 0);
|
||||
+#else
|
||||
+ static char NUL_STX[] = {0, 2};
|
||||
+ ret = send(g_ioSockets.inputSock, NUL_STX, 2, 0);
|
||||
+#endif
|
||||
+ s++;
|
||||
+ len--;
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ int n = strnlen(s, len);
|
||||
+ ret = send(g_ioSockets.inputSock, s, n, 0);
|
||||
+ if (ret > 0)
|
||||
+ {
|
||||
+ s += ret;
|
||||
+ len -= ret;
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
}
|
||||
|
||||
pthread_exit(&ret);
|
||||
@@ -480,16 +527,6 @@ int main(int argc, char *argv[])
|
||||
g_ioSockets.controlSock = win_local_accept(controlSock);
|
||||
}
|
||||
|
||||
- /* Capture window resize signal and send buffer to control socket */
|
||||
- {
|
||||
- struct sigaction act;
|
||||
- memset(&act, 0, sizeof act);
|
||||
- act.sa_handler = resize_window;
|
||||
- act.sa_flags = SA_RESTART;
|
||||
- ret = sigaction(SIGWINCH, &act, NULL);
|
||||
- assert(ret == 0);
|
||||
- }
|
||||
-
|
||||
/* Create thread to send input buffer to input socket */
|
||||
pthread_t tidInput;
|
||||
ret = pthread_create(&tidInput, nullptr, send_buffer, nullptr);
|
||||
@@ -502,6 +539,17 @@ int main(int argc, char *argv[])
|
||||
|
||||
termState.enterRawMode();
|
||||
|
||||
+ /* Create thread to send window size through control socket */
|
||||
+ struct sigaction act = {};
|
||||
+ act.sa_handler = resize_window;
|
||||
+ act.sa_flags = SA_RESTART;
|
||||
+ ret = sigaction(SIGWINCH, &act, NULL);
|
||||
+ assert(ret == 0);
|
||||
+
|
||||
+ /* Notify initial size in case it's changed since starting */
|
||||
+ //resize_window(0);
|
||||
+ kill(getpid(), SIGWINCH);
|
||||
+
|
||||
/*
|
||||
* wsltty#254: WORKAROUND: Terminates input thread forcefully
|
||||
* when output thread exits. Need some inter-thread syncing.
|
||||
62
0002-add-com-for-lifted-wsl.patch
Normal file
62
0002-add-com-for-lifted-wsl.patch
Normal file
@@ -0,0 +1,62 @@
|
||||
diff -rup src/sav/GetVmId.cpp src/GetVmId.cpp
|
||||
--- src/sav/GetVmId.cpp 2021-04-27 13:50:51.000000000 +0000
|
||||
+++ src/GetVmId.cpp 2022-02-03 19:43:53.684999800 +0000
|
||||
@@ -46,11 +46,24 @@ void ComInit(void)
|
||||
EOAC_STATIC_CLOAKING, NULL);
|
||||
assert(hRes == 0);
|
||||
|
||||
- hRes = CoCreateInstance(CLSID_LxssUserSession,
|
||||
+ // First try with COM server in lifted WSL service
|
||||
+ hRes = CoCreateInstance(CLSID_WslService,
|
||||
NULL,
|
||||
CLSCTX_LOCAL_SERVER,
|
||||
- IID_ILxssUserSession,
|
||||
+ IID_IWSLService,
|
||||
(PVOID *)&wslSession);
|
||||
+
|
||||
+
|
||||
+ // Now try with COM server in system WSL service
|
||||
+ if (FAILED(hRes))
|
||||
+ {
|
||||
+ hRes = CoCreateInstance(CLSID_LxssUserSession,
|
||||
+ NULL,
|
||||
+ CLSCTX_LOCAL_SERVER,
|
||||
+ IID_ILxssUserSession,
|
||||
+ (PVOID *)&wslSession);
|
||||
+ }
|
||||
+
|
||||
assert(hRes == 0);
|
||||
}
|
||||
|
||||
diff -rup src/sav/LxssUserSession.hpp src/LxssUserSession.hpp
|
||||
--- src/sav/LxssUserSession.hpp 2021-04-27 13:50:51.000000000 +0000
|
||||
+++ src/LxssUserSession.hpp 2022-02-03 19:45:22.846298200 +0000
|
||||
@@ -11,14 +11,26 @@
|
||||
#ifndef LXSSUSERSESSION_H
|
||||
#define LXSSUSERSESSION_H
|
||||
|
||||
-/* Class identifier */
|
||||
+// COM IDs for lifted WSL service
|
||||
+static const GUID CLSID_WslService = {
|
||||
+ 0xF122531F,
|
||||
+ 0x326B,
|
||||
+ 0x4514,
|
||||
+ { 0x85, 0xAE, 0xDC, 0x99, 0xD3, 0x1D, 0x82, 0x56 } };
|
||||
+
|
||||
+static const GUID IID_IWSLService = {
|
||||
+ 0x50047071,
|
||||
+ 0x122C,
|
||||
+ 0x4CAD,
|
||||
+ { 0x9C, 0x93, 0x94, 0x72, 0x0E, 0xB7, 0x7B, 0x06 } };
|
||||
+
|
||||
+// COM IDs for system WSL service
|
||||
static const GUID CLSID_LxssUserSession = {
|
||||
0x4F476546,
|
||||
0xB412,
|
||||
0x4579,
|
||||
{ 0xB6, 0x4C, 0x12, 0x3D, 0xF3, 0x31, 0xE3, 0xD6 } };
|
||||
|
||||
-/* Interface identifier */
|
||||
static const GUID IID_ILxssUserSession = {
|
||||
0x536A6BCF,
|
||||
0xFE04,
|
||||
@@ -1,4 +1,4 @@
|
||||
mintty is copyright 2008-13 Andy Koppe, 2015-18 Thomas Wolff.
|
||||
mintty is copyright 2008-13 Andy Koppe, 2015-22 Thomas Wolff.
|
||||
|
||||
Licensed under the terms of the GNU General Public License version 3 or later,
|
||||
amended with the bundling clause to clarify ambiguous interpretation.
|
||||
|
||||
64
README.md
64
README.md
@@ -35,11 +35,23 @@ You may need to open the Properties of the installer first, tab “General”
|
||||
section “Security” (if available) and select “Unblock”,
|
||||
to enable the “Run anyway” button.
|
||||
|
||||
#### Installation from archive ####
|
||||
|
||||
In case a local anti-virus guard barfs about the wsltty installer, the
|
||||
release also contains a `.cab` file. Download it, open it, extract its files
|
||||
to some temporary deployment directory, and invoke `install.bat` from there.
|
||||
|
||||
#### Installation from source repository ####
|
||||
|
||||
Checkout the wsltty repository, or download the source archive, unpack and rename the directory to `wsltty`.
|
||||
Invoke `make`, then `make install`.
|
||||
Note this has to be done within a Cygwin environment.
|
||||
Install Alpine WSL from the Microsoft Store.
|
||||
Invoke `make build`, then `make install`.
|
||||
|
||||
Note this has to be done within a Cygwin environment. A minimal Cygwin
|
||||
environment for this purpose would be installed with the
|
||||
[Cygwin installer](https://cygwin.com/setup-x86_64.exe)
|
||||
from [cygwin.com](https://cygwin.com/),
|
||||
with additional packages `make`, `gcc-g++`, `unzip`, `zoo`, `patch`, (`lcab`).
|
||||
|
||||
#### Installation to non-default locations ####
|
||||
|
||||
@@ -74,7 +86,12 @@ then, invoke one of
|
||||
|
||||
A Windows Appx package and certificate is available in the [wsltty.appx](https://github.com/mintty/wsltty.appx/) repository.
|
||||
|
||||
<br clear=all>
|
||||
### Uninstallation ###
|
||||
|
||||
To uninstall wsltty desktop, start menu, and context menu integration:
|
||||
Open a Windows `cmd`, go into the wsltty installation folder:
|
||||
`cd %LOCALAPPDATA%\wsltty` and run the `uninstall` script.
|
||||
To uninstall wsltty software completely, remove the installation folder manually.
|
||||
|
||||
---
|
||||
|
||||
@@ -105,6 +122,21 @@ If wsltty fails with an error message that mentions a disk mount path (e.g. `/mn
|
||||
workarounds may be the shutdown of the WSL V2 virtual machine (`wsl --shutdown` on the distro)
|
||||
or turning off “fast startup” in the Windows power settings (#246, #248).
|
||||
|
||||
#### WSL shell starting issues ####
|
||||
|
||||
With WSL V2, an additional background shell is run which may cause trouble
|
||||
for example when setting up automatic interaction between Windows side and
|
||||
WSL side
|
||||
(see https://github.com/mintty/wsltty/issues/197#issuecomment-687030527).
|
||||
As a workaround, the following may be added to (the beginning of) the
|
||||
WSL shell initialization script `.bashrc` (adapt for other shells):
|
||||
```
|
||||
# work around https://github.com/mintty/wsltty/issues/197
|
||||
if [[ -n "$WSL_DISTRO_NAME" ]]; then
|
||||
command -v cmd.exe > /dev/null || exit
|
||||
fi
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### Configuration ###
|
||||
@@ -112,7 +144,7 @@ or turning off “fast startup” in the Windows power settings (#246, #248).
|
||||
#### Start Menu and Desktop shortcuts ####
|
||||
|
||||
In the Start Menu, the following shortcuts are installed:
|
||||
* Shortcut <img align=absmiddle height=40 src=tux1.png>`WSL Terminal` to start the default WSL distribution (as configured with the Windows tool `wslconfig`)
|
||||
* Shortcut <img align=absmiddle height=40 src=tux1.png>`WSL Terminal` to start the default WSL distribution (as configured with the Windows tool `wslconfig` or `wsl -s`)
|
||||
* For each installed WSL distribution, for example `Ubuntu`, a shortcut like <img align=absmiddle height=40 src=ubuntu1.png>`Ubuntu Terminal` to start in the WSL user home
|
||||
|
||||
In the Start Menu subfolder WSLtty, the following additional shortcuts are installed:
|
||||
@@ -120,7 +152,7 @@ In the Start Menu subfolder WSLtty, the following additional shortcuts are insta
|
||||
* For each installed WSL distribution, for example `Ubuntu`, a shortcut like <img align=absmiddle height=40 src=ubuntu1.png>`Ubuntu Terminal %` to start in the Windows %USERPROFILE% home
|
||||
|
||||
One Desktop shortcut is installed:
|
||||
* Shortcut <img align=absmiddle height=40 src=tux1.png>`WSL Terminal` to start the default WSL distribution (as configured with the Windows tool `wslconfig`)
|
||||
* Shortcut <img align=absmiddle height=40 src=tux1.png>`WSL Terminal` to start the default WSL distribution (as configured with the Windows tool `wslconfig` or `wsl -s`)
|
||||
|
||||
Other, distribution-specific shortcuts can be copied to the desktop
|
||||
from the Start Menu if desired.
|
||||
@@ -181,7 +213,7 @@ with the following precedence:
|
||||
* `%LOCALAPPDATA%\wsltty\etc\minttyrc` (usage deprecated with wsltty)
|
||||
|
||||
Note:
|
||||
* `%APPDATA%\wsltty\config` is the new user configuration file location.
|
||||
* `%APPDATA%\wsltty\config` is the user configuration file location.
|
||||
Further subdirectories of `%APPDATA%\wsltty` are used for language,
|
||||
themes, and sounds resource configuration.
|
||||
Note the distinction from `%LOCALAPPDATA%\wsltty` which is the default
|
||||
@@ -193,7 +225,7 @@ Note:
|
||||
root directory of the cygwin standalone installation hosting wsltty.
|
||||
So `%HOME%` would mean `%LOCALAPPDATA%\wsltty\home\%USERNAME%`.
|
||||
If you define `HOME` at Windows level, this changes accordingly.
|
||||
Note, however, that the WSL `HOME` is a completely different setting.
|
||||
Note, however, that the WSL `$HOME` is a completely different setting.
|
||||
|
||||
#### Shell selection and Login shell ####
|
||||
|
||||
@@ -211,6 +243,24 @@ a shell pathname and an optional `-l` parameter
|
||||
|
||||
---
|
||||
|
||||
### WSL locale setup and character encoding ###
|
||||
|
||||
Character encoding setup by locale setting is propagated from the terminal
|
||||
towards WSL. So you can select your favourite locale with configuration
|
||||
options or with command-line options, for example in a copied dedicated
|
||||
desktop shortcut.
|
||||
|
||||
If for example you wish to run WSL in GB18030 encoding, you may set options
|
||||
`Locale=zh_CN` and `Charset=GB18030` and the WSL shell will adopt that
|
||||
setting, provided that the selected locale is configured to be available
|
||||
in the locale database of the WSL distribution.
|
||||
This can be achieved in Ubuntu with the following commands:
|
||||
* `sudo mkdir -p /var/lib/locales/supported.d`
|
||||
* `sudo echo zh_CN.GB18030 GB18030 >> /var/lib/locales/supported.d/local`
|
||||
* `sudo locale-gen`
|
||||
|
||||
---
|
||||
|
||||
### Components and Credits ###
|
||||
|
||||
For mintty, see the [Mintty homepage](http://mintty.github.io/)
|
||||
|
||||
@@ -14,10 +14,10 @@ copy () {
|
||||
}
|
||||
|
||||
delete () {
|
||||
from=/F
|
||||
to="$1"
|
||||
from="$1"
|
||||
to="$1" # same again, to fill parameter
|
||||
export from to
|
||||
cmd /c cmd2.bat del
|
||||
cmd /c cmd2.bat del/F
|
||||
}
|
||||
|
||||
compare () {
|
||||
@@ -291,7 +291,16 @@ config () {
|
||||
echoc "- root $root"
|
||||
wdir=%USERPROFILE%
|
||||
|
||||
if $ok && [ -n "$distro" ]
|
||||
case "$name" in
|
||||
docker*) echo skipping docker system
|
||||
return;;
|
||||
esac
|
||||
case "$root" in
|
||||
*\\Docker*) echo skipping docker system
|
||||
return;;
|
||||
esac
|
||||
|
||||
if $ok && ! $remove && [ -n "$distro" ]
|
||||
then # fix #163: backend missing +x with certain mount options
|
||||
echo Setting +x wslbridge2 backends for distro "'$distro'"
|
||||
(cd "$INSTDIR"; cd bin; PATH="${WINDIR}/Sysnative:${PATH}" wsl.exe -d "$distro" chmod +x wslbridge2-backend)
|
||||
|
||||
153
makefile
153
makefile
@@ -4,25 +4,51 @@
|
||||
# make targets:
|
||||
# make [all] build a distributable installer (default)
|
||||
# make pkg build an installer, bypassing the system checks
|
||||
# make build build the software (no installer)
|
||||
# make install install wsltty locally from build (no installer needed)
|
||||
# make wsltty build the software, using the local copy of mintty
|
||||
|
||||
|
||||
# wsltty release
|
||||
ver=3.3.0
|
||||
ver=3.5.3
|
||||
|
||||
# wsltty appx release - must have 4 parts!
|
||||
verx=3.3.0.0
|
||||
verx=3.5.3.0
|
||||
|
||||
|
||||
##############################
|
||||
# mintty release version
|
||||
minttyver=3.3.0
|
||||
|
||||
# wslbridge2 release version
|
||||
#repo=Biswa96/wslbridge2
|
||||
#wslbridgever=0.5
|
||||
minttyver=3.5.3
|
||||
|
||||
##############################
|
||||
|
||||
# wslbridge2 repository
|
||||
repo=Biswa96/wslbridge2
|
||||
|
||||
# wslbridge2 master release version
|
||||
wslbridgever=0.8
|
||||
|
||||
# wslbridge2 latest version
|
||||
#archive=master
|
||||
#wslbridgedir=wslbridge2-$(archive)
|
||||
|
||||
# wslbridge2 branch or commit version (from fix-window-resize branch) and dir
|
||||
#commit=70e0dcea1db122d076ce1578f2a45280cc92d09f
|
||||
#commit=8b6dd7ee2b3102d72248990c21764c5cf86c6612
|
||||
#archive=$(commit)
|
||||
#wslbridgedir=wslbridge2-$(archive)
|
||||
|
||||
|
||||
# wslbridge2 fork repository and version
|
||||
#repo=mintty/wslbridge2
|
||||
#wslbridgever=0.5.1
|
||||
|
||||
|
||||
# wslbridge2 release or fork archive and dir
|
||||
archive=v$(wslbridgever)
|
||||
wslbridgedir=wslbridge2-$(wslbridgever)
|
||||
|
||||
repo=mintty/wslbridge2
|
||||
wslbridgever=0.5.1
|
||||
|
||||
##############################
|
||||
|
||||
@@ -108,7 +134,7 @@ fix-verx:
|
||||
# clear binaries
|
||||
|
||||
clean:
|
||||
rm -fr wslbridge2-$(wslbridgever)/bin
|
||||
rm -fr $(wslbridgedir)/bin
|
||||
rm -fr bin
|
||||
|
||||
#############################################################################
|
||||
@@ -116,20 +142,24 @@ clean:
|
||||
|
||||
wslbridge: $(wslbridge)
|
||||
|
||||
wslbridge2-$(wslbridgever).zip:
|
||||
$(wgeto) https://github.com/$(repo)/archive/v$(wslbridgever).zip -o wslbridge2-$(wslbridgever).zip
|
||||
$(wslbridgedir).zip:
|
||||
$(wgeto) https://github.com/$(repo)/archive/$(archive).zip -o $(wslbridgedir).zip
|
||||
|
||||
wslbridge-source: wslbridge2-$(wslbridgever).zip
|
||||
unzip -ou wslbridge2-$(wslbridgever).zip
|
||||
cp wslbridge2-$(wslbridgever)/LICENSE LICENSE.wslbridge2
|
||||
wslbridge-source: $(wslbridgedir).zip
|
||||
unzip -o $(wslbridgedir).zip
|
||||
cp $(wslbridgedir)/LICENSE LICENSE.wslbridge2
|
||||
# patch
|
||||
cd $(wslbridgedir); patch -p1 < ../0001-notify-size-change-inband.patch
|
||||
# patch to https://github.com/Biswa96/wslbridge2/commit/41575379b416703c49e2687e957440239a4cdfb7
|
||||
cd $(wslbridgedir); patch -p0 < ../0002-add-com-for-lifted-wsl.patch
|
||||
|
||||
wslbridge-frontend: wslbridge-source
|
||||
echo ------------- Compiling wslbridge2 frontend
|
||||
mkdir -p bin
|
||||
# frontend build
|
||||
cd wslbridge2-$(wslbridgever)/src; make -f Makefile.frontend RELEASE=1
|
||||
cd $(wslbridgedir)/src; make -f Makefile.frontend RELEASE=1
|
||||
# extract binaries
|
||||
cp wslbridge2-$(wslbridgever)/bin/wslbridge2.exe bin/
|
||||
cp $(wslbridgedir)/bin/wslbridge2.exe bin/
|
||||
|
||||
windir=$(shell cd "${WINDIR}"; pwd)
|
||||
|
||||
@@ -140,9 +170,9 @@ wslbridge-backend: wslbridge-source
|
||||
# provide dependencies for backend build
|
||||
PATH="$(windir)/Sysnative:${PATH}" cmd /C wsl.exe -u root $(BuildDistr) $(shell env | grep http_proxy=) apk add make g++ linux-headers < /dev/null
|
||||
# invoke backend build
|
||||
cd wslbridge2-$(wslbridgever)/src; PATH="$(windir)/Sysnative:${PATH}" cmd /C wsl.exe $(BuildDistr) make -f Makefile.backend RELEASE=1 < /dev/null
|
||||
cd $(wslbridgedir)/src; PATH="$(windir)/Sysnative:${PATH}" cmd /C wsl.exe $(BuildDistr) make -f Makefile.backend RELEASE=1 < /dev/null
|
||||
# extract binaries
|
||||
cp wslbridge2-$(wslbridgever)/bin/wslbridge2-backend bin/
|
||||
cp $(wslbridgedir)/bin/wslbridge2-backend bin/
|
||||
|
||||
mintty-get:
|
||||
$(wgeto) https://github.com/mintty/mintty/archive/$(minttyver).zip -o mintty-$(minttyver).zip
|
||||
@@ -157,6 +187,7 @@ appxversion=VERSION_SUFFIX="– wsltty appx $(verx)" WSLTTY_VERSION="$(verx)"
|
||||
mintty-build:
|
||||
# ensure rebuild of version-specific check and message
|
||||
rm -f mintty-$(minttyver)/bin/*/windialog.o
|
||||
rm -f mintty-$(minttyver)/bin/*/winmain.o
|
||||
# build mintty
|
||||
cd mintty-$(minttyver)/src; make $(wslbuild) $(wslversion)
|
||||
mkdir -p bin
|
||||
@@ -214,39 +245,60 @@ appx-bin:
|
||||
cp /bin/cygwin1.dll bin/
|
||||
cp /bin/cygwin-console-helper.exe bin/
|
||||
|
||||
cop: ver
|
||||
mkdir -p rel
|
||||
rm -f rel/wsltty-$(ver)-install-$(arch).exe
|
||||
sed -e "s,%version%,$(ver)," -e "s,%arch%,$(arch)," makewinx.cfg > rel/wsltty.SED
|
||||
cp bin/cygwin1.dll rel/
|
||||
cp bin/cygwin-console-helper.exe rel/
|
||||
cp bin/dash.exe rel/
|
||||
cp bin/regtool.exe rel/
|
||||
cp bin/mintty.exe rel/
|
||||
cp bin/zoo.exe rel/
|
||||
cp lang.zoo rel/
|
||||
cp themes.zoo rel/
|
||||
cp sounds.zoo rel/
|
||||
cp charnames.txt rel/
|
||||
cp bin/wslbridge2.exe rel/
|
||||
cp bin/wslbridge2-backend rel/
|
||||
cp mkshortcut.vbs rel/
|
||||
#cp bin/mkshortcut.exe rel/
|
||||
#cp bin/cygpopt-0.dll rel/
|
||||
#cp bin/cygiconv-2.dll rel/
|
||||
#cp bin/cygintl-8.dll rel/
|
||||
cp LICENSE.* rel/
|
||||
cp VERSION rel/
|
||||
cp *.lnk rel/
|
||||
cp *.ico rel/
|
||||
cp *.url rel/
|
||||
cp *.bat rel/
|
||||
cp *.sh rel/
|
||||
cp *.vbs rel/
|
||||
CAB=wsltty-$(ver)-$(arch)
|
||||
|
||||
cab: cop
|
||||
copcab: ver
|
||||
mkdir -p $(CAB)
|
||||
cp bin/cygwin1.dll $(CAB)/
|
||||
cp bin/cygwin-console-helper.exe $(CAB)/
|
||||
cp bin/dash.exe $(CAB)/
|
||||
cp bin/regtool.exe $(CAB)/
|
||||
cp bin/mintty.exe $(CAB)/
|
||||
cp bin/zoo.exe $(CAB)/
|
||||
cp lang.zoo $(CAB)/
|
||||
cp themes.zoo $(CAB)/
|
||||
cp sounds.zoo $(CAB)/
|
||||
cp charnames.txt $(CAB)/
|
||||
cp bin/wslbridge2.exe $(CAB)/
|
||||
cp bin/wslbridge2-backend $(CAB)/
|
||||
cp mkshortcut.vbs $(CAB)/
|
||||
#cp bin/mkshortcut.exe $(CAB)/
|
||||
#cp bin/cygpopt-0.dll $(CAB)/
|
||||
#cp bin/cygiconv-2.dll $(CAB)/
|
||||
#cp bin/cygintl-8.dll $(CAB)/
|
||||
cp LICENSE.* $(CAB)/
|
||||
cp VERSION $(CAB)/
|
||||
cp *.lnk $(CAB)/
|
||||
cp *.ico $(CAB)/
|
||||
cp *.url $(CAB)/
|
||||
cp *.bat $(CAB)/
|
||||
cp config-distros.sh $(CAB)/
|
||||
cp mkshortcut.vbs $(CAB)/
|
||||
|
||||
cop: copcab
|
||||
mkdir -p rel
|
||||
cp -fl $(CAB)/* rel/
|
||||
|
||||
installer: cop cab normal-installer silent-installer
|
||||
|
||||
cab:
|
||||
# build cab archive
|
||||
lcab -r $(CAB) rel/$(CAB).cab
|
||||
|
||||
normal-installer:
|
||||
# prepare build of installer
|
||||
rm -f rel/$(CAB)-install.exe
|
||||
sed -e "s,%version%,$(ver)," -e "s,%arch%,$(arch)," makewinx.cfg > rel/wsltty.SED
|
||||
# build installer
|
||||
cd rel; iexpress /n wsltty.SED
|
||||
|
||||
silent-installer:
|
||||
# prepare build of installer
|
||||
rm -f rel/$(CAB)-install-quiet.exe
|
||||
cd rel; sed -e "/ShowInstallProgramWindow/ s/0/1/" -e "/HideExtractAnimation/ s/0/1/" -e "/InstallPrompt/ s/=.*/=/" -e "/FinishMessage/ s/=.*/=/" -e "/TargetName/ s/install.exe/install-quiet.exe/" wsltty.SED > wsltty-quiet.SED
|
||||
# build installer
|
||||
cd rel; iexpress /n wsltty-quiet.SED
|
||||
|
||||
install: cop installbat
|
||||
|
||||
installbat:
|
||||
@@ -262,8 +314,11 @@ mintty-usr: mintty-get mintty-appx
|
||||
# local wsltty build target:
|
||||
wsltty: wslbridge cygwin mintty-build mintty-pkg
|
||||
|
||||
# build software without installer:
|
||||
build: wslbridge cygwin mintty-get mintty-build mintty-pkg
|
||||
|
||||
# standalone wsltty package build target:
|
||||
pkg: wslbridge cygwin mintty-get mintty-build mintty-pkg cab
|
||||
pkg: wslbridge cygwin mintty-get mintty-build mintty-pkg installer
|
||||
|
||||
# appx package contents target:
|
||||
wsltty-appx: wslbridge appx-bin mintty-get mintty-build-appx mintty-appx
|
||||
|
||||
@@ -26,7 +26,7 @@ SourceFiles=SourceFiles
|
||||
InstallPrompt=Install Mintty terminal for WSL (Windows Subsystem for Linux)?
|
||||
DisplayLicense=
|
||||
FinishMessage=Mintty for WSL installed - for documentation and configuration see https://github.com/mintty/wsltty
|
||||
TargetName=wsltty-%version%-install-%arch%.exe
|
||||
TargetName=wsltty-%version%-%arch%-install.exe
|
||||
FriendlyName=wsltty
|
||||
AppLaunched=cmd.exe /c install.bat
|
||||
PostInstallCmd=<None>
|
||||
|
||||
Reference in New Issue
Block a user