From decb62ee17ae06a7dd5f78658ac56f3d2cea190c Mon Sep 17 00:00:00 2001 From: AI_amateur <36118002+PaPaPig-Melody@users.noreply.github.com> Date: Sat, 1 Jun 2024 23:38:00 +0800 Subject: [PATCH] [compile] Bazel compile , add compile.md (#382) * feat(bazel-compile) --- COMPILE.md | 8 +++++++ README.md | 2 +- README_en.md | 2 +- cmake/CGraph-env-include.cmake | 1 - example/BUILD | 25 +++++++--------------- example/E01-AutoPilot.cpp | 2 +- example/E02-MockGUI.cpp | 2 +- example/E03-ThirdFlow.cpp | 2 +- example/E04-MapReduce.cpp | 2 +- src/BUILD | 5 ----- test/Functional/BUILD | 4 ++-- test/Performance/BUILD | 3 ++- test/_Materials/BUILD | 1 - test/_Materials/TestCommonDefine.h | 2 +- tutorial/BUILD | 8 +++---- tutorial/MyGAspect/MyConnAspect.h | 2 +- tutorial/MyGAspect/MyPipelineParamAspect.h | 2 +- tutorial/MyGAspect/MyTemplateAspect.h | 2 +- tutorial/MyGAspect/MyTimerAspect.h | 2 +- tutorial/MyGAspect/MyTraceAspect.h | 2 +- tutorial/MyGCondition/MyCondition.h | 2 +- tutorial/MyGCondition/MyParamCondition.h | 2 +- tutorial/MyGDaemon/MyMonitorDaemon.h | 2 +- tutorial/MyGDaemon/MyParamDaemon.h | 2 +- tutorial/MyGDaemon/MyTemplateDaemon.h | 2 +- tutorial/MyGEvent/MyPrintEvent.h | 2 +- tutorial/MyGMutable/MyMutable.h | 2 +- tutorial/MyGNode/HelloCGraphNode.h | 2 +- tutorial/MyGNode/MyEParamNode.h | 2 +- tutorial/MyGNode/MyEventNode.h | 2 +- tutorial/MyGNode/MyHoldNode.h | 2 +- tutorial/MyGNode/MyMatchNode.h | 2 +- tutorial/MyGNode/MyNode1.h | 2 +- tutorial/MyGNode/MyNode2.h | 2 +- tutorial/MyGNode/MyPubMessageNode.h | 2 +- tutorial/MyGNode/MyReadParamNode.h | 2 +- tutorial/MyGNode/MyRecvMessageNode.h | 2 +- tutorial/MyGNode/MySendMessageNode.h | 2 +- tutorial/MyGNode/MyShowAddressNode.h | 2 +- tutorial/MyGNode/MySubMessageNode.h | 2 +- tutorial/MyGNode/MyTemplateNode.h | 2 +- tutorial/MyGNode/MyTemplateV2Node.h | 2 +- tutorial/MyGNode/MyWriteParamNode.h | 2 +- tutorial/MyParams/MyConnParam.h | 2 +- tutorial/MyParams/MyMessageParam.h | 2 +- tutorial/MyParams/MyParam.h | 2 +- tutorial/MyParams/MyVersionParam.h | 2 +- tutorial/MyUtils/MyDistance.h | 2 +- tutorial/TU01-ThreadPool.cpp | 2 +- tutorial/TU02-Lru.cpp | 2 +- tutorial/TU03-Trie.cpp | 2 +- tutorial/TU04-Timer.cpp | 2 +- 52 files changed, 68 insertions(+), 75 deletions(-) diff --git a/COMPILE.md b/COMPILE.md index 1ca859e2..a12dceb4 100644 --- a/COMPILE.md +++ b/COMPILE.md @@ -38,3 +38,11 @@ $ ./CGraph-build.sh # 编译CGraph工程，生成的内容在同级/build/文件夹中 $ ./build/tutorial/T00-HelloCGraph # 运行第一个实例程序，并且在终端输出 Hello, CGraph. ``` + +* Bazel编译方式(Linux/MacOS/Windows) + ```shell + $ git clone https://github.com/ChunelFeng/CGraph.git + $ cd CGraph + $ bazel build //tutorial:T01-Simple -c dbg && bazel run //tutorial:T01-Simple # 编译并运行tutorial路径下的T01-Simple（debug版本） + $ bazel build //tutorial/... -c opt # 编译tutorial路径下的所有targets（release版本） + ``` \ No newline at end of file diff --git a/README.md b/README.md index 118ec77b..513273d7 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ #### MyNode.h ```cpp -#include "../src/CGraph.h" +#include "CGraph.h" class MyNode1 : public CGraph::GNode { public: diff --git a/README_en.md b/README_en.md index 1c09fa81..92dd444b 100644 --- a/README_en.md +++ b/README_en.md @@ -67,7 +67,7 @@ You can transfer your params in many scenes. It is also possible to extend the f #### MyNode.h ```cpp -#include "../src/CGraph.h" +#include "CGraph.h" class MyNode1 : public CGraph::GNode { public: diff --git a/cmake/CGraph-env-include.cmake b/cmake/CGraph-env-include.cmake index 3ed7e177..801fd0a7 100644 --- a/cmake/CGraph-env-include.cmake +++ b/cmake/CGraph-env-include.cmake @@ -30,7 +30,6 @@ ELSEIF(WIN32) # 本工程也支持在windows平台上的mingw环境使用 ENDIF() -include_directories(${CGRAPH_PROJECT_ROOT_DIR}) include_directories(${CGRAPH_PROJECT_ROOT_DIR}/src/) # 直接加入"CGraph.h"文件对应的位置 # 以下三选一，本地编译执行，推荐OBJECT方式 diff --git a/example/BUILD b/example/BUILD index 3eaf4796..acdd5c5b 100644 --- a/example/BUILD +++ b/example/BUILD @@ -1,40 +1,31 @@ -# NOET: test all the examples at a time -test_suite( - name = "test_all_examples", - tests = [":E01-AutoPilot",":E02-MockGUI",":E03-ThirdFlow",":E04-MapReduce"], -) - # test-1: E01-AutoPilot -cc_test ( +cc_binary ( name = "E01-AutoPilot", srcs = ["E01-AutoPilot.cpp"], + copts = ["-Isrc/"], deps = ["//src:CGraph",], ) # test-2: E02-MockGUI -cc_test ( +cc_binary ( name = "E02-MockGUI", srcs = ["E02-MockGUI.cpp"], + copts = ["-Isrc/"], deps = ["//src:CGraph",], ) # test-3: E03-ThirdFlow -cc_test ( +cc_binary ( name = "E03-ThirdFlow", srcs = ["E03-ThirdFlow.cpp"], + copts = ["-Isrc/"], deps = ["//src:CGraph",], ) # test-4: E04-MapReduce -cc_test ( +cc_binary ( name = "E04-MapReduce", srcs = ["E04-MapReduce.cpp"], + copts = ["-Isrc/"], deps = ["//src:CGraph",], ) - -# import the CGraph.h from src dir -# cc_import( -# name = "CGraph_h", -# hdrs = ["src/CGraph.h"], -# visibility = ["//visibility:public"], -# ) \ No newline at end of file diff --git a/example/E01-AutoPilot.cpp b/example/E01-AutoPilot.cpp index 21cfd7d6..fb21a926 100644 --- a/example/E01-AutoPilot.cpp +++ b/example/E01-AutoPilot.cpp @@ -12,7 +12,7 @@ #include #include -#include "src/CGraph.h" +#include "CGraph.h" using namespace CGraph; diff --git a/example/E02-MockGUI.cpp b/example/E02-MockGUI.cpp index 7f203d46..6fb93324 100644 --- a/example/E02-MockGUI.cpp +++ b/example/E02-MockGUI.cpp @@ -12,7 +12,7 @@ #include #include -#include "src/CGraph.h" +#include "CGraph.h" using namespace CGraph; diff --git a/example/E03-ThirdFlow.cpp b/example/E03-ThirdFlow.cpp index 3bc254df..0682661c 100644 --- a/example/E03-ThirdFlow.cpp +++ b/example/E03-ThirdFlow.cpp @@ -9,7 +9,7 @@ #include #include -#include "src/CGraph.h" +#include "CGraph.h" using namespace CGraph; diff --git a/example/E04-MapReduce.cpp b/example/E04-MapReduce.cpp index ae855153..0e742cd8 100644 --- a/example/E04-MapReduce.cpp +++ b/example/E04-MapReduce.cpp @@ -9,7 +9,7 @@ #include #include -#include "src/CGraph.h" +#include "CGraph.h" using namespace CGraph; diff --git a/src/BUILD b/src/BUILD index 681962a4..b8b17e2e 100644 --- a/src/BUILD +++ b/src/BUILD @@ -4,10 +4,5 @@ cc_library( name = "CGraph", srcs = glob(["**/*.cpp"]), hdrs = glob(["**/*.h", "**/*.inl"]), - copts = [ - "-D_CGRAPH_SILENCE", - "-D_ENABLE_LIKELY_", - ], - linkstatic = 0, visibility = ["//visibility:public"], ) diff --git a/test/Functional/BUILD b/test/Functional/BUILD index 7e516853..1e121cb9 100644 --- a/test/Functional/BUILD +++ b/test/Functional/BUILD @@ -7,10 +7,10 @@ CGRAPH_FUNCTIONAL_LIST = [ ] [ - cc_test( + cc_binary( name = "%s" % fun_name, srcs = ["%s.cpp" % fun_name], - + copts = ["-Isrc/"], deps = ["//src:CGraph", "//test/_Materials:test_materials",], ) diff --git a/test/Performance/BUILD b/test/Performance/BUILD index dee438de..dfae74f5 100644 --- a/test/Performance/BUILD +++ b/test/Performance/BUILD @@ -5,9 +5,10 @@ CGRAPH_PERFORMANCE_LIST = [ ] [ - cc_test( + cc_binary( name = "%s" % perf_name, srcs = ["%s.cpp" % perf_name], + copts = ["-Isrc/"], deps = ["//src:CGraph", "//test/_Materials:test_materials",], ) diff --git a/test/_Materials/BUILD b/test/_Materials/BUILD index e9301997..17b06a63 100644 --- a/test/_Materials/BUILD +++ b/test/_Materials/BUILD @@ -1,6 +1,5 @@ cc_library( name = "test_materials", hdrs = glob(["**/*.h"]), - linkstatic = 0, visibility = ["//visibility:public"], ) \ No newline at end of file diff --git a/test/_Materials/TestCommonDefine.h b/test/_Materials/TestCommonDefine.h index 4af3ff68..70cefac9 100644 --- a/test/_Materials/TestCommonDefine.h +++ b/test/_Materials/TestCommonDefine.h @@ -11,7 +11,7 @@ #include -#include "src/CGraph.h" +#include "CGraph.h" std::atomic g_test_node_cnt = {0}; static const char* g_test_message_key = "test-message-key"; diff --git a/tutorial/BUILD b/tutorial/BUILD index 468b9c48..1a2810af 100644 --- a/tutorial/BUILD +++ b/tutorial/BUILD @@ -1,6 +1,6 @@ cc_library( name = "Tutorial_header", - hdrs = glob(["MyGAspect/**/*.h", + srcs = glob(["MyGAspect/**/*.h", "MyGCondition/**/*.h", "MyGDaemon/**/*.h", "MyGEvent/**/*.h", @@ -8,7 +8,6 @@ cc_library( "MyGNode/**/*.h", "MyParams/**/*.h", "MyUtils/**/*.h",]), - linkstatic = 0, visibility = ["//visibility:public"], ) @@ -43,10 +42,11 @@ CGRAPH_TUTORIAL_LIST = [ ] [ - cc_test( + cc_binary( name = "%s" % tutorial_name, srcs = ["%s.cpp" % tutorial_name], - deps = [":Tutorial_header","//src:CGraph",], + copts = ["-Isrc/"], + deps = [":Tutorial_header","//src:CGraph"], ) for tutorial_name in CGRAPH_TUTORIAL_LIST ] \ No newline at end of file diff --git a/tutorial/MyGAspect/MyConnAspect.h b/tutorial/MyGAspect/MyConnAspect.h index c0b7e731..aa87acce 100644 --- a/tutorial/MyGAspect/MyConnAspect.h +++ b/tutorial/MyGAspect/MyConnAspect.h @@ -9,7 +9,7 @@ #ifndef CGRAPH_MYCONNASPECT_H #define CGRAPH_MYCONNASPECT_H -#include "../../src/CGraph.h" +#include "CGraph.h" #include "../MyParams/MyConnParam.h" class MyConnAspect : public CGraph::GAspect { diff --git a/tutorial/MyGAspect/MyPipelineParamAspect.h b/tutorial/MyGAspect/MyPipelineParamAspect.h index cd596e3d..f10f90f3 100644 --- a/tutorial/MyGAspect/MyPipelineParamAspect.h +++ b/tutorial/MyGAspect/MyPipelineParamAspect.h @@ -9,7 +9,7 @@ #ifndef CGRAPH_MYPIPELINEPARAMASPECT_H #define CGRAPH_MYPIPELINEPARAMASPECT_H -#include "../../src/CGraph.h" +#include "CGraph.h" #include "../MyParams/MyParam.h" class MyPipelineParamAspect : public CGraph::GAspect { diff --git a/tutorial/MyGAspect/MyTemplateAspect.h b/tutorial/MyGAspect/MyTemplateAspect.h index 0ddca67f..ab827076 100644 --- a/tutorial/MyGAspect/MyTemplateAspect.h +++ b/tutorial/MyGAspect/MyTemplateAspect.h @@ -9,7 +9,7 @@ #ifndef CGRAPH_MYTEMPLATEASPECT_H #define CGRAPH_MYTEMPLATEASPECT_H -#include "../../src/CGraph.h" +#include "CGraph.h" template class MyTemplateAspect : public CGraph::GTemplateAspect { diff --git a/tutorial/MyGAspect/MyTimerAspect.h b/tutorial/MyGAspect/MyTimerAspect.h index ff2dcb2f..971a1cef 100644 --- a/tutorial/MyGAspect/MyTimerAspect.h +++ b/tutorial/MyGAspect/MyTimerAspect.h @@ -11,7 +11,7 @@ #include -#include "../../src/CGraph.h" +#include "CGraph.h" class MyTimerAspect : public CGraph::GAspect { public: diff --git a/tutorial/MyGAspect/MyTraceAspect.h b/tutorial/MyGAspect/MyTraceAspect.h index aa443200..ba1643d6 100644 --- a/tutorial/MyGAspect/MyTraceAspect.h +++ b/tutorial/MyGAspect/MyTraceAspect.h @@ -9,7 +9,7 @@ #ifndef CGRAPH_MYTRACEASPECT_H #define CGRAPH_MYTRACEASPECT_H -#include "../../src/CGraph.h" +#include "CGraph.h" class MyTraceAspect : public CGraph::GAspect { public: diff --git a/tutorial/MyGCondition/MyCondition.h b/tutorial/MyGCondition/MyCondition.h index 75f4ee67..4d4f15ec 100644 --- a/tutorial/MyGCondition/MyCondition.h +++ b/tutorial/MyGCondition/MyCondition.h @@ -9,7 +9,7 @@ #ifndef CGRAPH_MYCONDITION_H #define CGRAPH_MYCONDITION_H -#include "../../src/CGraph.h" +#include "CGraph.h" class MyCondition : public CGraph::GCondition { public: diff --git a/tutorial/MyGCondition/MyParamCondition.h b/tutorial/MyGCondition/MyParamCondition.h index e5f3a97f..d19fc580 100644 --- a/tutorial/MyGCondition/MyParamCondition.h +++ b/tutorial/MyGCondition/MyParamCondition.h @@ -9,7 +9,7 @@ #ifndef CGRAPH_MYPARAMCONDITION_H #define CGRAPH_MYPARAMCONDITION_H -#include "../../src/CGraph.h" +#include "CGraph.h" #include "../MyParams/MyParam.h" class MyParamCondition : public CGraph::GCondition { diff --git a/tutorial/MyGDaemon/MyMonitorDaemon.h b/tutorial/MyGDaemon/MyMonitorDaemon.h index cdb20404..fcc10125 100644 --- a/tutorial/MyGDaemon/MyMonitorDaemon.h +++ b/tutorial/MyGDaemon/MyMonitorDaemon.h @@ -9,7 +9,7 @@ #ifndef CGRAPH_MYMONITORDAEMON_H #define CGRAPH_MYMONITORDAEMON_H -#include "../../src/CGraph.h" +#include "CGraph.h" class MyMonitorDaemon : public CGraph::GDaemon { public: diff --git a/tutorial/MyGDaemon/MyParamDaemon.h b/tutorial/MyGDaemon/MyParamDaemon.h index 93472f5f..0151aec5 100644 --- a/tutorial/MyGDaemon/MyParamDaemon.h +++ b/tutorial/MyGDaemon/MyParamDaemon.h @@ -9,7 +9,7 @@ #ifndef CGRAPH_MYPARAMDAEMON_H #define CGRAPH_MYPARAMDAEMON_H -#include "../../src/CGraph.h" +#include "CGraph.h" #include "../MyParams/MyParam.h" #include "../MyParams/MyConnParam.h" diff --git a/tutorial/MyGDaemon/MyTemplateDaemon.h b/tutorial/MyGDaemon/MyTemplateDaemon.h index 5e6024b2..77154366 100644 --- a/tutorial/MyGDaemon/MyTemplateDaemon.h +++ b/tutorial/MyGDaemon/MyTemplateDaemon.h @@ -11,7 +11,7 @@ #include -#include "../../src/CGraph.h" +#include "CGraph.h" template class MyTemplateDaemon : public CGraph::GTemplateDaemon { diff --git a/tutorial/MyGEvent/MyPrintEvent.h b/tutorial/MyGEvent/MyPrintEvent.h index 6e95a986..5567ee9f 100644 --- a/tutorial/MyGEvent/MyPrintEvent.h +++ b/tutorial/MyGEvent/MyPrintEvent.h @@ -9,7 +9,7 @@ #ifndef CGRAPH_MYPRINTEVENT_H #define CGRAPH_MYPRINTEVENT_H -#include "../../src/CGraph.h" +#include "CGraph.h" #include "../MyParams/MyParam.h" class MyPrintEvent : public CGraph::GEvent { diff --git a/tutorial/MyGMutable/MyMutable.h b/tutorial/MyGMutable/MyMutable.h index 36d1c661..4e651a4f 100644 --- a/tutorial/MyGMutable/MyMutable.h +++ b/tutorial/MyGMutable/MyMutable.h @@ -9,7 +9,7 @@ #ifndef CGRAPH_MYMUTABLE_H #define CGRAPH_MYMUTABLE_H -#include "../../src/CGraph.h" +#include "CGraph.h" #include "../MyParams/MyParam.h" class MyMutable : public CGraph::GMutable { diff --git a/tutorial/MyGNode/HelloCGraphNode.h b/tutorial/MyGNode/HelloCGraphNode.h index 4290121b..a772b802 100644 --- a/tutorial/MyGNode/HelloCGraphNode.h +++ b/tutorial/MyGNode/HelloCGraphNode.h @@ -9,7 +9,7 @@ #ifndef CGRAPH_HELLOCGRAPHNODE_H #define CGRAPH_HELLOCGRAPHNODE_H -#include "../../src/CGraph.h" +#include "CGraph.h" class HelloCGraphNode : public CGraph::GNode { public: diff --git a/tutorial/MyGNode/MyEParamNode.h b/tutorial/MyGNode/MyEParamNode.h index 4618798f..44ca9b61 100644 --- a/tutorial/MyGNode/MyEParamNode.h +++ b/tutorial/MyGNode/MyEParamNode.h @@ -9,7 +9,7 @@ #ifndef CGRAPH_MYEPARAMNODE_H #define CGRAPH_MYEPARAMNODE_H -#include "../../src/CGraph.h" +#include "CGraph.h" #include "../MyParams/MyVersionParam.h" #include "../MyParams/MyConnParam.h" diff --git a/tutorial/MyGNode/MyEventNode.h b/tutorial/MyGNode/MyEventNode.h index a724625d..5d88661f 100644 --- a/tutorial/MyGNode/MyEventNode.h +++ b/tutorial/MyGNode/MyEventNode.h @@ -9,7 +9,7 @@ #ifndef CGRAPH_MYEVENTNODE_H #define CGRAPH_MYEVENTNODE_H -#include "../../src/CGraph.h" +#include "CGraph.h" class MyEventNode : public CGraph::GNode { public: diff --git a/tutorial/MyGNode/MyHoldNode.h b/tutorial/MyGNode/MyHoldNode.h index 92975e91..f7e76a61 100644 --- a/tutorial/MyGNode/MyHoldNode.h +++ b/tutorial/MyGNode/MyHoldNode.h @@ -9,7 +9,7 @@ #ifndef CGRAPH_MYHOLDNODE_H #define CGRAPH_MYHOLDNODE_H -#include "../../src/CGraph.h" +#include "CGraph.h" #include "../MyParams/MyParam.h" static const char* HOLD_PARAM_NAME = "hold-param"; diff --git a/tutorial/MyGNode/MyMatchNode.h b/tutorial/MyGNode/MyMatchNode.h index 3cf12173..96d650df 100644 --- a/tutorial/MyGNode/MyMatchNode.h +++ b/tutorial/MyGNode/MyMatchNode.h @@ -9,7 +9,7 @@ #ifndef CGRAPH_MYMATCHNODE_H #define CGRAPH_MYMATCHNODE_H -#include "../../src/CGraph.h" +#include "CGraph.h" #include "../MyParams/MyParam.h" class MyMatchNode : public CGraph::GNode { diff --git a/tutorial/MyGNode/MyNode1.h b/tutorial/MyGNode/MyNode1.h index b8e7541f..0d7fb17d 100644 --- a/tutorial/MyGNode/MyNode1.h +++ b/tutorial/MyGNode/MyNode1.h @@ -9,7 +9,7 @@ #ifndef CGRAPH_MYNODE1_H #define CGRAPH_MYNODE1_H -#include "../../src/CGraph.h" +#include "CGraph.h" class MyNode1 : public CGraph::GNode { public: diff --git a/tutorial/MyGNode/MyNode2.h b/tutorial/MyGNode/MyNode2.h index 6b6dabfc..ecb5f60a 100644 --- a/tutorial/MyGNode/MyNode2.h +++ b/tutorial/MyGNode/MyNode2.h @@ -9,7 +9,7 @@ #ifndef CGRAPH_MYNODE2_H #define CGRAPH_MYNODE2_H -#include "../../src/CGraph.h" +#include "CGraph.h" class MyNode2 : public CGraph::GNode { public: diff --git a/tutorial/MyGNode/MyPubMessageNode.h b/tutorial/MyGNode/MyPubMessageNode.h index caea3db5..aa3bbbfc 100644 --- a/tutorial/MyGNode/MyPubMessageNode.h +++ b/tutorial/MyGNode/MyPubMessageNode.h @@ -9,7 +9,7 @@ #ifndef CGRAPH_MYPUBMESSAGENODE_H #define CGRAPH_MYPUBMESSAGENODE_H -#include "../../src/CGraph.h" +#include "CGraph.h" #include "../MyParams/MyMessageParam.h" class MyPubMessageNode : public CGraph::GNode { diff --git a/tutorial/MyGNode/MyReadParamNode.h b/tutorial/MyGNode/MyReadParamNode.h index 3e7731b5..dcadaed4 100644 --- a/tutorial/MyGNode/MyReadParamNode.h +++ b/tutorial/MyGNode/MyReadParamNode.h @@ -9,7 +9,7 @@ #ifndef CGRAPH_MYREADPARAMNODE_H #define CGRAPH_MYREADPARAMNODE_H -#include "../../src/CGraph.h" +#include "CGraph.h" #include "../MyParams/MyParam.h" class MyReadParamNode : public CGraph::GNode { diff --git a/tutorial/MyGNode/MyRecvMessageNode.h b/tutorial/MyGNode/MyRecvMessageNode.h index 1d350210..90ecd3ba 100644 --- a/tutorial/MyGNode/MyRecvMessageNode.h +++ b/tutorial/MyGNode/MyRecvMessageNode.h @@ -9,7 +9,7 @@ #ifndef CGRAPH_MYRECVMESSAGENODE_H #define CGRAPH_MYRECVMESSAGENODE_H -#include "../../src/CGraph.h" +#include "CGraph.h" #include "../MyParams/MyMessageParam.h" class MyRecvMessageNode : public CGraph::GNode { diff --git a/tutorial/MyGNode/MySendMessageNode.h b/tutorial/MyGNode/MySendMessageNode.h index f8fa6d0f..131bf1fb 100644 --- a/tutorial/MyGNode/MySendMessageNode.h +++ b/tutorial/MyGNode/MySendMessageNode.h @@ -9,7 +9,7 @@ #ifndef CGRAPH_MYSENDMESSAGENODE_H #define CGRAPH_MYSENDMESSAGENODE_H -#include "../../src/CGraph.h" +#include "CGraph.h" #include "../MyParams/MyMessageParam.h" class MySendMessageNode : public CGraph::GNode { diff --git a/tutorial/MyGNode/MyShowAddressNode.h b/tutorial/MyGNode/MyShowAddressNode.h index aada1d26..77c14355 100644 --- a/tutorial/MyGNode/MyShowAddressNode.h +++ b/tutorial/MyGNode/MyShowAddressNode.h @@ -9,7 +9,7 @@ #ifndef CGRAPH_MYSHOWADDRESSNODE_H #define CGRAPH_MYSHOWADDRESSNODE_H -#include "../../src/CGraph.h" +#include "CGraph.h" #include "../MyParams/MyParam.h" class MyShowAddressNode : public CGraph::GNode { diff --git a/tutorial/MyGNode/MySubMessageNode.h b/tutorial/MyGNode/MySubMessageNode.h index 76f1f4c4..7792bbce 100644 --- a/tutorial/MyGNode/MySubMessageNode.h +++ b/tutorial/MyGNode/MySubMessageNode.h @@ -9,7 +9,7 @@ #ifndef CGRAPH_MYSUBMESSAGENODE_H #define CGRAPH_MYSUBMESSAGENODE_H -#include "../../src/CGraph.h" +#include "CGraph.h" #include "../MyParams/MyMessageParam.h" template diff --git a/tutorial/MyGNode/MyTemplateNode.h b/tutorial/MyGNode/MyTemplateNode.h index 3ef6e2d7..abf49e56 100644 --- a/tutorial/MyGNode/MyTemplateNode.h +++ b/tutorial/MyGNode/MyTemplateNode.h @@ -9,7 +9,7 @@ #ifndef CGRAPH_MYTEMPLATENODE_H #define CGRAPH_MYTEMPLATENODE_H -#include "../../src/CGraph.h" +#include "CGraph.h" template class MyTemplateNode : public CGraph::GTemplateNode { diff --git a/tutorial/MyGNode/MyTemplateV2Node.h b/tutorial/MyGNode/MyTemplateV2Node.h index 283f3cec..08b27392 100644 --- a/tutorial/MyGNode/MyTemplateV2Node.h +++ b/tutorial/MyGNode/MyTemplateV2Node.h @@ -9,7 +9,7 @@ #ifndef CGRAPH_MYTEMPLATEV2NODE_H #define CGRAPH_MYTEMPLATEV2NODE_H -#include "../../src/CGraph.h" +#include "CGraph.h" template class MyTemplateV2Node : public CGraph::GNode { diff --git a/tutorial/MyGNode/MyWriteParamNode.h b/tutorial/MyGNode/MyWriteParamNode.h index 1e640895..fb50088c 100644 --- a/tutorial/MyGNode/MyWriteParamNode.h +++ b/tutorial/MyGNode/MyWriteParamNode.h @@ -9,7 +9,7 @@ #ifndef CGRAPH_MYWRITEPARAMNODE_H #define CGRAPH_MYWRITEPARAMNODE_H -#include "../../src/CGraph.h" +#include "CGraph.h" #include "../MyParams/MyParam.h" class MyWriteParamNode : public CGraph::GNode { diff --git a/tutorial/MyParams/MyConnParam.h b/tutorial/MyParams/MyConnParam.h index 085c01a3..a5576867 100644 --- a/tutorial/MyParams/MyConnParam.h +++ b/tutorial/MyParams/MyConnParam.h @@ -9,7 +9,7 @@ #ifndef CGRAPH_MYCONNPARAM_H #define CGRAPH_MYCONNPARAM_H -#include "../../src/CGraph.h" +#include "CGraph.h" const static char* CONN_PARAM_KEY = "conn"; diff --git a/tutorial/MyParams/MyMessageParam.h b/tutorial/MyParams/MyMessageParam.h index a951fb9a..04001884 100644 --- a/tutorial/MyParams/MyMessageParam.h +++ b/tutorial/MyParams/MyMessageParam.h @@ -9,7 +9,7 @@ #ifndef CGRAPH_MYMESSAGEPARAM_H #define CGRAPH_MYMESSAGEPARAM_H -#include "../../src/CGraph.h" +#include "CGraph.h" struct MyMessageParam : public CGraph::GMessageParam { int num = 0; diff --git a/tutorial/MyParams/MyParam.h b/tutorial/MyParams/MyParam.h index 8600d592..7c46f540 100644 --- a/tutorial/MyParams/MyParam.h +++ b/tutorial/MyParams/MyParam.h @@ -9,7 +9,7 @@ #ifndef CGRAPH_MYPARAM_H #define CGRAPH_MYPARAM_H -#include "../../src/CGraph.h" +#include "CGraph.h" /** * MyParam 是GParam的具体实现类 diff --git a/tutorial/MyParams/MyVersionParam.h b/tutorial/MyParams/MyVersionParam.h index 8f656b4d..1205d352 100644 --- a/tutorial/MyParams/MyVersionParam.h +++ b/tutorial/MyParams/MyVersionParam.h @@ -9,7 +9,7 @@ #ifndef CGRAPH_MYVERSIONPARAM_H #define CGRAPH_MYVERSIONPARAM_H -#include "../../src/CGraph.h" +#include "CGraph.h" const static char* VERSION_PARAM_KEY = "version"; diff --git a/tutorial/MyUtils/MyDistance.h b/tutorial/MyUtils/MyDistance.h index 1a18477b..85eb90ff 100644 --- a/tutorial/MyUtils/MyDistance.h +++ b/tutorial/MyUtils/MyDistance.h @@ -9,7 +9,7 @@ #ifndef CGRAPH_MYDISTANCE_H #define CGRAPH_MYDISTANCE_H -#include "../../src/CGraph.h" +#include "CGraph.h" template // 自定义距离类型 class MyDistance : public CGraph::UDistance { diff --git a/tutorial/TU01-ThreadPool.cpp b/tutorial/TU01-ThreadPool.cpp index 7c2a19a2..1d8ecf6d 100644 --- a/tutorial/TU01-ThreadPool.cpp +++ b/tutorial/TU01-ThreadPool.cpp @@ -6,7 +6,7 @@ @Desc: 本例主要演示，threadpool工具的使用方法 ***************************/ -#include "../src/CGraph.h" +#include "CGraph.h" #include "MyUtils/MyFunction.h" using namespace CGraph; diff --git a/tutorial/TU02-Lru.cpp b/tutorial/TU02-Lru.cpp index 8aa88453..7c0f1035 100644 --- a/tutorial/TU02-Lru.cpp +++ b/tutorial/TU02-Lru.cpp @@ -6,7 +6,7 @@ @Desc: 本例主要演示，Lru工具的使用方法 ***************************/ -#include "../src/CGraph.h" +#include "CGraph.h" using namespace CGraph; diff --git a/tutorial/TU03-Trie.cpp b/tutorial/TU03-Trie.cpp index 5cf6470d..f61df110 100644 --- a/tutorial/TU03-Trie.cpp +++ b/tutorial/TU03-Trie.cpp @@ -6,7 +6,7 @@ @Desc: 本例主要演示，Trie的使用方法 ***************************/ -#include "../src/CGraph.h" +#include "CGraph.h" using namespace CGraph; diff --git a/tutorial/TU04-Timer.cpp b/tutorial/TU04-Timer.cpp index eb2d7d5b..c087d470 100644 --- a/tutorial/TU04-Timer.cpp +++ b/tutorial/TU04-Timer.cpp @@ -6,7 +6,7 @@ @Desc: 本例主要演示，Timer的使用方法 ***************************/ -#include "../src/CGraph.h" +#include "CGraph.h" using namespace CGraph;