Azure
/
hpcpack-linux-agent
зеркало из https://github.com/Azure/hpcpack-linux-agent.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Make file dependency

This commit is contained in:
evanc 2015-04-15 01:04:30 -07:00
Родитель 8d73c2a03c
Коммит 4d9321c2e1
4 изменённых файлов: 168 добавлений и 87 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

233
nodemanager/NodeManager.layout
Просмотреть файл

@ -1,104 +1,49 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<CodeBlocks_layout_file> <CodeBlocks_layout_file>
<ActiveTarget name="Release" /> <ActiveTarget name="Release" />
<File name="data/JobInfo.h" open="1" top="0" tabpos="13" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0"> <File name="utils/String.h" open="1" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor> <Cursor>
<Cursor1 position="327" topLine="0" /> <Cursor1 position="321" topLine="0" />
</Cursor> </Cursor>
</File> </File>
<File name="arguments/ProcessStartInfo.cpp" open="1" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0"> <File name="utils/System.cpp" open="1" top="0" tabpos="20" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor> <Cursor>
<Cursor1 position="727" topLine="0" /> <Cursor1 position="354" topLine="0" />
</Cursor> </Cursor>
</File> </File>
<File name="data/JobInfo.cpp" open="1" top="0" tabpos="20" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0"> <File name="data/NodeInfo.h" open="1" top="0" tabpos="30" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor> <Cursor>
<Cursor1 position="0" topLine="0" /> <Cursor1 position="0" topLine="0" />
</Cursor> </Cursor>
</File> </File>
<File name="arguments/StartJobAndTaskArgs.h" open="1" top="0" tabpos="12" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="791" topLine="0" />
</Cursor>
</File>
<File name="core/RemoteCommunicator.h" open="0" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="1617" topLine="23" />
</Cursor>
</File>
<File name="utils/String.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0"> <File name="utils/String.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor> <Cursor>
<Cursor1 position="119" topLine="3" /> <Cursor1 position="119" topLine="3" />
</Cursor> </Cursor>
</File> </File>
<File name="arguments/EndJobArgs.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0"> <File name="data/TaskInfo.cpp" open="1" top="0" tabpos="16" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor> <Cursor>
<Cursor1 position="123" topLine="0" /> <Cursor1 position="836" topLine="0" />
</Cursor> </Cursor>
</File> </File>
<File name="core/RemoteExecutor.h" open="1" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0"> <File name="core/Reporter.cpp" open="1" top="0" tabpos="22" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor> <Cursor>
<Cursor1 position="2041" topLine="3" /> <Cursor1 position="753" topLine="0" />
</Cursor> </Cursor>
</File> </File>
<File name="utils/Logger.h" open="0" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0"> <File name="core/Process.cpp" open="1" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor> <Cursor>
<Cursor1 position="1350" topLine="0" /> <Cursor1 position="4096" topLine="78" />
</Cursor> </Cursor>
</File> </File>
<File name="arguments/ProcessStartInfo.h" open="1" top="0" tabpos="7" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0"> <File name="core/RemoteCommunicator.h" open="1" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor> <Cursor>
<Cursor1 position="917" topLine="0" /> <Cursor1 position="2048" topLine="0" />
</Cursor> </Cursor>
</File> </File>
<File name="utils/System.cpp" open="1" top="0" tabpos="17" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0"> <File name="data/JobInfo.cpp" open="1" top="0" tabpos="29" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor> <Cursor>
<Cursor1 position="6049" topLine="208" /> <Cursor1 position="0" topLine="0" />
</Cursor>
</File>
<File name="arguments/EndTaskArgs.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="299" topLine="0" />
</Cursor>
</File>
<File name="arguments/EndJobArgs.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="254" topLine="0" />
</Cursor>
</File>
<File name="core/IRemoteExecutor.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="841" topLine="0" />
</Cursor>
</File>
<File name="utils/String.h" open="1" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="321" topLine="0" />
</Cursor>
</File>
<File name="main.cpp" open="0" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="264" topLine="0" />
</Cursor>
</File>
<File name="arguments/StartTaskArgs.cpp" open="1" top="0" tabpos="10" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="597" topLine="0" />
</Cursor>
</File>
<File name="utils/JsonHelper.h" open="1" top="0" tabpos="16" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="2035" topLine="17" />
</Cursor>
</File>
<File name="arguments/StartJobAndTaskArgs.cpp" open="1" top="0" tabpos="9" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="921" topLine="0" />
</Cursor>
</File>
<File name="utils/Logger.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="20" topLine="0" />
</Cursor> </Cursor>
</File> </File>
<File name="Readme.txt" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0"> <File name="Readme.txt" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
@ -106,44 +51,164 @@
<Cursor1 position="576" topLine="0" /> <Cursor1 position="576" topLine="0" />
</Cursor> </Cursor>
</File> </File>
<File name="arguments/EndTaskArgs.cpp" open="1" top="0" tabpos="14" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0"> <File name="core/Monitor.cpp" open="1" top="0" tabpos="19" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor> <Cursor>
<Cursor1 position="126" topLine="0" /> <Cursor1 position="986" topLine="3" />
</Cursor> </Cursor>
</File> </File>
<File name="arguments/StartTaskArgs.h" open="1" top="0" tabpos="11" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0"> <File name="arguments/EndJobArgs.cpp" open="1" top="0" tabpos="9" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="125" topLine="0" />
</Cursor>
</File>
<File name="arguments/StartJobAndTaskArgs.cpp" open="0" top="0" tabpos="8" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="635" topLine="0" />
</Cursor>
</File>
<File name="arguments/StartTaskArgs.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="599" topLine="0" />
</Cursor>
</File>
<File name="core/RemoteCommunicator.cpp" open="1" top="0" tabpos="7" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="1722" topLine="0" />
</Cursor>
</File>
<File name="utils/System.h" open="1" top="0" tabpos="12" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="1525" topLine="0" />
</Cursor>
</File>
<File name="arguments/StartTaskArgs.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor> <Cursor>
<Cursor1 position="571" topLine="0" /> <Cursor1 position="571" topLine="0" />
</Cursor> </Cursor>
</File> </File>
<File name="core/RemoteCommunicator.cpp" open="1" top="0" tabpos="8" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0"> <File name="utils/Logger.h" open="1" top="0" tabpos="8" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor> <Cursor>
<Cursor1 position="2937" topLine="45" /> <Cursor1 position="1745" topLine="33" />
</Cursor> </Cursor>
</File> </File>
<File name="utils/System.h" open="1" top="0" tabpos="18" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0"> <File name="core/Monitor.h" open="1" top="0" tabpos="21" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor> <Cursor>
<Cursor1 position="2366" topLine="30" /> <Cursor1 position="0" topLine="0" />
</Cursor> </Cursor>
</File> </File>
<File name="utils/JsonHelper.cpp" open="1" top="0" tabpos="15" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0"> <File name="core/RemoteExecutor.h" open="1" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor> <Cursor>
<Cursor1 position="884" topLine="0" /> <Cursor1 position="1379" topLine="0" />
</Cursor>
</File>
<File name="utils/Logger.cpp" open="1" top="0" tabpos="18" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="20" topLine="0" />
</Cursor>
</File>
<File name="core/JobTaskTable.cpp" open="1" top="1" tabpos="15" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="2339" topLine="33" />
</Cursor>
</File>
<File name="core/RemoteExecutor.cpp" open="1" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="6852" topLine="104" />
</Cursor>
</File>
<File name="core/IRemoteExecutor.h" open="1" top="0" tabpos="13" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="686" topLine="0" />
</Cursor>
</File>
<File name="utils/WriterLock.h" open="1" top="0" tabpos="11" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="96" topLine="0" />
</Cursor>
</File>
<File name="arguments/EndTaskArgs.cpp" open="1" top="0" tabpos="10" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="0" topLine="0" />
</Cursor> </Cursor>
</File> </File>
<File name="core/Process.h" open="1" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0"> <File name="core/Process.h" open="1" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor> <Cursor>
<Cursor1 position="940" topLine="0" /> <Cursor1 position="2469" topLine="15" />
</Cursor> </Cursor>
</File> </File>
<File name="core/RemoteExecutor.cpp" open="1" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0"> <File name="arguments/ProcessStartInfo.cpp" open="0" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor> <Cursor>
<Cursor1 position="2375" topLine="19" /> <Cursor1 position="727" topLine="0" />
</Cursor> </Cursor>
</File> </File>
<File name="core/Process.cpp" open="1" top="1" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0"> <File name="Version.cpp" open="1" top="0" tabpos="27" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor> <Cursor>
<Cursor1 position="6502" topLine="144" /> <Cursor1 position="20" topLine="0" />
</Cursor>
</File>
<File name="main.cpp" open="1" top="0" tabpos="28" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="489" topLine="0" />
</Cursor>
</File>
<File name="utils/JsonHelper.h" open="0" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="2035" topLine="60" />
</Cursor>
</File>
<File name="core/JobTaskTable.h" open="1" top="0" tabpos="14" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="441" topLine="0" />
</Cursor>
</File>
<File name="arguments/StartJobAndTaskArgs.h" open="0" top="0" tabpos="7" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="601" topLine="0" />
</Cursor>
</File>
<File name="arguments/EndJobArgs.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="254" topLine="0" />
</Cursor>
</File>
<File name="arguments/EndTaskArgs.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="299" topLine="0" />
</Cursor>
</File>
<File name="data/NodeInfo.cpp" open="1" top="0" tabpos="31" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="488" topLine="0" />
</Cursor>
</File>
<File name="data/TaskInfo.h" open="1" top="0" tabpos="17" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="750" topLine="0" />
</Cursor>
</File>
<File name="arguments/ProcessStartInfo.h" open="0" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="872" topLine="0" />
</Cursor>
</File>
<File name="utils/JsonHelper.cpp" open="0" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="884" topLine="7" />
</Cursor>
</File>
<File name="Version.h" open="1" top="0" tabpos="26" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="2403" topLine="0" />
</Cursor>
</File>
<File name="core/Reporter.h" open="1" top="0" tabpos="24" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="796" topLine="0" />
</Cursor>
</File>
<File name="common/ErrorCodes.h" open="1" top="0" tabpos="23" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="0" topLine="0" />
</Cursor> </Cursor>
</File> </File>
</CodeBlocks_layout_file> </CodeBlocks_layout_file>

1
nodemanager/Version.cpp
Просмотреть файл

@ -1 +1,2 @@
#include "Version.h" #include "Version.h"

5
nodemanager/Version.h
Просмотреть файл

@ -58,6 +58,11 @@ namespace hpc
"Fixed a bug that json not-existing value is handled incorrectly", "Fixed a bug that json not-existing value is handled incorrectly",
} }
}, },
{ "1.1.1.7",
{
"Make file dependency auto detect",
}
},
}; };
return versionHistory; return versionHistory;

16
nodemanager/makefile
Просмотреть файл

@ -30,7 +30,8 @@ DEBUG = debug
RELEASE = release RELEASE = release
OBJDIR = obj OBJDIR = obj
OUTDIR = bin OUTDIR = bin
CPPS = $(notdir $(wildcard */*.cpp *.cpp)) CPPSWITHDIR = $(wildcard */*.cpp *.cpp)
CPPS = $(notdir $(CPPSWITHDIR))
OBJS = $(CPPS:.cpp=.o) OBJS = $(CPPS:.cpp=.o)
# debug # debug
@ -41,6 +42,7 @@ LIBDIR_DEBUG = -L$(CASA_LIB_DEBUG)
LIB_DEBUG = $(LIB) LIB_DEBUG = $(LIB)
LDFLAGS_DEBUG = $(LDFLAGS) LDFLAGS_DEBUG = $(LDFLAGS)
OBJDIR_DEBUG = $(OBJDIR)/$(DEBUG) OBJDIR_DEBUG = $(OBJDIR)/$(DEBUG)
OBJDIRSED_DEBUG = $(OBJDIR)\/$(DEBUG)
OUTDIR_DEBUG = $(OUTDIR)/$(DEBUG) OUTDIR_DEBUG = $(OUTDIR)/$(DEBUG)
OUT_DEBUG = $(OUTDIR_DEBUG)/$(BINARY) OUT_DEBUG = $(OUTDIR_DEBUG)/$(BINARY)
OBJS_DEBUG = $(addprefix $(OBJDIR_DEBUG)/, $(OBJS)) OBJS_DEBUG = $(addprefix $(OBJDIR_DEBUG)/, $(OBJS))
@ -53,6 +55,7 @@ LIBDIR_RELEASE = -L$(CASA_LIB_RELEASE)
LIB_RELEASE = $(LIB) LIB_RELEASE = $(LIB)
LDFLAGS_RELEASE = $(LDFLAGS) -s LDFLAGS_RELEASE = $(LDFLAGS) -s
OBJDIR_RELEASE = $(OBJDIR)/$(RELEASE) OBJDIR_RELEASE = $(OBJDIR)/$(RELEASE)
OBJDIRSED_RELEASE = $(OBJDIR)\/$(RELEASE)
OUTDIR_RELEASE = $(OUTDIR)/$(RELEASE) OUTDIR_RELEASE = $(OUTDIR)/$(RELEASE)
OUT_RELEASE = $(OUTDIR_RELEASE)/$(BINARY) OUT_RELEASE = $(OUTDIR_RELEASE)/$(BINARY)
OBJS_RELEASE = $(addprefix $(OBJDIR_RELEASE)/, $(OBJS)) OBJS_RELEASE = $(addprefix $(OBJDIR_RELEASE)/, $(OBJS))
@ -190,5 +193,12 @@ $(OBJDIR_RELEASE)/%.o: %.cpp
# dependency # dependency
include deps include deps
deps: deps: $(CPPSWITHDIR)
$(CXX) -MM *.cpp */*.cpp > deps @tput bold;
@echo -n "Rebuilding dependencies ... ";
$(CXX) -MM *.cpp */*.cpp > rawdeps
cat rawdeps | sed -e "s/\(.*\)\.o/$(OBJDIRSED_DEBUG)\/\1\.o/" > deps
cat rawdeps | sed -e "s/\(.*\)\.o/$(OBJDIRSED_RELEASE)\/\1\.o/" >> deps
@tput setaf 2
@echo "Done."
@tput sgr0;