1
0
mirror of https://github.com/mintty/wsltty.git synced 2025-11-08 02:51:52 +00:00

Compare commits

..

3 Commits
0.7.3 ... 0.7.4

Author SHA1 Message Date
mintty
a9a9ad5155 0.7.4 2017-01-27 14:49:23 +01:00
mintty
b4a26196eb add 'make help' and 'make wsltty' targets 2017-01-27 14:49:06 +01:00
mintty
4bca6510b5 include localization files 2017-01-06 16:47:13 +01:00
4 changed files with 51 additions and 13 deletions

View File

@@ -51,7 +51,10 @@ wsltty, Cygwin, MinGW/msys, Git for Windows, MinEd for Windows).
### Components ### ### Components ###
For mintty, see the [Mintty homepage](http://mintty.github.io/). For mintty, see the [Mintty homepage](http://mintty.github.io/),
then [Mintty manual page](http://mintty.github.io/mintty.1.html),
and the [Mintty Wiki](https://github.com/mintty/mintty/wiki),
including a [Hints and Tips page](https://github.com/mintty/mintty/wiki/Tips).
It is based on [Cygwin](http://cygwin.com) It is based on [Cygwin](http://cygwin.com)
and includes its runtime library ([sources](http://mirrors.dotsrc.org/cygwin/x86/release/cygwin)). and includes its runtime library ([sources](http://mirrors.dotsrc.org/cygwin/x86/release/cygwin)).

View File

@@ -31,6 +31,7 @@ copy cygwin1.dll "%installdir%\bin"
copy cygwin-console-helper.exe "%installdir%\bin" copy cygwin-console-helper.exe "%installdir%\bin"
rem copy dash.exe "%installdir%\bin" rem copy dash.exe "%installdir%\bin"
copy mintty.exe "%installdir%\bin" copy mintty.exe "%installdir%\bin"
copy zoo.exe "%installdir%\bin"
copy wslbridge.exe "%installdir%\bin" copy wslbridge.exe "%installdir%\bin"
copy wslbridge-backend "%installdir%\bin" copy wslbridge-backend "%installdir%\bin"
@@ -38,6 +39,12 @@ rem create "home directory" to enable storage of config file
mkdir "%installdir%\home mkdir "%installdir%\home
mkdir "%installdir%\home\%USERNAME%" mkdir "%installdir%\home\%USERNAME%"
rem create "config directory" and copy config archive
mkdir "%installdir%\home\%USERNAME%\.config"
mkdir "%installdir%\home\%USERNAME%\.config\mintty"
mkdir "%installdir%\home\%USERNAME%\.config\mintty\lang"
copy po.zoo "%installdir%\home\%USERNAME%\.config\mintty\lang"
:shortcuts :shortcuts
@@ -58,4 +65,11 @@ copy "WSL Bash %% in Mintty.lnk" "%USERPROFILE%\Desktop"
copy "WSL Bash ~ in Mintty.lnk" "%USERPROFILE%\Desktop" copy "WSL Bash ~ in Mintty.lnk" "%USERPROFILE%\Desktop"
:config
rem unpack config files
cd /D "%installdir%\home\%USERNAME%\.config\mintty\lang"
"%installdir%\bin\zoo" x po
:end :end

View File

@@ -3,11 +3,11 @@
all: check pkg all: check pkg
# wsltty release # wsltty release
ver=0.7.3 ver=0.7.4
# mintty release version # mintty release version
minver=2.7.3 minttyver=2.7.4
#minver=master #minttyver=master
# wslbridge backend version # wslbridge backend version
wslbridgever=0.2.1 wslbridgever=0.2.1
@@ -18,6 +18,12 @@ wslbridgever=0.2.1
# release 0.2.1 is updated and complete, no separate frontend build needed: # release 0.2.1 is updated and complete, no separate frontend build needed:
wslbridge-frontend= wslbridge-frontend=
help:
echo configure `ver=...` and `minttyver=` in this makefile
echo run `make` to build a distributable installer
echo run `make pkg` to build an installer, bypassing the system checks
echo run `make wsltty` to build an installer using the local copy of mintty
############################################################################# #############################################################################
# target checking and some defs # target checking and some defs
@@ -72,29 +78,36 @@ wslbridge-frontend:
cp wslbridge-master/out/wslbridge.exe bin/ cp wslbridge-master/out/wslbridge.exe bin/
cp wslbridge-master/LICENSE.txt LICENSE.wslbridge cp wslbridge-master/LICENSE.txt LICENSE.wslbridge
mintty: mintty: mintty-get mintty-build
$(wgeto) https://github.com/mintty/mintty/archive/$(minver).zip -o mintty-$(minver).zip
unzip -o mintty-$(minver).zip mintty-get:
cd mintty-$(minver)/src; make LDFLAGS="-static -static-libgcc -s" $(wgeto) https://github.com/mintty/mintty/archive/$(minttyver).zip -o mintty-$(minttyver).zip
unzip -o mintty-$(minttyver).zip
mintty-build:
cd mintty-$(minttyver)/src; make LDFLAGS="-static -static-libgcc -s"
mkdir -p bin mkdir -p bin
cp mintty-$(minver)/bin/mintty.exe bin/ cp mintty-$(minttyver)/bin/mintty.exe bin/
cp mintty-$(minver)/LICENSE LICENSE.mintty cp mintty-$(minttyver)/LICENSE LICENSE.mintty
cd mintty-$(minttyver)/lang; zoo a po *.po; mv po.zoo ../../
cygwin: cygwin:
mkdir -p bin mkdir -p bin
cp /bin/cygwin1.dll bin/ cp /bin/cygwin1.dll bin/
cp /bin/cygwin-console-helper.exe bin/ cp /bin/cygwin-console-helper.exe bin/
#cp /bin/dash.exe bin/ #cp /bin/dash.exe bin/
cp /bin/zoo.exe bin/
wsltty: cab:
pkg: wslbridge mintty cygwin wsltty
mkdir -p rel mkdir -p rel
rm -fr rel/wsltty-$(ver)-install.exe
sed -e "s,%version%,$(ver)," makewinx.cfg > rel/wsltty.SED sed -e "s,%version%,$(ver)," makewinx.cfg > rel/wsltty.SED
cp bin/cygwin1.dll rel/ cp bin/cygwin1.dll rel/
cp bin/cygwin-console-helper.exe rel/ cp bin/cygwin-console-helper.exe rel/
#cp bin/dash.exe rel/ #cp bin/dash.exe rel/
cp bin/mintty.exe rel/ cp bin/mintty.exe rel/
cp bin/zoo.exe rel/
cp po.zoo rel/
cp bin/wslbridge.exe rel/ cp bin/wslbridge.exe rel/
cp bin/wslbridge-backend rel/ cp bin/wslbridge-backend rel/
cp LICENSE.* rel/ cp LICENSE.* rel/
@@ -103,5 +116,9 @@ pkg: wslbridge mintty cygwin wsltty
cp *.bat rel/ cp *.bat rel/
cd rel; iexpress /n wsltty.SED cd rel; iexpress /n wsltty.SED
pkg: wslbridge cygwin mintty cab
wsltty: wslbridge cygwin mintty-build cab
############################################################################# #############################################################################
# end # end

View File

@@ -51,6 +51,8 @@ FILE15="config-context-menu.bat"
FILE16="add to context menu.lnk" FILE16="add to context menu.lnk"
FILE17="remove from context menu.lnk" FILE17="remove from context menu.lnk"
FILE18="wsltty home & help.url" FILE18="wsltty home & help.url"
FILE19="zoo.exe"
FILE20="po.zoo"
[SourceFiles] [SourceFiles]
SourceFiles0=. SourceFiles0=.
@@ -75,4 +77,6 @@ SourceFiles0=.
%FILE16%= %FILE16%=
%FILE17%= %FILE17%=
%FILE18%= %FILE18%=
%FILE19%=
%FILE20%=