Skip to content

Commit f51bbbb

Browse files
committed
add copyright
1 parent 31bb503 commit f51bbbb

File tree

4,007 files changed

+9005
-3197
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

4,007 files changed

+9005
-3197
lines changed

.gitignore

+90-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,90 @@
1-
/local.properties
1+
*.iml
2+
.gradle/
3+
/mars/local.properties
4+
.idea/
5+
.DS_Store
6+
build/
7+
/mars/captures
8+
obj/
9+
10+
*.swp
11+
*.pyc
12+
xcuserdata
13+
xcshareddata
14+
15+
/mars/comm/verinfo.h
16+
/mars/libraries/*/
17+
/mars/*/libs/
18+
!/mars/boost/libs/
19+
/samples/iOS/iOSDemo/Kernel/MarsLib/
20+
/samples/iOS/iOSDemoXlog/Kernel/MarsLib/
21+
/samples/Mac/Kernel/MarsLib/
22+
/samples/android/xlogSample/app/src/main/jni/export_include/*.so
23+
24+
#!/mars/libraries/mars_android_sdk/
25+
/mars/app/win32proj/Debug/*.idb
26+
/mars/app/win32proj/Debug/*.log
27+
/mars/app/win32proj/Debug/*.pdb
28+
/mars/app/win32proj/Debug/app.tlog/*.tlog
29+
/mars/app/win32proj/Debug/app.tlog/*.lastbuildstate
30+
/mars/app/win32proj/Debug/*.obj
31+
/mars/baseevent/win32proj/Debug/*.idb
32+
/mars/baseevent/win32proj/Debug/*.log
33+
/mars/baseevent/win32proj/Debug/*.pdb
34+
/mars/baseevent/win32proj/Debug/baseevent.tlog/*.tlog
35+
/mars/baseevent/win32proj/Debug/baseevent.tlog/*.lastbuildstate
36+
/mars/baseevent/win32proj/Debug/baseevent.tlog/*
37+
/mars/baseevent/win32proj/Debug/*.obj
38+
/mars/boost/Debug/*.log
39+
/mars/boost/Debug/boost.tlog/*.tlog
40+
/mars/boost/Debug/boost.tlog/*.lastbuildstate
41+
/mars/boost/Debug/boost.tlog/*
42+
/mars/boost/Debug/*.obj
43+
/mars/boost/Debug/*.idb
44+
/mars/boost/Debug/*.pdb
45+
/mars/comm/win32proj/Debug/*.obj
46+
/mars/comm/win32proj/Debug/*.idb
47+
/mars/comm/win32proj/Debug/*.log
48+
/mars/comm/win32proj/Debug/*.pdb
49+
/mars/comm/win32proj/Debug/comm.tlog/*.tlog
50+
/mars/comm/win32proj/Debug/comm.tlog/*.lastbuildstate
51+
/mars/comm/win32proj/Debug/comm.tlog/*
52+
/mars/log/win32proj/Debug/*.obj
53+
/mars/log/win32proj/Debug/*.idb
54+
/mars/log/win32proj/Debug/*.log
55+
/mars/log/win32proj/Debug/*.pdb
56+
/mars/log/win32proj/Debug/log.tlog/*.tlog
57+
/mars/log/win32proj/Debug/log.tlog/*.lastbuildstate
58+
/mars/log/win32proj/Debug/log.tlog/*
59+
/samples/win32test/Debug/*.obj
60+
/samples/win32test/Debug/*.idb
61+
/samples/win32test/Debug/*.pdb
62+
/samples/win32test/Debug/*.log
63+
/samples/win32test/Debug/*.pch
64+
/samples/win32test/Debug/win32test.tlog/*.tlog
65+
/samples/win32test/Debug/win32test.tlog/*
66+
/samples/win32test/Debug/win32test.tlog/*.lastbuildstate
67+
/mars/sdt/win32proj/Debug/*.idb
68+
/mars/sdt/win32proj/Debug/*.log
69+
/mars/sdt/win32proj/Debug/*.pdb
70+
/mars/sdt/win32proj/Debug/sdt.tlog/*.tlog
71+
/mars/sdt/win32proj/Debug/sdt.tlog/*.lastbuildstate
72+
/mars/sdt/win32proj/Debug/sdt.tlog/*
73+
/mars/stn/win32proj/Debug/*.obj
74+
/mars/stn/win32proj/Debug/*.idb
75+
/mars/stn/win32proj/Debug/*.log
76+
/mars/stn/win32proj/Debug/*.pdb
77+
/mars/stn/win32proj/Debug/stn.tlog/*.tlog
78+
/mars/stn/win32proj/Debug/stn.tlog/*.lastbuildstate
79+
/mars/stn/win32proj/Debug/stn.tlog/*
80+
/mars/win32proj/.vs/v14/*.suo
81+
/mars/win32proj/Debug/*.lib
82+
/mars/win32proj/Debug/*.log
83+
/mars/win32proj/Debug/mars.tlog/*.lastbuildstate
84+
/mars/win32proj/Debug/mars.tlog/*
85+
/mars/win32proj/*.opendb
86+
/mars/win32proj/*.db
87+
/mars/samples/android/marsSampleChat/local.properties
88+
.autotools
89+
.cproject
90+
.project

CONTRIBUTING.md

+62
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
# Contributing to Mars
2+
Welcome to [report Issues](https://github.com/Tencent/mars/issues) or [pull requests](https://github.com/Tencent/mars/pulls). It's recommended to read the following Contributing Guide first before contributing.
3+
4+
## Issues
5+
We use Github Issues to track public bugs and feature requests.
6+
7+
### Search Known Issues First
8+
Please search the existing issues to see if any similar issue or feature request has already been filed. You should make sure your issue isn't redundant.
9+
10+
### Reporting New Issues
11+
If you open an issue, the more information the better. Such as detailed description, screenshot or video of your problem, logcat and xlog or code blocks for your crash.
12+
13+
## Pull Requests
14+
We strongly welcome your pull request to make Mars better.
15+
16+
### Branch Management
17+
There are three main branches here:
18+
19+
1. `master` branch.
20+
1. It is the latest (pre-)release branch. We use `master` for tags, with version number `1.1.0`, `1.2.0`, `1.3.0`...
21+
2. **Don't submit any PR on `master` branch.**
22+
2. `dev` branch.
23+
1. It is our stable developing branch. After full testing, `dev` will be merged to `master` branch for the next release.
24+
2. **You are recommended to submit bugfix or feature PR on `dev` branch.**
25+
3. `hotfix` branch.
26+
1. It is the latest tag version for hot fix. If we accept your pull request, we may just tag with version number `1.1.1`, `1.2.3`.
27+
2. **Only submit urgent PR on `hotfix` branch for next specific release.**
28+
29+
Normal bugfix or feature request should be submitted to `dev` branch. After full testing, we will merge them to `master` branch for the next release.
30+
31+
If you have some urgent bugfixes on a published version, but the `master` branch have already far away with the latest tag version, you can submit a PR on hotfix. And it will be cherry picked to `dev` branch if it is possible.
32+
33+
```
34+
master
35+
36+
dev <--- hotfix PR
37+
38+
feature/bugfix PR
39+
```
40+
41+
### Make Pull Requests
42+
The code team will monitor all pull request, we run some code check and test on it. After all tests passed, we will accecpt this PR. But it won't merge to `master` branch at once, which have some delay.
43+
44+
Before submitting a pull request, please make sure the followings are done:
45+
46+
1. Fork the repo and create your branch from `master` or `hotfix`.
47+
2. Update code or documentation if you have changed APIs.
48+
3. Add the copyright notice to the top of any new files you've added.
49+
4. Check your code lints and checkstyles.
50+
5. Test and test again your code.
51+
6. Now, you can submit your pull request on `dev` or `hotfix` branch.
52+
53+
## Code Style Guide
54+
Use [Code Style for C/C++](http://zh-google-styleguide.readthedocs.io/en/latest/google-cpp-styleguide/).
55+
56+
* 4 spaces for indentation rather than tabs
57+
* private function should start with "__".
58+
* function parameters should start with "_".
59+
60+
## License
61+
By contributing to Mars, you agree that your contributions will be licensed
62+
under its [MIT LICENSE](https://github.com/Tencent/mars/blob/master/LICENSE)

0 commit comments

Comments
 (0)