Skip to content

demo wordcount 修改 #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
chujiangke wants to merge 7 commits into
base: master
Choose a base branch
from
Open

demo wordcount 修改 #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b290843
1 kake 编译demo异常，改用Makefile实现， 代码结构比较清晰， 有利于三方库集成，改为Makefile实现。
Jan 18, 2019
1a1729f
Makefile 文件
Jan 18, 2019
b40e17c
优化项目结构整理makefile
Feb 26, 2019
6e679df
bug fix
Feb 27, 2019
65feb63
Merge branch 'master' of https://github.com/chujiangke/hurricane
Feb 27, 2019
b3159de
socket 黏包问题 解决 richard
Apr 9, 2019
a5bf222
makefile change
Apr 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,13 @@ endif
all:
cd deps/logging/target/linux/x64/$(CONFIGURATION)/build;make install
cd deps/meshy/target/linux/x64/$(CONFIGURATION)/build;make install
cd target/linux/x64/$(HURRICANE_CONFIGURATION)/build;make install

#cd target/linux/x64/$(HURRICANE_CONFIGURATION)/build;make all; make install
cd src/sample/President;make all
cd src/sample/Manager;make all
clean:
cd target/linux/x64/$(HURRICANE_CONFIGURATION)/build;make clean
cd deps/meshy/target/linux/x64/$(CONFIGURATION)/build;make clean
cd deps/logging/target/linux/x64/$(CONFIGURATION)/build;make clean
cd src/sample/President;make all
cd src/sample/Manager;make all


148 changes: 0 additions & 148 deletions src/hurricane/bolt/JavaBolt.cpp
View file
Open in desktop

This file was deleted.

52 changes: 0 additions & 52 deletions src/hurricane/collector/JavaOutputCollector.cpp
View file
Open in desktop

This file was deleted.

97 changes: 0 additions & 97 deletions src/hurricane/collector/JavaOutputCollector.jni.cpp
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion src/hurricane/service/Manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ Manager::Manager(const hurricane::util::Configuration& configuration) :

void Manager::InitPresidentConnector()
{
hurricane::base::NetAddress presidentAddress(_managerConfiguration->GetProperty(CONF_KEY_PRESIDENT_PORT),
hurricane::base::NetAddress presidentAddress(_managerConfiguration->GetProperty(CONF_KEY_PRESIDENT_HOST),
_managerConfiguration->GetIntegerProperty(CONF_KEY_PRESIDENT_PORT));
_presidentConnector = new hurricane::util::NetConnector(presidentAddress);
_presidentClient = new hurricane::message::CommandClient(_presidentConnector);
Expand Down
Loading