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

Move the three output binaries into a build directory.

Browse Source
This commit is contained in:
Ryan Prichard 2012-03-21 00:13:46 -07:00
parent 4cfb5e1c73
commit 0afc69c733
5 changed files with 9 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
agent/Makefile
View File

@ -1,7 +1,7 @@
include ../config.mk include ../config.mk
include ../config-mingw.mk include ../config-mingw.mk
PROGRAM = pconsole-agent PROGRAM = ../build/pconsole-agent.exe
OBJECTS = \ OBJECTS = \
EventLoop.o \ EventLoop.o \

2
build/.placeholder Normal file
View File

@ -0,0 +1,2 @@
This version-controlled file exists so that git creates the otherwise-empty
build directory on checkout.

2
libpconsole/Makefile
View File

@ -1,7 +1,7 @@
include ../config.mk include ../config.mk
include ../config-mingw.mk include ../config-mingw.mk
LIBRARY = pconsole.dll LIBRARY = ../build/pconsole.dll
OBJECTS = pconsole.o PConsoleDebugClient.o OBJECTS = pconsole.o PConsoleDebugClient.o
LDFLAGS += -shared -static-libgcc -static-libstdc++ LDFLAGS += -shared -static-libgcc -static-libstdc++

27
libpconsole/pconsole.cc
View File

@ -56,15 +56,6 @@ static std::wstring dirname(const std::wstring &path)
return path.substr(0, pos); return path.substr(0, pos);
} }
static std::wstring basename(const std::wstring &path)
{
std::wstring::size_type pos = path.find_last_of(L"\\/");
if (pos == std::wstring::npos)
return path;
else
return path.substr(pos + 1);
}
static bool pathExists(const std::wstring &path) static bool pathExists(const std::wstring &path)
{ {
return GetFileAttributes(path.c_str()) != 0xFFFFFFFF; return GetFileAttributes(path.c_str()) != 0xFFFFFFFF;
@ -73,21 +64,9 @@ static bool pathExists(const std::wstring &path)
static std::wstring findAgentProgram() static std::wstring findAgentProgram()
{ {
std::wstring progDir = dirname(getModuleFileName(getCurrentModule())); std::wstring progDir = dirname(getModuleFileName(getCurrentModule()));
if (pathExists(progDir + L"\\"AGENT_EXE)) { std::wstring ret = progDir + L"\\"AGENT_EXE;
return progDir + L"\\"AGENT_EXE; assert(pathExists(ret));
} else { return ret;
// The development directory structure looks like this:
// root/
// agent/
// pconsole-agent.exe
// libpconsole/
// pconsole.dll
std::wstring agentProgram = dirname(progDir) + L"\\agent\\"AGENT_EXE;
if (!pathExists(agentProgram)) {
assert(false);
}
return agentProgram;
}
} }
// Call ConnectNamedPipe and block, even for an overlapped pipe. If the // Call ConnectNamedPipe and block, even for an overlapped pipe. If the

4
unix-adapter/Makefile
View File

@ -1,10 +1,10 @@
include ../config.mk include ../config.mk
include ../config-unix.mk include ../config-unix.mk
PROGRAM = pconsole PROGRAM = ../build/pconsole.exe
OBJECTS = main.o Shared.o OBJECTS = main.o Shared.o
CXXFLAGS += -I../include CXXFLAGS += -I../include
LDFLAGS += ../libpconsole/pconsole.dll LDFLAGS += ../build/pconsole.dll
all : $(PROGRAM) all : $(PROGRAM)