Update readme to use nanopb_generator.py directly
diff --git a/README.md b/README.md
index e82b17c..dac9b9a 100644
--- a/README.md
+++ b/README.md
@@ -27,44 +27,23 @@
README.txt in that folder.
+Generating the headers
+----------------------
+Protocol Buffers messages are defined in a `.proto` file, which follows a standard
+format that is compatible with all Protocol Buffers libraries. To use it with nanopb,
+you need to generate `.pb.c` and `.pb.h` files from it:
-Using the Protocol Buffers compiler (protoc)
---------------------------------------------
-The nanopb generator is implemented as a plugin for the Google's own `protoc`
-compiler. This has the advantage that there is no need to reimplement the
-basic parsing of .proto files. However, it does mean that you need the
-Google's protobuf library in order to run the generator.
+ python generator/nanopb_generator.py myprotocol.proto # For source checkout
+ generator-bin/nanopb_generator myprotocol.proto # For binary package
-If you have downloaded a binary package for nanopb (either Windows, Linux or
-Mac OS X version), the `protoc` binary is included in the 'generator-bin'
-folder. In this case, you are ready to go. Simply run this command:
+The binary packages for Windows, Linux and Mac OS X should contain all necessary
+dependencies, including Python, python-protobuf library and protoc. If you are
+using a git checkout or a plain source distribution, you will need to install
+Python separately. Once you have Python, you can install the other dependencies
+with `pip install protobuf grpcio-tools`.
- generator-bin/protoc --nanopb_out=. myprotocol.proto
-
-However, if you are using a git checkout or a plain source distribution, you
-need to provide your own version of `protoc` and the Google's protobuf library.
-On Linux, the necessary packages are `protobuf-compiler` and `python-protobuf`.
-On Windows, you can either build Google's protobuf library from source (see section below) or use
-one of the binary distributions of it. In either case, if you use a separate
-`protoc`, you need to manually give the path to the nanopb generator to the `protoc-gen-nanopb`
-plugin, as follows:
-
- protoc --plugin=protoc-gen-nanopb=nanopb/generator/protoc-gen-nanopb --nanopb_out=. myprotocol.proto
-
-Note that the above `protoc`-based commands are the 1-command versions of a 2-command process, as described in the ["Nanopb: Basic concepts" document under the section "Compiling .proto files for nanopb"](https://jpa.kapsi.fi/nanopb/docs/concepts.html#compiling-proto-files-for-nanopb). Here is the 2-command process:
-
- protoc -omyprotocol.pb myprotocol.proto
- python nanopb/generator/nanopb_generator.py myprotocol.pb
-
-
-
-Building [Google's protobuf library](https://github.com/protocolbuffers/protobuf) from source
----------------------------------------------------------------------------------------------
-When building Google's protobuf library from source, be sure to follow both the C++ installation instructions *and* the Python installation instructions, as *both* are required:
-1. [Protobuf's C++ build & installation instructions](https://github.com/protocolbuffers/protobuf/tree/master/src)
-2. [Protobuf's Python build & installation instructions](https://github.com/protocolbuffers/protobuf/tree/master/python)
-- See additional reading [here](https://github.com/nanopb/nanopb/issues/417#issuecomment-517619517) and [here](https://stackoverflow.com/questions/57367265/how-to-compile-nanopb-proto-file-into-h-and-c-files-using-nanopb-and-protobuf/57367543#57367543).
-
+You can further customize the header generation by creating an `.options` file.
+See [documentation](https://jpa.kapsi.fi/nanopb/docs/concepts.html#modifying-generator-behaviour) for details.
Running the tests
@@ -72,7 +51,8 @@
If you want to perform further development of the nanopb core, or to verify
its functionality using your compiler and platform, you'll want to run the
test suite. The build rules for the test suite are implemented using Scons,
-so you need to have that installed (ex: `sudo apt install scons` on Ubuntu). To run the tests:
+so you need to have that installed (ex: `sudo apt install scons` or `pip install scons`).
+To run the tests:
cd tests
scons
