AuroraMiddleware/winpty
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
f678472b51
winpty/Makefile

167 lines
4.6 KiB
Makefile
Raw Normal View History

Add an "implicit copyright grant" notice; update copyright notices
2015-11-08 06:37:25 +00:00
# Copyright (c) 2011-2015 Ryan Prichard
Add an MIT copyright notice to all the source files.
2012-03-23 10:11:34 +00:00
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to
# deal in the Software without restriction, including without limitation the
# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
# sell copies of the Software, and to permit persons to whom the Software is
# furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice shall be included in
# all copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
# IN THE SOFTWARE.
Convert the makefiles from recursive to non-recursive * This change reduces the total build time from about 14 seconds to about 9 seconds on my computer. Also: * Consolidate all the intermediate files into the build directory to reduces clutter. * Allow specifying UNIX_ADAPTER_EXE to make. Perhaps this will be helpful to the MSYS2 fork, which renames console.exe to winpty.exe. (I like the renaming, but I don't know about the other winpty users. Maybe I'll make the change after I've put out another stable release...) * Rename the WINPTY define to COMPILING_WINPTY_DLL define. The longer name is clearer. I define the macro inside libwinpty/winpty.cc, so the build system no longer needs to. (I removed the define from winpty.gyp.) * Consolidate config-unix.mk and config-mingw.mk into config.mk. The separation was previously necessary because each file had a conflicting definition of CXX. * Rename the UNIX_LDFLAGS_STATIC_LIBSTDCXX macro to UNIX_LDFLAGS_STATIC, because libstdc++ isn't the only thing I'm linking statically.
2015-11-07 04:08:24 +00:00
# Use make -n to see the actual command-lines make would run.
Makefile: stop reading environ variables and avoid spawning processes The variables can be specified on the make command-line instead, and the user could have unrelated variables that happen to have the name winpty is using. I verified that MSYS2 is passing UNIX_ADAPTER_EXE and PREFIX on the command-line. ship/ship.py already passes PREFIX on the command-line. Previously, for each object file, the Makefile spawned a subprocess for each of: echo, mkdir, dirname, and git. Most of these can be eliminated: - echo: The gmake function $(info ...) is mostly good enough -- it affects the --dry-run/-n output, which might be undesired. - mkdir: We only need to invoke mkdir once per directory. It's tricky to get the optimal behavior, but it's possible to do better than before. - dirname: The gmake function $(dir ...) is good enough. - git: only needed once per build, to get the commit hash.
2016-02-26 10:21:22 +00:00
# The default "make install" prefix is /usr/local. Pass PREFIX=<path> on the
# command-line to override the default.
Compile each target's source files separately from other targets. The gyp file already worked this way, but now the Makefile does too. The motivation is to let the shared source files have different error handling behavior (e.g. assert/ASSERT/stderr-print/abort/exception) in winpty.dll and the other targets.
2016-02-29 09:27:26 +00:00
.SECONDEXPANSION :
Install dev files (importlib, headers) and docs, localize PHONY deps
2016-04-05 07:20:06 +00:00
.PHONY : default
Convert the makefiles from recursive to non-recursive * This change reduces the total build time from about 14 seconds to about 9 seconds on my computer. Also: * Consolidate all the intermediate files into the build directory to reduces clutter. * Allow specifying UNIX_ADAPTER_EXE to make. Perhaps this will be helpful to the MSYS2 fork, which renames console.exe to winpty.exe. (I like the renaming, but I don't know about the other winpty users. Maybe I'll make the change after I've put out another stable release...) * Rename the WINPTY define to COMPILING_WINPTY_DLL define. The longer name is clearer. I define the macro inside libwinpty/winpty.cc, so the build system no longer needs to. (I removed the define from winpty.gyp.) * Consolidate config-unix.mk and config-mingw.mk into config.mk. The separation was previously necessary because each file had a conflicting definition of CXX. * Rename the UNIX_LDFLAGS_STATIC_LIBSTDCXX macro to UNIX_LDFLAGS_STATIC, because libstdc++ isn't the only thing I'm linking statically.
2015-11-07 04:08:24 +00:00
default : all
Makefile: stop reading environ variables and avoid spawning processes The variables can be specified on the make command-line instead, and the user could have unrelated variables that happen to have the name winpty is using. I verified that MSYS2 is passing UNIX_ADAPTER_EXE and PREFIX on the command-line. ship/ship.py already passes PREFIX on the command-line. Previously, for each object file, the Makefile spawned a subprocess for each of: echo, mkdir, dirname, and git. Most of these can be eliminated: - echo: The gmake function $(info ...) is mostly good enough -- it affects the --dry-run/-n output, which might be undesired. - mkdir: We only need to invoke mkdir once per directory. It's tricky to get the optimal behavior, but it's possible to do better than before. - dirname: The gmake function $(dir ...) is good enough. - git: only needed once per build, to get the commit hash.
2016-02-26 10:21:22 +00:00
PREFIX := /usr/local
Rename the UNIX adapter from console.exe to winpty.exe. There are three reasons for this change: * It's consistent with MSYS2, which already renamed console.exe to winpty.exe. * winpty.exe is less likely to clash with another program. * winpty.exe is easier to search for online. If someone unfamiliar with winpty is asked to run console.exe, they might have a hard time figuring out where console.exe comes from. The old behavior can be restored by passing UNIX_ADAPTER_EXE=console.exe to `make`, or by simply renaming the binary after-the-fact, or with `alias`, etc.
2016-04-05 07:36:06 +00:00
UNIX_ADAPTER_EXE := winpty.exe
Makefile: stop reading environ variables and avoid spawning processes The variables can be specified on the make command-line instead, and the user could have unrelated variables that happen to have the name winpty is using. I verified that MSYS2 is passing UNIX_ADAPTER_EXE and PREFIX on the command-line. ship/ship.py already passes PREFIX on the command-line. Previously, for each object file, the Makefile spawned a subprocess for each of: echo, mkdir, dirname, and git. Most of these can be eliminated: - echo: The gmake function $(info ...) is mostly good enough -- it affects the --dry-run/-n output, which might be undesired. - mkdir: We only need to invoke mkdir once per directory. It's tricky to get the optimal behavior, but it's possible to do better than before. - dirname: The gmake function $(dir ...) is good enough. - git: only needed once per build, to get the commit hash.
2016-02-26 10:21:22 +00:00
MINGW_ENABLE_CXX11_FLAG := -std=c++11
Use precompiled headers when compiling with GCC. The unix-adapter doesn't use PCH, because MSYS1's compiler doesn't support them.
2016-02-29 10:33:42 +00:00
USE_PCH := 1
Makefile: stop reading environ variables and avoid spawning processes The variables can be specified on the make command-line instead, and the user could have unrelated variables that happen to have the name winpty is using. I verified that MSYS2 is passing UNIX_ADAPTER_EXE and PREFIX on the command-line. ship/ship.py already passes PREFIX on the command-line. Previously, for each object file, the Makefile spawned a subprocess for each of: echo, mkdir, dirname, and git. Most of these can be eliminated: - echo: The gmake function $(info ...) is mostly good enough -- it affects the --dry-run/-n output, which might be undesired. - mkdir: We only need to invoke mkdir once per directory. It's tricky to get the optimal behavior, but it's possible to do better than before. - dirname: The gmake function $(dir ...) is good enough. - git: only needed once per build, to get the commit hash.
2016-02-26 10:21:22 +00:00
COMMON_CXXFLAGS :=
UNIX_CXXFLAGS :=
MINGW_CXXFLAGS :=
MINGW_LDFLAGS :=
UNIX_LDFLAGS :=
Convert the makefiles from recursive to non-recursive * This change reduces the total build time from about 14 seconds to about 9 seconds on my computer. Also: * Consolidate all the intermediate files into the build directory to reduces clutter. * Allow specifying UNIX_ADAPTER_EXE to make. Perhaps this will be helpful to the MSYS2 fork, which renames console.exe to winpty.exe. (I like the renaming, but I don't know about the other winpty users. Maybe I'll make the change after I've put out another stable release...) * Rename the WINPTY define to COMPILING_WINPTY_DLL define. The longer name is clearer. I define the macro inside libwinpty/winpty.cc, so the build system no longer needs to. (I removed the define from winpty.gyp.) * Consolidate config-unix.mk and config-mingw.mk into config.mk. The separation was previously necessary because each file had a conflicting definition of CXX. * Rename the UNIX_LDFLAGS_STATIC_LIBSTDCXX macro to UNIX_LDFLAGS_STATIC, because libstdc++ isn't the only thing I'm linking statically.
2015-11-07 04:08:24 +00:00
# Include config.mk but complain if it hasn't been created yet.
ifeq "$(wildcard config.mk)" ""
$(error config.mk does not exist. Please run ./configure)
endif
include config.mk
Add version tracking. Add a --version arg to console and winpty-agent. There is a "version suffix" that defaults to "-dev". A maintainer could change the suffix (or remove it) by invoking make: make BUILD_SUFFIX=-foo make BUILD_SUFFIX= It can also be changed in gyp builds: gyp winpty.gyp --depth=1 -D BUILD_SUFFIX=-foo gyp winpty.gyp --depth=1 -D BUILD_SUFFIX= If git cannot be executed, the string "none" is used for the commit hash.
2015-11-08 03:19:03 +00:00
COMMON_CXXFLAGS += \
Convert the makefiles from recursive to non-recursive * This change reduces the total build time from about 14 seconds to about 9 seconds on my computer. Also: * Consolidate all the intermediate files into the build directory to reduces clutter. * Allow specifying UNIX_ADAPTER_EXE to make. Perhaps this will be helpful to the MSYS2 fork, which renames console.exe to winpty.exe. (I like the renaming, but I don't know about the other winpty users. Maybe I'll make the change after I've put out another stable release...) * Rename the WINPTY define to COMPILING_WINPTY_DLL define. The longer name is clearer. I define the macro inside libwinpty/winpty.cc, so the build system no longer needs to. (I removed the define from winpty.gyp.) * Consolidate config-unix.mk and config-mingw.mk into config.mk. The separation was previously necessary because each file had a conflicting definition of CXX. * Rename the UNIX_LDFLAGS_STATIC_LIBSTDCXX macro to UNIX_LDFLAGS_STATIC, because libstdc++ isn't the only thing I'm linking statically.
2015-11-07 04:08:24 +00:00
-MMD -Wall \
-DUNICODE \
-D_UNICODE \
Build system: redo how version number tracking works * Remove the "version suffix" and BUILD_INFO.txt mechanisms, which I believe no one uses except winpty itself. Instead, a suffix can be added in the VERSION.txt file. * Instead of passing the version and commit info as a preprocessor macro when building every C++ file, write the info into a GenVersion.h header that is only included by WinptyVersion.cc. * Instead of writing a BUILD_INFO.txt in ship.py, pass COMMIT_HASH=<hash> to make. These changes accomplish two things: * People who build a tag from source won't see a "<ver>-dev" suffix anymore. * Changing the version or the commit will correctly rebuild the version object files (and only those object files). It will also relink every binary. Fixes https://github.com/rprichard/winpty/issues/72
2017-01-18 05:39:14 +00:00
-D_WIN32_WINNT=0x0501 \
-Ibuild/gen
Add version tracking. Add a --version arg to console and winpty-agent. There is a "version suffix" that defaults to "-dev". A maintainer could change the suffix (or remove it) by invoking make: make BUILD_SUFFIX=-foo make BUILD_SUFFIX= It can also be changed in gyp builds: gyp winpty.gyp --depth=1 -D BUILD_SUFFIX=-foo gyp winpty.gyp --depth=1 -D BUILD_SUFFIX= If git cannot be executed, the string "none" is used for the commit hash.
2015-11-08 03:19:03 +00:00
UNIX_CXXFLAGS += \
$(COMMON_CXXFLAGS)
MINGW_CXXFLAGS += \
$(COMMON_CXXFLAGS) \
Enable C++11 mode and re-enable C++ exception handling.
2016-02-26 07:20:31 +00:00
-O2 \
$(MINGW_ENABLE_CXX11_FLAG)
add "install" Makefile target
2012-07-11 18:50:51 +00:00
Convert the makefiles from recursive to non-recursive * This change reduces the total build time from about 14 seconds to about 9 seconds on my computer. Also: * Consolidate all the intermediate files into the build directory to reduces clutter. * Allow specifying UNIX_ADAPTER_EXE to make. Perhaps this will be helpful to the MSYS2 fork, which renames console.exe to winpty.exe. (I like the renaming, but I don't know about the other winpty users. Maybe I'll make the change after I've put out another stable release...) * Rename the WINPTY define to COMPILING_WINPTY_DLL define. The longer name is clearer. I define the macro inside libwinpty/winpty.cc, so the build system no longer needs to. (I removed the define from winpty.gyp.) * Consolidate config-unix.mk and config-mingw.mk into config.mk. The separation was previously necessary because each file had a conflicting definition of CXX. * Rename the UNIX_LDFLAGS_STATIC_LIBSTDCXX macro to UNIX_LDFLAGS_STATIC, because libstdc++ isn't the only thing I'm linking statically.
2015-11-07 04:08:24 +00:00
MINGW_LDFLAGS += -static -static-libgcc -static-libstdc++
UNIX_LDFLAGS += $(UNIX_LDFLAGS_STATIC)
Work on switching from qmake to makefiles and reorganize code a little. My plan now is to integrate the PseudoConsole with Cygwin and MSYS ptys, with initial focus on Cygwin. I think I'll keep the separate Agent and DLL binaries, and they'll continue to be native Win32 binaries. I don't want to have two build systems (qmake vs whatever MSYS/Cygwin uses), and since I'd like to remove the Qt dependency anyway, I'm trying to switch to makefiles.
2012-01-22 01:30:41 +00:00
Use precompiled headers when compiling with GCC. The unix-adapter doesn't use PCH, because MSYS1's compiler doesn't support them.
2016-02-29 10:33:42 +00:00
ifeq "$(USE_PCH)" "1"
MINGW_CXXFLAGS += -include build/mingw/PrecompiledHeader.h
PCH_DEP := build/mingw/PrecompiledHeader.h.gch
else
PCH_DEP :=
endif
Build system: redo how version number tracking works * Remove the "version suffix" and BUILD_INFO.txt mechanisms, which I believe no one uses except winpty itself. Instead, a suffix can be added in the VERSION.txt file. * Instead of passing the version and commit info as a preprocessor macro when building every C++ file, write the info into a GenVersion.h header that is only included by WinptyVersion.cc. * Instead of writing a BUILD_INFO.txt in ship.py, pass COMMIT_HASH=<hash> to make. These changes accomplish two things: * People who build a tag from source won't see a "<ver>-dev" suffix anymore. * Changing the version or the commit will correctly rebuild the version object files (and only those object files). It will also relink every binary. Fixes https://github.com/rprichard/winpty/issues/72
2017-01-18 05:39:14 +00:00
build/gen/GenVersion.h : VERSION.txt $(COMMIT_HASH_DEP) | $$(@D)/.mkdir
$(info Updating build/gen/GenVersion.h)
@echo "const char GenVersion_Version[] = \"$(shell cat VERSION.txt | tr -d '\r\n')\";" > build/gen/GenVersion.h
@echo "const char GenVersion_Commit[] = \"$(COMMIT_HASH)\";" >> build/gen/GenVersion.h
Use precompiled headers when compiling with GCC. The unix-adapter doesn't use PCH, because MSYS1's compiler doesn't support them.
2016-02-29 10:33:42 +00:00
build/mingw/PrecompiledHeader.h : src/shared/PrecompiledHeader.h | $$(@D)/.mkdir
$(info Copying $< to $@)
@cp $< $@
build/mingw/PrecompiledHeader.h.gch : build/mingw/PrecompiledHeader.h | $$(@D)/.mkdir
$(info Compiling $<)
@$(MINGW_CXX) $(MINGW_CXXFLAGS) -c -o $@ $<
-include build/mingw/PrecompiledHeader.h.d
Compile each target's source files separately from other targets. The gyp file already worked this way, but now the Makefile does too. The motivation is to let the shared source files have different error handling behavior (e.g. assert/ASSERT/stderr-print/abort/exception) in winpty.dll and the other targets.
2016-02-29 09:27:26 +00:00
define def_unix_target
Build system: redo how version number tracking works * Remove the "version suffix" and BUILD_INFO.txt mechanisms, which I believe no one uses except winpty itself. Instead, a suffix can be added in the VERSION.txt file. * Instead of passing the version and commit info as a preprocessor macro when building every C++ file, write the info into a GenVersion.h header that is only included by WinptyVersion.cc. * Instead of writing a BUILD_INFO.txt in ship.py, pass COMMIT_HASH=<hash> to make. These changes accomplish two things: * People who build a tag from source won't see a "<ver>-dev" suffix anymore. * Changing the version or the commit will correctly rebuild the version object files (and only those object files). It will also relink every binary. Fixes https://github.com/rprichard/winpty/issues/72
2017-01-18 05:39:14 +00:00
build/$1/%.o : src/%.cc | $$$$(@D)/.mkdir
Compile each target's source files separately from other targets. The gyp file already worked this way, but now the Makefile does too. The motivation is to let the shared source files have different error handling behavior (e.g. assert/ASSERT/stderr-print/abort/exception) in winpty.dll and the other targets.
2016-02-29 09:27:26 +00:00
$$(info Compiling $$<)
@$$(UNIX_CXX) $$(UNIX_CXXFLAGS) $2 -I src/include -c -o $$@ $$<
endef
define def_mingw_target
Build system: redo how version number tracking works * Remove the "version suffix" and BUILD_INFO.txt mechanisms, which I believe no one uses except winpty itself. Instead, a suffix can be added in the VERSION.txt file. * Instead of passing the version and commit info as a preprocessor macro when building every C++ file, write the info into a GenVersion.h header that is only included by WinptyVersion.cc. * Instead of writing a BUILD_INFO.txt in ship.py, pass COMMIT_HASH=<hash> to make. These changes accomplish two things: * People who build a tag from source won't see a "<ver>-dev" suffix anymore. * Changing the version or the commit will correctly rebuild the version object files (and only those object files). It will also relink every binary. Fixes https://github.com/rprichard/winpty/issues/72
2017-01-18 05:39:14 +00:00
build/$1/%.o : src/%.cc $$(PCH_DEP) | $$$$(@D)/.mkdir
Compile each target's source files separately from other targets. The gyp file already worked this way, but now the Makefile does too. The motivation is to let the shared source files have different error handling behavior (e.g. assert/ASSERT/stderr-print/abort/exception) in winpty.dll and the other targets.
2016-02-29 09:27:26 +00:00
$$(info Compiling $$<)
@$$(MINGW_CXX) $$(MINGW_CXXFLAGS) $2 -I src/include -c -o $$@ $$<
endef
Move source files into a src subdirectory. Fixes https://github.com/rprichard/winpty/issues/51
2015-11-29 09:50:06 +00:00
include src/subdir.mk
Convert the makefiles from recursive to non-recursive * This change reduces the total build time from about 14 seconds to about 9 seconds on my computer. Also: * Consolidate all the intermediate files into the build directory to reduces clutter. * Allow specifying UNIX_ADAPTER_EXE to make. Perhaps this will be helpful to the MSYS2 fork, which renames console.exe to winpty.exe. (I like the renaming, but I don't know about the other winpty users. Maybe I'll make the change after I've put out another stable release...) * Rename the WINPTY define to COMPILING_WINPTY_DLL define. The longer name is clearer. I define the macro inside libwinpty/winpty.cc, so the build system no longer needs to. (I removed the define from winpty.gyp.) * Consolidate config-unix.mk and config-mingw.mk into config.mk. The separation was previously necessary because each file had a conflicting definition of CXX. * Rename the UNIX_LDFLAGS_STATIC_LIBSTDCXX macro to UNIX_LDFLAGS_STATIC, because libstdc++ isn't the only thing I'm linking statically.
2015-11-07 04:08:24 +00:00
Install dev files (importlib, headers) and docs, localize PHONY deps
2016-04-05 07:20:06 +00:00
.PHONY : all
Convert the makefiles from recursive to non-recursive * This change reduces the total build time from about 14 seconds to about 9 seconds on my computer. Also: * Consolidate all the intermediate files into the build directory to reduces clutter. * Allow specifying UNIX_ADAPTER_EXE to make. Perhaps this will be helpful to the MSYS2 fork, which renames console.exe to winpty.exe. (I like the renaming, but I don't know about the other winpty users. Maybe I'll make the change after I've put out another stable release...) * Rename the WINPTY define to COMPILING_WINPTY_DLL define. The longer name is clearer. I define the macro inside libwinpty/winpty.cc, so the build system no longer needs to. (I removed the define from winpty.gyp.) * Consolidate config-unix.mk and config-mingw.mk into config.mk. The separation was previously necessary because each file had a conflicting definition of CXX. * Rename the UNIX_LDFLAGS_STATIC_LIBSTDCXX macro to UNIX_LDFLAGS_STATIC, because libstdc++ isn't the only thing I'm linking statically.
2015-11-07 04:08:24 +00:00
all : $(ALL_TARGETS)
Install dev files (importlib, headers) and docs, localize PHONY deps
2016-04-05 07:20:06 +00:00
.PHONY : tests
Convert the makefiles from recursive to non-recursive * This change reduces the total build time from about 14 seconds to about 9 seconds on my computer. Also: * Consolidate all the intermediate files into the build directory to reduces clutter. * Allow specifying UNIX_ADAPTER_EXE to make. Perhaps this will be helpful to the MSYS2 fork, which renames console.exe to winpty.exe. (I like the renaming, but I don't know about the other winpty users. Maybe I'll make the change after I've put out another stable release...) * Rename the WINPTY define to COMPILING_WINPTY_DLL define. The longer name is clearer. I define the macro inside libwinpty/winpty.cc, so the build system no longer needs to. (I removed the define from winpty.gyp.) * Consolidate config-unix.mk and config-mingw.mk into config.mk. The separation was previously necessary because each file had a conflicting definition of CXX. * Rename the UNIX_LDFLAGS_STATIC_LIBSTDCXX macro to UNIX_LDFLAGS_STATIC, because libstdc++ isn't the only thing I'm linking statically.
2015-11-07 04:08:24 +00:00
tests : $(TEST_PROGRAMS)
Add a test program.
2015-08-23 23:02:23 +00:00
Install dev files (importlib, headers) and docs, localize PHONY deps
2016-04-05 07:20:06 +00:00
.PHONY : install-bin
install-bin : all
add "install" Makefile target
2012-07-11 18:50:51 +00:00
mkdir -p $(PREFIX)/bin
Convert the makefiles from recursive to non-recursive * This change reduces the total build time from about 14 seconds to about 9 seconds on my computer. Also: * Consolidate all the intermediate files into the build directory to reduces clutter. * Allow specifying UNIX_ADAPTER_EXE to make. Perhaps this will be helpful to the MSYS2 fork, which renames console.exe to winpty.exe. (I like the renaming, but I don't know about the other winpty users. Maybe I'll make the change after I've put out another stable release...) * Rename the WINPTY define to COMPILING_WINPTY_DLL define. The longer name is clearer. I define the macro inside libwinpty/winpty.cc, so the build system no longer needs to. (I removed the define from winpty.gyp.) * Consolidate config-unix.mk and config-mingw.mk into config.mk. The separation was previously necessary because each file had a conflicting definition of CXX. * Rename the UNIX_LDFLAGS_STATIC_LIBSTDCXX macro to UNIX_LDFLAGS_STATIC, because libstdc++ isn't the only thing I'm linking statically.
2015-11-07 04:08:24 +00:00
install -m 755 -p -s build/$(UNIX_ADAPTER_EXE) $(PREFIX)/bin
List "make install" files explicitly and use install tool * Previously, "make tests install" would also copy trivial_test.exe and trivial_test.d to /usr/local/bin. * The `install` tool seems to be the conventional way of installing files. Setting permissions when copying to /usr/local/bin seems like a good idea. * Invoke install with -s to strip the symbol tables when they're installed.
2015-10-15 21:47:00 +00:00
install -m 755 -p -s build/winpty.dll $(PREFIX)/bin
install -m 755 -p -s build/winpty-agent.exe $(PREFIX)/bin
Install dev files (importlib, headers) and docs, localize PHONY deps
2016-04-05 07:20:06 +00:00
.PHONY : install-debugserver
install-debugserver : all
mkdir -p $(PREFIX)/bin
List "make install" files explicitly and use install tool * Previously, "make tests install" would also copy trivial_test.exe and trivial_test.d to /usr/local/bin. * The `install` tool seems to be the conventional way of installing files. Setting permissions when copying to /usr/local/bin seems like a good idea. * Invoke install with -s to strip the symbol tables when they're installed.
2015-10-15 21:47:00 +00:00
install -m 755 -p -s build/winpty-debugserver.exe $(PREFIX)/bin
add "install" Makefile target
2012-07-11 18:50:51 +00:00
Install dev files (importlib, headers) and docs, localize PHONY deps
2016-04-05 07:20:06 +00:00
.PHONY : install-lib
install-lib : all
mkdir -p $(PREFIX)/lib
install -m 644 -p build/winpty.lib $(PREFIX)/lib
.PHONY : install-doc
install-doc :
mkdir -p $(PREFIX)/share/doc/winpty
install -m 644 -p LICENSE $(PREFIX)/share/doc/winpty
install -m 644 -p README.md $(PREFIX)/share/doc/winpty
install -m 644 -p RELEASES.md $(PREFIX)/share/doc/winpty
.PHONY : install-include
install-include :
mkdir -p $(PREFIX)/include/winpty
install -m 644 -p src/include/winpty.h $(PREFIX)/include/winpty
Replace the libwinpty API. The new API improves upon the old API in a number of ways: * The old API provided a single data pipe for input and output, and it provided the pipe in the form of a HANDLE opened with FILE_FLAG_OVERLAPPED. Using a bare HANDLE is difficult in higher-level languages, and overlapped/asynchronous I/O is hard to get right. winpty_close closed the data pipe, which also didn't help things, though I think the handle could have been duplicated. Using a single handle for input and output complicates shutdown. When the child process exits, the agent scrapes the final output, then closes the data pipe once its written. It's possible that a winpty client will first detect the closed pipe when it's writing *input* rather than reading output, which seems wrong. (On the other hand, the agent doesn't implement "backpressure" for either input or output (yet), and if it did, it's possible that post-exit shutdown should interrupt a blocked write into the console input queue. I need to think about it more.) The new API splits the data pipe into CONIN and CONOUT pipes, which are accessed by filename. After `winpty_open` returns, the client queries pipe names using `winpty_conin_name` and `winpty_conout_name`, then opens them using any mechanism, low-level or high-level, blocking or overlapped. * The old libwinpty handled errors by killing the process. The new libwinpty uses C++ exceptions internally and translates exceptions at API boundaries using: - a boolean error result (e.g. BOOL, NULL-vs-non-NULL) - a potentially heap-allocated winpty_error_t object returned via an optional winpty_error_ptr_t parameter. That parameter can be NULL. If it isn't, then an error code and message can be queried from the error object. The winpty_error_t object must be freed with winpty_error_free. * winpty_start_process is renamed to winpty_spawn. winpty_open and winpty_spawn accept a "config" object which holds parameters. New configuration options can be added without disturbing the source or binary API. * The winpty_get_exit_code and winpty_get_process_id APIs are removed. The winpty_spawn function has an out parameter providing the child's process and thread HANDLEs (duplicated from the agent via DuplicateHandle). The winpty client can call GetExitCodeProcess and GetProcessId (as well as the WaitForXXX APIs to wait for child exit).
2016-05-26 00:49:45 +00:00
install -m 644 -p src/include/winpty_constants.h $(PREFIX)/include/winpty
Install dev files (importlib, headers) and docs, localize PHONY deps
2016-04-05 07:20:06 +00:00
.PHONY : install
install : \
install-bin \
install-debugserver \
install-lib \
install-doc \
install-include
.PHONY : clean
Work on switching from qmake to makefiles and reorganize code a little. My plan now is to integrate the PseudoConsole with Cygwin and MSYS ptys, with initial focus on Cygwin. I think I'll keep the separate Agent and DLL binaries, and they'll continue to be native Win32 binaries. I don't want to have two build systems (qmake vs whatever MSYS/Cygwin uses), and since I'd like to remove the Qt dependency anyway, I'm trying to switch to makefiles.
2012-01-22 01:30:41 +00:00
clean :
Convert the makefiles from recursive to non-recursive * This change reduces the total build time from about 14 seconds to about 9 seconds on my computer. Also: * Consolidate all the intermediate files into the build directory to reduces clutter. * Allow specifying UNIX_ADAPTER_EXE to make. Perhaps this will be helpful to the MSYS2 fork, which renames console.exe to winpty.exe. (I like the renaming, but I don't know about the other winpty users. Maybe I'll make the change after I've put out another stable release...) * Rename the WINPTY define to COMPILING_WINPTY_DLL define. The longer name is clearer. I define the macro inside libwinpty/winpty.cc, so the build system no longer needs to. (I removed the define from winpty.gyp.) * Consolidate config-unix.mk and config-mingw.mk into config.mk. The separation was previously necessary because each file had a conflicting definition of CXX. * Rename the UNIX_LDFLAGS_STATIC_LIBSTDCXX macro to UNIX_LDFLAGS_STATIC, because libstdc++ isn't the only thing I'm linking statically.
2015-11-07 04:08:24 +00:00
rm -fr build
Add a distclean target that removes the files configure creates.
2012-04-17 16:50:19 +00:00
Build/package winpty for embedding using gyp and MSVC
2016-06-02 01:01:37 +00:00
.PHONY : clean-msvc
clean-msvc :
Build system: redo how version number tracking works * Remove the "version suffix" and BUILD_INFO.txt mechanisms, which I believe no one uses except winpty itself. Instead, a suffix can be added in the VERSION.txt file. * Instead of passing the version and commit info as a preprocessor macro when building every C++ file, write the info into a GenVersion.h header that is only included by WinptyVersion.cc. * Instead of writing a BUILD_INFO.txt in ship.py, pass COMMIT_HASH=<hash> to make. These changes accomplish two things: * People who build a tag from source won't see a "<ver>-dev" suffix anymore. * Changing the version or the commit will correctly rebuild the version object files (and only those object files). It will also relink every binary. Fixes https://github.com/rprichard/winpty/issues/72
2017-01-18 05:39:14 +00:00
rm -fr src/Default src/Release src/.vs src/gen
Add a clean-msvs target for cleaning up after gyp and VisualStudio/msbuild
2016-02-29 08:59:35 +00:00
rm -f src/*.vcxproj src/*.vcxproj.filters src/*.sln src/*.sdf
Install dev files (importlib, headers) and docs, localize PHONY deps
2016-04-05 07:20:06 +00:00
.PHONY : distclean
Add a distclean target that removes the files configure creates.
2012-04-17 16:50:19 +00:00
distclean : clean
Convert the makefiles from recursive to non-recursive * This change reduces the total build time from about 14 seconds to about 9 seconds on my computer. Also: * Consolidate all the intermediate files into the build directory to reduces clutter. * Allow specifying UNIX_ADAPTER_EXE to make. Perhaps this will be helpful to the MSYS2 fork, which renames console.exe to winpty.exe. (I like the renaming, but I don't know about the other winpty users. Maybe I'll make the change after I've put out another stable release...) * Rename the WINPTY define to COMPILING_WINPTY_DLL define. The longer name is clearer. I define the macro inside libwinpty/winpty.cc, so the build system no longer needs to. (I removed the define from winpty.gyp.) * Consolidate config-unix.mk and config-mingw.mk into config.mk. The separation was previously necessary because each file had a conflicting definition of CXX. * Rename the UNIX_LDFLAGS_STATIC_LIBSTDCXX macro to UNIX_LDFLAGS_STATIC, because libstdc++ isn't the only thing I'm linking statically.
2015-11-07 04:08:24 +00:00
rm -f config.mk
Makefile: stop reading environ variables and avoid spawning processes The variables can be specified on the make command-line instead, and the user could have unrelated variables that happen to have the name winpty is using. I verified that MSYS2 is passing UNIX_ADAPTER_EXE and PREFIX on the command-line. ship/ship.py already passes PREFIX on the command-line. Previously, for each object file, the Makefile spawned a subprocess for each of: echo, mkdir, dirname, and git. Most of these can be eliminated: - echo: The gmake function $(info ...) is mostly good enough -- it affects the --dry-run/-n output, which might be undesired. - mkdir: We only need to invoke mkdir once per directory. It's tricky to get the optimal behavior, but it's possible to do better than before. - dirname: The gmake function $(dir ...) is good enough. - git: only needed once per build, to get the commit hash.
2016-02-26 10:21:22 +00:00
.PRECIOUS : %.mkdir
%.mkdir :
Output a line each time a directory is created. This might be helpful in diagnosing the directory creation logic in the Makefile, which is obscure. *Might* be related to https://github.com/rprichard/winpty/issues/71
2016-04-06 23:53:31 +00:00
$(info Creating directory $(dir $@))
Makefile: stop reading environ variables and avoid spawning processes The variables can be specified on the make command-line instead, and the user could have unrelated variables that happen to have the name winpty is using. I verified that MSYS2 is passing UNIX_ADAPTER_EXE and PREFIX on the command-line. ship/ship.py already passes PREFIX on the command-line. Previously, for each object file, the Makefile spawned a subprocess for each of: echo, mkdir, dirname, and git. Most of these can be eliminated: - echo: The gmake function $(info ...) is mostly good enough -- it affects the --dry-run/-n output, which might be undesired. - mkdir: We only need to invoke mkdir once per directory. It's tricky to get the optimal behavior, but it's possible to do better than before. - dirname: The gmake function $(dir ...) is good enough. - git: only needed once per build, to get the commit hash.
2016-02-26 10:21:22 +00:00
@mkdir -p $(dir $@)
@touch $@
Try to fix an issue where make fails if a header file disappears Currently, when a header file is removed (or renamed), there is a stale dependency file still referring to the header, and GNU make aborts, because the header is missing. Attempt to work around this by adding a pattern rule to generate any header in `src/`. The rule prints a warning message. The C source file whose header was missing will be recompiled because a dependency was rebuilt. Once it is, the removed header should be removed from the dependency file. (Aside: FWIW, the "ninja" build tool knows directly about depfiles, and it does not have this problem.)
2016-02-29 08:58:30 +00:00
src/%.h :
@echo "Missing header file $@ (stale dependency file?)"
Reference in New Issue Copy Permalink