doc: update some docs still referring to make

We use ninja now.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>

diff --git a/doc/dev/developer_guide/basic-workflow.rst b/doc/dev/developer_guide/basic-workflow.rst
index 5b7c228dab6800b40d74ddb726232ef8644185e8..9fb2ba2c44e2e04068982a9ee2392f4fce8fd180 100644 (file)
--- a/doc/dev/developer_guide/basic-workflow.rst
+++ b/doc/dev/developer_guide/basic-workflow.rst
@@ -15,7 +15,7 @@ The following chart illustrates the basic Ceph development workflow:
                 | git merge                          |
                 |                                    v
            /----------------\  git commit --amend   /-------------\
-           |  make check    |---------------------> | ceph/fix_1  |
+           | ninja check    |---------------------> | ceph/fix_1  |
            | ceph--qa--suite|                       \-------------/
            \----------------/                        |
                 ^                                    | fix changes

diff --git a/doc/dev/developer_guide/essentials.rst b/doc/dev/developer_guide/essentials.rst
index 94367a809a9360091010b848904565f14a9afaa4..ad3604966ae342f6cc379544ff67c4baefddb753 100644 (file)
--- a/doc/dev/developer_guide/essentials.rst
+++ b/doc/dev/developer_guide/essentials.rst
@@ -180,7 +180,7 @@ Cleaning the Source Tree
 
 .. prompt:: bash $
 
-  make clean
+  ninja clean
   
 .. note:: The following commands will remove everything in the source tree 
           that isn't tracked by git. Make sure to back up your log files 

diff --git a/doc/dev/quick_guide.rst b/doc/dev/quick_guide.rst
index 8e27dfb4b714ebd929db6f7d0997d13fb7b995f2..e78a023d3779aa53d5e4a96510eab8b447548383 100644 (file)
--- a/doc/dev/quick_guide.rst
+++ b/doc/dev/quick_guide.rst
@@ -25,23 +25,42 @@ Example:
    ./install-deps.sh
    ./do_cmake.sh -DWITH_MANPAGE=OFF -DWITH_BABELTRACE=OFF -DWITH_MGR_DASHBOARD_FRONTEND=OFF
 
+You can also turn off building of some core components that are not relevant to
+your development:
+
+.. prompt:: bash $
+
+   ./do_cmake.sh ... -DWITH_RBD=OFF -DWITH_KRBD=OFF -DWITH_RADOSGW=OFF
+
+Finally, build ceph:
+
+.. prompt:: bash $
+
+   cmake --build build [--target <target>...]
+
+Omit ``--target...`` if you want to do a full build.
+
+
 Running a development deployment
 --------------------------------
-Ceph contains a script called ``vstart.sh`` (see also :doc:`/dev/dev_cluster_deployement`) which allows developers to quickly test their code using
-a simple deployment on your development system. Once the build finishes successfully, start the ceph
-deployment using the following command:
+
+Ceph contains a script called ``vstart.sh`` (see also
+:doc:`/dev/dev_cluster_deployement`) which allows developers to quickly test
+their code using a simple deployment on your development system. Once the build
+finishes successfully, start the ceph deployment using the following command:
 
 .. prompt:: bash $
 
-   cd ceph/build  # Assuming this is where you ran cmake
-   make vstart
-   ../src/vstart.sh -d -n -x
+   cd build
+   ../src/vstart.sh -d -n
 
 You can also configure ``vstart.sh`` to use only one monitor and one metadata server by using the following:
 
 .. prompt:: bash $
 
-   MON=1 MDS=1 ../src/vstart.sh -d -n -x
+   env MON=1 MDS=1 ../src/vstart.sh -d -n -x
+
+Most logs from the cluster can be found in ``build/out``.
 
 The system creates two pools on startup: `cephfs_data_a` and `cephfs_metadata_a`.  Let's get some stats on
 the current pools:
@@ -108,7 +127,7 @@ you might do something like this:
 
    ../src/stop.sh
    rm -rf out dev
-   MDS=1 MON=1 OSD=3 ../src/vstart.sh -n -d
+   env MDS=1 MON=1 OSD=3 ../src/vstart.sh -n -d
 
 Running a RadosGW development environment
 -----------------------------------------
@@ -136,5 +155,4 @@ The tests are located in `src/tests`.  To run them type:
 
 .. prompt:: bash $
 
-   make check
-
+   (cd build && ninja check)