block direct connections to .onion domains (RFC7687)

[apt.git] / README.md

diff --git a/README.md b/README.md
index 40bb6998da2b4a54e9d45ae2d4e96b38092f61e7..1c10197130515421de5f2bd1e3fdcba25e49570f 100644 (file)
--- a/README.md
+++ b/README.md
@@ -38,19 +38,28 @@ APT is maintained in git, the official repository being located at
 `git://anonscm.debian.org/apt/apt.git` ([webgit](http://anonscm.debian.org/gitweb/?p=apt/apt.git)),
 but also available at other locations like [GitHub](https://github.com/Debian/apt).
 
 `git://anonscm.debian.org/apt/apt.git` ([webgit](http://anonscm.debian.org/gitweb/?p=apt/apt.git)),
 but also available at other locations like [GitHub](https://github.com/Debian/apt).
 

-The default branch is `debian/sid`, other branches targeted at different
+The default branch is `master`, other branches targeted at different

 derivatives and releases being used as needed. Various topic branches in
 different stages of completion might be branched of from those, which you
 are encouraged to do as well.
 
 ### Coding
 
 derivatives and releases being used as needed. Various topic branches in
 different stages of completion might be branched of from those, which you
 are encouraged to do as well.
 
 ### Coding
 

-APT uses its own autoconf based build system, see [README.make](http://anonscm.debian.org/gitweb/?p=apt/apt.git;a=blob;f=README.make)
-for the glory details, but to get started, just run:
+APT uses cmake. To start building, you need to run

 
 

-       $ make
+       cmake <path to source directory>

 
 

-from a fresh git checkout.
+from a build directory. For example, if you want to build in the source tree,
+run:
+
+       cmake .
+
+Then you can use make as you normally would (pass -j <count> to perform <count>
+jobs in parallel).
+
+You can also use the Ninja generator of cmake, to do that pass
+       -G Ninja
+to the cmake invocation, and then use ninja instead of make.

 
 The source code uses in most parts a relatively uncommon indent convention,
 namely 3 spaces with 8 space tab (see [doc/style.txt](http://anonscm.debian.org/gitweb/?p=apt/apt.git;a=blob;f=doc/style.txt) for more on this).
 
 The source code uses in most parts a relatively uncommon indent convention,
 namely 3 spaces with 8 space tab (see [doc/style.txt](http://anonscm.debian.org/gitweb/?p=apt/apt.git;a=blob;f=doc/style.txt) for more on this).


@@ -86,12 +95,8 @@ Testing
 
 ### Manual execution
 
 
 ### Manual execution
 

-When you make changes and want to run them manually, make sure your
-`$LD_LIBRARY_PATH` points to the libraries you have built, e.g. via:
-
-       $ export LD_LIBRARY_PATH=$(pwd)/build/bin
-       $ ./build/bin/apt-get moo
-
+When you make changes and want to run them manually, you can just do so. CMake
+automatically inserts an rpath so the binaries find the correct libraries.

 
 ### Integration tests
 
 
 ### Integration tests