Skip to content

Commit

Permalink
Modify copyright in LICENSE and add guide for contributor (#584)
Browse files Browse the repository at this point in the history
- Add "and other contributors" in license
- Specify years with '-present'
- Check copyright in check_license
- Add guide in Getting-involved document

IoT.js-DCO-1.0-Signed-off-by: Sanggyu Lee sg5.lee@samsung.com
  • Loading branch information
Sanggyu Lee authored and yichoi committed Dec 14, 2016
1 parent 7e2506e commit 8cfaeab
Show file tree
Hide file tree
Showing 265 changed files with 414 additions and 277 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2015 Samsung Electronics Co., Ltd.
# Copyright 2015-present Samsung Electronics Co., Ltd. and other contributors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright 2015 Samsung Electronics Co., Ltd.
Copyright 2015-present Samsung Electronics Co., Ltd. and other contributors

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ For Additional information see [Getting Started](docs/Getting-Started.md).
## License
IoT.js is Open Source software under the [Apache 2.0 license](https://www.apache.org/licenses/LICENSE-2.0). Complete license and copyright information can be found within the code.

> Copyright 2015-2016 Samsung Electronics Co., Ltd.
> Copyright 2015-present Samsung Electronics Co., Ltd. and other contributors
> Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
Expand Down
2 changes: 1 addition & 1 deletion cmake/config.cmake
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2015-2016 Samsung Electronics Co., Ltd.
# Copyright 2015-present Samsung Electronics Co., Ltd. and other contributors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion cmake/config/arm-linux.cmake
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2015-2016 Samsung Electronics Co., Ltd.
# Copyright 2015-present Samsung Electronics Co., Ltd. and other contributors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion cmake/config/arm-nuttx.cmake
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2015 Samsung Electronics Co., Ltd.
# Copyright 2015-present Samsung Electronics Co., Ltd. and other contributors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion cmake/config/i686-linux.cmake
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2015 Samsung Electronics Co., Ltd.
# Copyright 2015-present Samsung Electronics Co., Ltd. and other contributors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion cmake/config/x86_64-darwin.cmake
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2015 Samsung Electronics Co., Ltd.
# Copyright 2015-present Samsung Electronics Co., Ltd. and other contributors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion cmake/config/x86_64-linux.cmake
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2015 Samsung Electronics Co., Ltd.
# Copyright 2015-present Samsung Electronics Co., Ltd. and other contributors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion cmake/http-parser.cmake
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2015 Samsung Electronics Co., Ltd.
# Copyright 2015-present Samsung Electronics Co., Ltd. and other contributors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion cmake/iotjs.cmake
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2015-2016 Samsung Electronics Co., Ltd.
# Copyright 2015-present Samsung Electronics Co., Ltd. and other contributors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion cmake/jerry.cmake
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2015 Samsung Electronics Co., Ltd.
# Copyright 2015-present Samsung Electronics Co., Ltd. and other contributors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion cmake/libtuv.cmake
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2015 Samsung Electronics Co., Ltd.
# Copyright 2015-present Samsung Electronics Co., Ltd. and other contributors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
69 changes: 69 additions & 0 deletions docs/Development-Process.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
* [Proposals, Get Answers and Report a Bug via Github Issues](#proposals-get-answers-and-report-a-bug-via-github-issues)
* [Feature development process](#feature-development-process)
* [Approval Path for PR(Pull Request)](#approval-path-for-prpull-request)
* [Tips on GitHub Issues](#tips-on-github-issues)

***

It is the responsibility of IoT.js Maintainers and Reviewers to decide whether submitted code should be integrated into the master branch, returned for revision, or rejected.

Individual developers maintain a local copy of the IoT.js codebase using the git revision control system. Git ensures that all participants are working with a common and up-to-date code base at all times. Each developer works to develop, debug, build, and validate their own code against the current codebase, so that when the time comes to integrate into the master branch of the project, their changes apply cleanly and with a minimum amount of merging effort.

### Proposals, Get Answers and Report a Bug via Github Issues

If you have a question about IoT.js code, have trouble any documentation, would like to suggest new feature, or find a bug, [review the current IoT.js issues](https://github.com/Samsung/iotjs/issues) in GitHub, and if necessary, [create a new issue](https://github.com/Samsung/IoT.js/issues/new).

**There are several labels on the Issue. Please choose proper labels on the purpose.**
* **bug**
* **community** : any issues on the community operation
* **enhancement** : feature enhancement proposal
* **help wanted**
* **new feature request(proposal)** : new feature proposal
* **project announcement** : general announcement on the project such as new release, new Maintainer/Reviewer and so on
* **question** : any questions on the project

and so on.

### Feature development process

The IoT.js Project development process is marked by the following highlights:
* The feature development process starts with an author discussing a proposed feature with the Maintainers and Reviewers
- Open the issue with label 'new feature request(proposal)'
* The Maintainers and Reviewers evaluate the idea, give feedback, and finally approve or reject the proposal.
* The author shares the proposal with the community via **_Github issues with 'new feature request' label_**
* The community provides feedback which can be used by the author to modify their proposal and share it with the community again.
* The above steps are repeated until the community reaches a consensus according to the [Community Guidelines](Community-Guidelines).
* After a consensus is reached, the author proceeds with the implementation and testing of the feature.
* After the author is confident their code is ready for integration:
- The author generates a patch and signs off on their code.
- The author submits a patch according to the [Patch Submission Process](Patch-Submission-Process).
* The Maintainers and Reviewers watch the pull request for the patch, test the code, and accept or reject the patch accordingly.
* After the code passes code review, the Maintainers and Reviewers accept the code(integrated into the master branch), which completes the development process.
* After a patch has been accepted, it remains the authoring developer's responsibility to maintain the code throughout its lifecycle, and to provide security and feature updates as needed.

### Approval Path for PR(Pull Request)
1. Developer should create/update PR to a given issue or enhancement
2. If Developer works in a team, then peer-review by a colleague developer should be performed
3. If peer-review was OK, then Developer should summon the component's maintainer
4. Maintainer should check the code:
- make precommit testing is OK (performed automatically)
- No minor issues (unified implementation style, comments, etc.)
- No major issues (memory leak, crashes, breakage of ECMA logic, etc.)
5. If Developer has to rework the solution then goto step 3
6. If everything is OK, then Maintainer should approve the PR with +1(or LGTM)
- Code review can be performed by all the members of the project. However only Maintainer can give binding scores.
7. When the PR get +2(2 LGTM from 2 mainatiners respectively), it should be merged.

### Tips on GitHub Issues

* Check existing [IoT.js issues](https://github.com/Samsung/IoT.js/issues) for the answer to your issue.
Duplicating an issue slows you and others. Search through open and closed issues to see if the problem you are running into has already been addressed.
* If necessary, [open a new issue](https://github.com/Samsung/IoT.js/issues/new).
- Clearly describe the issue.
+ What did you expect to happen?
+ What actually happened instead?
+ How can someone else recreate the problem?
- Include system details(such as the hardware, library, and operating system you are using and their versions).
- Paste error output and logs in the issue or in a Gist(https://gist.github.com/).

For more information about GitHub issues, refer to the [GitHub issues guidelines](https://guides.github.com/features/issues/).
12 changes: 12 additions & 0 deletions docs/Getting-involved.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
To contribute to the IoT.js Project (such as reporting bugs and submitting patches):
* Follow the [Development Process](Development-Process.md) and [GitHub contributor guidelines](https://guides.github.com/activities/contributing-to-open-source/).
* Add the [IoT.js DCO](IoT.js-Developer's-Certificate-of-Origin-1.0.md) signoff to each commit message during development.
* Add the [License](License.md) if you introduce any new source code or script files

### [Community Guideline](Community-Guidelines)
### [IoT.js Developer's Certificate of Origin 1.0](IoT.js-Developer's-Certificate-of-Origin-1.0)
### [Coding Style Guideline](Coding-Style-Guideline)
### [Inside IoT.js](https://github.com/Samsung/iotjs/wiki/Inside%20IoT.js)
### [Development Process](Development-Process)
### [Patch Submission Process](Patch-Submission-Process)
### [Governance](Governance)
42 changes: 42 additions & 0 deletions docs/IoT.js-Developer's-Certificate-of-Origin-1.0.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
The IoT.js project uses the signed-off-by language and process, to give us a clear chain of trust for every patch received.

> By making a contribution to this project, I certify that:
> (a) The contribution was created in whole or in part by me and I have the right to submit it under the open source license indicated in the file; or
> (b) The contribution is based upon previous work that, to the best of my knowledge, is covered under an appropriate open source license and I have the right under that license to submit that work with modifications, whether created in whole or in part by me, under the same open source license (unless I am permitted to submit under a different license), as indicated in the file; or
> (c) The contribution was provided directly to me by some other person who certified (a), (b) or (c) and I have not modified it.
> (d) I understand and agree that this project and the contribution are public and that a record of the contribution (including all personal information I submit with it, including my sign-off) is maintained indefinitely and may be redistributed consistent with this project, under the same open source license.

### Using the Signed-Off-By Process

We have the same requirements for using the signed-off-by process as the Linux kernel. In short, you need to include a signed-off-by tag in every patch:

"Signed-off-by:" this is a developer's certification that he or she has the right to submit the patch for inclusion into the project. It is an agreement to the Developer's Certificate of Origin (above). **Code without a proper signoff cannot be merged into the mainline.**

You should use your real name and email address in the format below:

> IoT.js-DCO-1.0-Signed-off-by: Random J Developer random@developer.example.org

#### How to add DCO every single commit automatically.

It is easy to forget adding DCO end of every commit message. Fortunately there is a nice way to do it automatically. Once you've clone the repository into your local machine, you can add `prepare commit message hook` in `.git/hooks` directory like this:

```
#!/usr/bin/env python
import sys
commit_msg_filepath = sys.argv[1]
with open(commit_msg_filepath, "r+") as f:
content = f.read()
f.seek(0, 0)
f.write("%s\n\nIoT.js-DCO-1.0-Signed-off-by: <Your Name> <Your Email>" % content)
```

Please refer [Git Hooks](http://git-scm.com/book/en/v2/Customizing-Git-Git-Hooks) for more information.
14 changes: 14 additions & 0 deletions docs/License.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
### Introduce License Policy

IoT.js is open source software under the [Apache 2.0 license](https://www.apache.org/licenses/LICENSE-2.0). Complete license and copyright information can be found within the code.

> Copyright 2015-present Samsung Electronics Co., Ltd. and other contributors
> Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
[IoT.js Developer's Certificate of Origin 1.0](IoT.js-Developer's-Certificate-of-Origin-1.0) applies from _15th June in 2015_

### Open Source Software

The following Open Source software supports IoT.js:
* **_[libuv](https://github.com/libuv/libuv)_** licensed under [MIT License](http://opensource.org/licenses/MIT)
2 changes: 1 addition & 1 deletion include/iotjs.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright 2015 Samsung Electronics Co., Ltd.
/* Copyright 2015-present Samsung Electronics Co., Ltd. and other contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion iotjs_linux.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright 2015 Samsung Electronics Co., Ltd.
/* Copyright 2015-present Samsung Electronics Co., Ltd. and other contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/iotjs.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright 2015-2016 Samsung Electronics Co., Ltd.
/* Copyright 2015-present Samsung Electronics Co., Ltd. and other contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/iotjs_binding.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright 2015-2016 Samsung Electronics Co., Ltd.
/* Copyright 2015-present Samsung Electronics Co., Ltd. and other contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/iotjs_binding.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright 2015-2016 Samsung Electronics Co., Ltd.
/* Copyright 2015-present Samsung Electronics Co., Ltd. and other contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/iotjs_binding_helper.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright 2015-2016 Samsung Electronics Co., Ltd.
/* Copyright 2015-present Samsung Electronics Co., Ltd. and other contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/iotjs_binding_helper.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright 2015-2016 Samsung Electronics Co., Ltd.
/* Copyright 2015-present Samsung Electronics Co., Ltd. and other contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/iotjs_debuglog.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright 2015-2016 Samsung Electronics Co., Ltd.
/* Copyright 2015-present Samsung Electronics Co., Ltd. and other contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/iotjs_debuglog.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright 2015-2016 Samsung Electronics Co., Ltd.
/* Copyright 2015-present Samsung Electronics Co., Ltd. and other contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/iotjs_def.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright 2015-2016 Samsung Electronics Co., Ltd.
/* Copyright 2015-present Samsung Electronics Co., Ltd. and other contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/iotjs_env.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright 2015-2016 Samsung Electronics Co., Ltd.
/* Copyright 2015-present Samsung Electronics Co., Ltd. and other contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/iotjs_env.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright 2015-2016 Samsung Electronics Co., Ltd.
/* Copyright 2015-present Samsung Electronics Co., Ltd. and other contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/iotjs_exception.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright 2015 Samsung Electronics Co., Ltd.
/* Copyright 2015-present Samsung Electronics Co., Ltd. and other contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/iotjs_exception.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright 2015-2016 Samsung Electronics Co., Ltd.
/* Copyright 2015-present Samsung Electronics Co., Ltd. and other contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/iotjs_handlewrap.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright 2015-2016 Samsung Electronics Co., Ltd.
/* Copyright 2015-present Samsung Electronics Co., Ltd. and other contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/iotjs_handlewrap.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright 2015-2016 Samsung Electronics Co., Ltd.
/* Copyright 2015-present Samsung Electronics Co., Ltd. and other contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/iotjs_module.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright 2015-2016 Samsung Electronics Co., Ltd.
/* Copyright 2015-present Samsung Electronics Co., Ltd. and other contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/iotjs_module.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright 2015-2016 Samsung Electronics Co., Ltd.
/* Copyright 2015-present Samsung Electronics Co., Ltd. and other contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/iotjs_objectwrap.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright 2015-2016 Samsung Electronics Co., Ltd.
/* Copyright 2015-present Samsung Electronics Co., Ltd. and other contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/iotjs_objectwrap.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright 2015-2016 Samsung Electronics Co., Ltd.
/* Copyright 2015-present Samsung Electronics Co., Ltd. and other contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/iotjs_reqwrap.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright 2015-2016 Samsung Electronics Co., Ltd.
/* Copyright 2015-present Samsung Electronics Co., Ltd. and other contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Loading

0 comments on commit 8cfaeab

Please sign in to comment.