diff --git a/doc/tutorial/source/getting-started.rst b/doc/tutorial/source/getting-started.rst index 555c4829a..23011b859 100644 --- a/doc/tutorial/source/getting-started.rst +++ b/doc/tutorial/source/getting-started.rst @@ -96,17 +96,17 @@ get a copy of a release by typing the following into your Linux shell $ cd $ mkdir workspace $ cd workspace - $ wget http://www.nsnam.org/release/ns-allinone-3.24.tar.bz2 - $ tar xjf ns-allinone-3.24.tar.bz2 + $ wget http://www.nsnam.org/release/ns-allinone-3.25.tar.bz2 + $ tar xjf ns-allinone-3.25.tar.bz2 -If you change into the directory ``ns-allinone-3.24`` you should see a +If you change into the directory ``ns-allinone-3.25`` you should see a number of files and directories: :: $ ls - bake constants.py ns-3.24 README - build.py netanim-3.106 pybindgen-0.17.0.post41+ngd10fa60 util.py + bake constants.py ns-3.25 README + build.py netanim-3.107 pybindgen-0.17.0.post49+ng0e4e3bc util.py You are now ready to build the base |ns3| distribution and may skip ahead to the section on building |ns3|. @@ -166,10 +166,10 @@ distribution of your choice. There are a few configuration targets available: -1. ``ns-3.24``: the module corresponding to the release; it will download +1. ``ns-3.25``: the module corresponding to the release; it will download components similar to the release tarball. 2. ``ns-3-dev``: a similar module but using the development code tree -3. ``ns-allinone-3.24``: the module that includes other optional features +3. ``ns-allinone-3.25``: the module that includes other optional features such as click routing, openflow for |ns3|, and the Network Simulation Cradle 4. ``ns-3-allinone``: similar to the released version of the allinone @@ -187,7 +187,7 @@ code either by inspection of the repository list or by going to the `"ns-3 Releases" `_ web page and clicking on the latest release link. We'll proceed in -this tutorial example with ``ns-3.24``. +this tutorial example with ``ns-3.25``. We are now going to use the bake tool to pull down the various pieces of |ns3| you will be using. First, we'll say a word about running bake. @@ -213,7 +213,7 @@ full builds of ns-3-allinone (with the optional packages) typically do. Step into the workspace directory and type the following into your shell:: - $ ./bake.py configure -e ns-3.24 + $ ./bake.py configure -e ns-3.25 Next, we'l ask bake to check whether we have enough tools to download various components. Type:: @@ -264,15 +264,15 @@ should yield something like:: >> Searching for system dependency g++ - OK >> Searching for system dependency qt4 - OK >> Downloading pygccxml - OK - >> Downloading netanim-3.106 - OK - >> Downloading pybindgen-0.17.0.post41+ngd10fa60 (target directory:pybindgen) - OK - >> Downloading ns-3.24 - OK + >> Downloading netanim-3.107 - OK + >> Downloading pybindgen-0.17.0.post49+ng0e4e3bc (target directory:pybindgen) - OK + >> Downloading ns-3.25 - OK The above suggests that five sources have been downloaded. Check the ``source`` directory now and type ``ls``; one should see:: $ ls - gccxml netanim-3.106 ns-3.24 pybindgen pygccxml pygccxml-1.0.0.zip + gccxml netanim-3.107 ns-3.25 pybindgen pygccxml pygccxml-1.0.0.zip You are now ready to build the |ns3| distribution. @@ -291,7 +291,7 @@ native |ns3| build system, Waf, to be introduced later in this tutorial. If you downloaded using a tarball you should have a directory called something like -``ns-allinone-3.24`` under your ``~/workspace`` directory. +``ns-allinone-3.25`` under your ``~/workspace`` directory. Type the following:: $ ./build.py --enable-examples --enable-tests @@ -307,35 +307,34 @@ You will see lots of typical compiler output messages displayed as the build script builds the various pieces you downloaded. Eventually you should see the following:: - Waf: Leaving directory `/path/to/workspace/ns-allinone-3.24/ns-3.24/build' + Waf: Leaving directory `/path/to/workspace/ns-allinone-3.25/ns-3.25/build' 'build' finished successfully (6m25.032s) Modules built: - antenna aodv applications - bridge buildings config-store - core csma csma-layout + antenna aodv applications + bridge buildings config-store + core csma csma-layout dsdv dsr energy fd-net-device flow-monitor internet - lr-wpan lte mesh - mobility mpi netanim (no Python) - network nix-vector-routing olsr - point-to-point point-to-point-layout propagation - sixlowpan spectrum stats - tap-bridge test (no Python) topology-read - uan virtual-net-device wave - wifi wimax + internet-apps lr-wpan lte + mesh mobility mpi + netanim (no Python) network nix-vector-routing + olsr openflow (no Python) point-to-point + point-to-point-layout propagation sixlowpan + spectrum stats tap-bridge + test (no Python) topology-read traffic-control + uan virtual-net-device visualizer + wave wifi wimax - Modules not built (see ns-3 tutorial for explanation): - brite click openflow - visualizer +Modules not built (see ns-3 tutorial for explanation): +brite click - Leaving directory `./ns-3.24' + Leaving directory `./ns-3.25' Regarding the portion about modules not built:: Modules not built (see ns-3 tutorial for explanation): - brite click openflow - visualizer + brite click This just means that some |ns3| modules that have dependencies on outside libraries may not have been built, or that the configuration @@ -357,9 +356,9 @@ and you should see something like:: >> Building gccxml-ns3 - OK >> Building pygccxml - OK - >> Building netanim-3.106 - OK - >> Building pybindgen-0.17.0.post41+ngd10fa60 - OK - >> Building ns-3.24 - OK + >> Building netanim-3.107 - OK + >> Building pybindgen-0.17.0.post49+ng0e4e3bc - OK + >> Building ns-3.25 - OK *Hint: you can also perform both steps, download and build, by calling 'bake.py deploy'.* @@ -508,7 +507,7 @@ A command exists for checking which profile is currently active for an already configured project: $ ./waf --check-profile - Waf: Entering directory `/path/to/ns-3-allinone/ns-3.24/build' + Waf: Entering directory `/path/to/ns-3-allinone/ns-3.25/build' Build profile: debug The build.py script discussed above supports also the ``--enable-examples``