| commit | ab67810566db391867f0a3e1a03912c33fe8059e | [log] [tgz] |
|---|---|---|
| author | Jordan Bayles <jophba@chromium.org> | Tue Jan 29 13:54:27 2019 -0800 |
| committer | Commit Bot <commit-bot@chromium.org> | Thu Jan 31 22:46:42 2019 +0000 |
| tree | 0d64645ba1e4c73d5fa886d1593d5921fe9883f3 | |
| parent | 5537e7ee10a1e97dde0805071ef6a5c53024a388 [diff] |
Update usage of ErrorOr in openscreen This patch includes changes that make the usage of the ErrorOr type more widespread throughout our codebase. Currently, we only have a few example of this class, however there are multiple opportunities for its use elsewhere. NOTE: this patch mostly leaves alone the api/public services, specifically the following classes are left using bool: codegen (Write*) mdns_responder_service (Handle*Event) quic_client (Start, Stop) quic_server (Start, Stop, Suspend, Resume) service_listener, _impl (Start, Stop, ...) service_publisher, _impl (Start, Stop, ....) Bug: openscreen:26 Change-Id: I558b61a29046a263014e295958059d979cdca67e Reviewed-on: https://chromium-review.googlesource.com/c/1443817 Commit-Queue: Jordan Bayles <jophba@chromium.org> Reviewed-by: mark a. foltz <mfoltz@chromium.org>
This library implements the Open Screen Protocol. Information about the protocol can be found in the Open Screen GitHub repository.
Open Screen uses LUCI builders to monitor the build and test health of the library.
Coming soon: tryjob and submit queue integration with Gerrit code review.
Open Screen Library code should follow the Open Screen Library Style Guide. In addition, you should also run //PRESUBMIT.sh before uploading changes for review (which primarily checks formatting).
Run ./tools/install-build-tools.sh from the root source directory to obtain a copy of the following build tools:
Build file generator: gn
Code formatter: clang-format
Builder: ninja
You also need to ensure that you have the compiler toolchain dependencies. Currently, both Linux and Mac OS X build configurations use clang. On Linux, we download the Clang compiler from the Google storage cache, the same way that Chromium does it. On Mac OS X, we just use the clang instance provided by XCode.
On Mac, ensure XCode is installed. On Linux, ensure that libstdc++ 8 is installed, as clang depends on the system instance of it. On Debian flavors, you can run:
sudo apt-get install libstdc++-8-dev
Finally, Passing the “is_gcc=true” flag on Linux enables building using gcc instead. Note that g++ must be installed.
After checking out the Open Screen library, make sure to initialize the submodules for the dependencies. The following commands will checkout all the necessary submodules:
git submodule init
git submodule update
The following commands will build the current example executable and run it.
./gn gen out/Default # Creates the build directory and necessary ninja files ninja -C out/Default # Builds the executable with ninja ./out/Default/hello # Runs the executable
The -C argument to ninja works just like it does for GNU Make: it specifies the working directory for the build. So the same could be done as follows:
./gn gen out/Default cd out/Default ninja ./hello
After editing a file, only ninja needs to be rerun, not gn.
The following sections contain some tips about dealing with Gerrit for code reviews, specifically when pushing patches for review.
There is official Gerrit documentation for this which essentially amounts to:
git push origin HEAD:refs/for/master
You may also wish to install the Change-Id commit-msg hook. This adds a Change-Id line to each commit message locally, which Gerrit uses to track changes. Once installed, this can be toggled with git config gerrit.createChangeId <true|false>.
To download the commit-msg hook for the Open Screen repository, use the following command:
curl -Lo .git/hooks/commit-msg https://chromium-review.googlesource.com/tools/hooks/commit-msg
Gerrit keeps track of changes using a Change-Id line in each commit.
When there is no Change-Id line, Gerrit creates a new Change-Id for the commit, and therefore a new change. Gerrit's documentation for replacing a change describes this. So if you want to upload a new patchset to an existing review, it should contain the matching Change-Id line in the commit message.
By default, each commit to your local branch will get its own Gerrit change when pushed, unless it has a Change-Id corresponding to an existing review.
If you need to modify commits on your local branch to ensure they have the correct Change-Id, you can do one of two things:
After committing to the local branch, run:
git commit --amend git show
to attach the current Change-Id to the most recent commit. Check that the correct one was inserted by comparing it with the one shown on chromium-review.googlesource.com for the existing review.
If you have made multiple local commits, you can squash them all into a single commit with the correct Change-Id:
git rebase -i HEAD~4 git show
where ‘4’ means that you want to squash three additional commits onto an existing commit that has been uploaded for review.