Skip to content

Commit 4ce3a90

Browse files
committed
Merged in github_2 (pull request #575)
GitHub - part 2 (SDFormat) Approved-by: Steve Peters <scpeters@osrfoundation.org>
2 parents 57f6b81 + 9163818 commit 4ce3a90

File tree

12 files changed

+33
-34
lines changed

12 files changed

+33
-34
lines changed

guided_a/tutorial1.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ SDF is an XML file format that describes worlds used by simulators
7171
such as Gazebo. The SDF library is used to parse these files and provide a
7272
C++ interface.
7373

74-
* Source code: [https://bitbucket.org/osrf/sdformat](https://bitbucket.org/osrf/sdformat)
74+
* Source code: [https://github.com/osrf/sdformat](https://github.com/osrf/sdformat)
7575

7676
## Ignition Math
7777

guided_a/tutorial5.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ requests for each repository. Here are the links to the issue lists
1717
for each Gazebo-related repository:
1818

1919
* [All Gazebo issues](https://bitbucket.org/osrf/gazebo/issues)
20-
* [All SDFormat issues](https://bitbucket.org/osrf/sdformat/issues)
20+
* [All SDFormat issues](https://github.com/osrf/sdformat/issues)
2121
* [All Ignition Math issues](https://bitbucket.org/ignitionrobotics/ign-math/issues)
2222
* [All Ignition Transport issues](https://bitbucket.org/ignitionrobotics/ign-transport/issues)
2323
* [All Ignition Messages issues](https://bitbucket.org/ignitionrobotics/ign-msgs/issues)
@@ -30,7 +30,7 @@ issues for first time contributors like you ;) Take a look at the list and see
3030
if you find anything that's interesting to you.
3131

3232
* [Gazebo issues for new developers](https://bitbucket.org/osrf/gazebo/issues?q=issuefornewdevelopers)
33-
* [SDFormat issues for new developers](https://bitbucket.org/osrf/sdformat/issues?q=issuefornewdevelopers)
33+
* [SDFormat issues for new developers](https://github.com/osrf/sdformat/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22)
3434
* [Ignition Math issues for new developers](https://bitbucket.org/ignitionrobotics/ign-math/issues?q=issuefornewdevelopers)
3535
* [Ignition Transport issues for new developers](https://bitbucket.org/ignitionrobotics/ign-transport/issues?q=issuefornewdevelopers)
3636
* [Ignition Messages issues for new developers](https://bitbucket.org/ignitionrobotics/ign-msgs/issues?q=issuefornewdevelopers)

install_dependencies_from_source/tutorial-8.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,10 +162,10 @@ Gazebo depends on the SDFormat package.
162162

163163
1. Clone the repository into a directory and go into it:
164164

165-
hg clone https://bitbucket.org/osrf/sdformat /tmp/sdformat
165+
git clone https://github.com/osrf/sdformat /tmp/sdformat
166166
cd /tmp/sdformat
167167

168-
**Note:** the `default` branch is the development branch where you'll find
168+
**Note:** the `master` branch is the development branch where you'll find
169169
the bleeding edge code, your cloned repository should be on this branch by
170170
default but we recommend you switch to branch `sdf4` if you desire more
171171
stability

install_dependencies_from_source/tutorial.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -278,13 +278,13 @@ Gazebo depends on the SDFormat package.
278278

279279
1. Clone the repository into a directory and go into it:
280280

281-
hg clone https://bitbucket.org/osrf/sdformat /tmp/sdformat
281+
git clone https://github.com/osrf/sdformat /tmp/sdformat
282282
cd /tmp/sdformat
283283

284284
1. Checkout the corresponding branch for a target Gazebo version:
285285
(e.g. `sdf6` for Gazebo 10)
286286

287-
hg up sdf6
287+
git checkout sdf6
288288

289289
1. Create a build directory and go there:
290290

install_from_source/tutorial_8.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ cd ${WS}/src
250250
git clone https://github.com/ros/catkin.git
251251
git clone https://github.com/bulletphysics/bullet3.git
252252
git clone https://github.com/dartsim/dart.git
253-
hg clone https://bitbucket.org/osrf/sdformat
253+
git clone https://github.com/osrf/sdformat
254254
hg clone https://bitbucket.org/osrf/gazebo
255255
~~~
256256

install_from_source/tutorial_default.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ cd ${WS}/src
252252
git clone https://github.com/ros/catkin.git
253253
git clone https://github.com/bulletphysics/bullet3.git
254254
git clone https://github.com/dartsim/dart.git
255-
hg clone https://bitbucket.org/osrf/sdformat
255+
git clone https://github.com/osrf/sdformat
256256
hg clone https://bitbucket.org/osrf/gazebo
257257
~~~
258258

install_from_source/tutorial_old.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,10 +109,10 @@ Gazebo depends on the SDFormat package. Let's build it, then build Gazebo off of
109109

110110
1. Clone the repository into a directory and go into it:
111111

112-
hg clone https://bitbucket.org/osrf/sdformat /tmp/sdformat
112+
git clone https://github.com/osrf/sdformat /tmp/sdformat
113113
cd /tmp/sdformat
114114

115-
**Note:** the `default` branch is the development branch where you'll find
115+
**Note:** the `master` branch is the development branch where you'll find
116116
the bleeding edge code, your cloned repository should be on this branch by
117117
default but we recommend you switch to branch `sdf3` if you desire more
118118
stability
@@ -255,7 +255,7 @@ cd ${WS}/src
255255
git clone https://github.com/ros/catkin.git
256256
git clone https://github.com/bulletphysics/bullet3.git
257257
git clone https://github.com/dartsim/dart.git
258-
hg clone https://bitbucket.org/osrf/sdformat
258+
git clone https://github.com/osrf/sdformat
259259
hg clone https://bitbucket.org/osrf/gazebo
260260
~~~
261261

install_old_versions/tutorial_1-9.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212

1313
# Gazebo/ROS integration
1414

15-
With the release of gazebo 2.0 version (as gazebo_current package) there are some [important aspects of gazebo integration into ROS](http://gazebosim.org/tutorials?cat=connect_ros) that must be read before continue.
15+
With the release of gazebo 2.0 version (as gazebo_current package) there are some [important aspects of gazebo integration into ROS](http://gazebosim.org/tutorials?cat=connect_ros) that must be read before continue.
1616

1717
# Pre-compiled binaries
1818

1919
### Ubuntu Debians
2020

21-
1. Configure your Ubuntu repositories to allow "restricted," "universe," and "multiverse." You can follow the [Ubuntu guide](https://help.ubuntu.com/community/Repositories/Ubuntu) for instructions on doing this. (Note: These are enabled by default In Ubuntu 9.04 (Jaunty) and later.)
21+
1. Configure your Ubuntu repositories to allow "restricted," "universe," and "multiverse." You can follow the [Ubuntu guide](https://help.ubuntu.com/community/Repositories/Ubuntu) for instructions on doing this. (Note: These are enabled by default In Ubuntu 9.04 (Jaunty) and later.)
2222

2323
1. Setup your computer to accept software from packages.osrfoundation.org.
2424

@@ -107,12 +107,12 @@ To install from source, you should first install the SDFormat package, then buil
107107

108108
mkdir ~/gazebo_source
109109
cd ~/gazebo_source/
110-
hg clone https://bitbucket.org/osrf/sdformat
110+
git clone https://github.com/osrf/sdformat
111111

112112
1. Change directory into the sdformat repository and switch to the 1.4 branch
113113

114114
cd sdformat
115-
hg up sdf_1.4
115+
git checkout sdf_1.4
116116

117117
*Note: the `default` branch is the development branch where you'll find the bleeding edge code, your cloned repository should be on this branch by default but we recommend you switch to the 1.4 branch if you desire more stability*
118118

@@ -147,19 +147,19 @@ To install from source, you should first install the SDFormat package, then buil
147147
cd build
148148

149149
1. Configure Gazebo (choose either method `a` or `b` below)
150-
150+
151151
> a. Release mode: This will generate optimized code, but will not have debug symbols. Use this mode if you don't need to use GDB.
152-
152+
153153
> cmake ../
154-
154+
155155
> Note: A big part of the compilation is the test suite. If it is useful to temporary disable it during the development, you can use:
156156
157157
> cmake ../ -DENABLE_TESTS_COMPILATION:BOOL=False
158-
158+
159159
> b. Debug mode: This will generate code with debug symbols. Gazebo will run slower, but you'll be able to use GDB.
160-
160+
161161
> cmake -DCMAKE_BUILD_TYPE=Debug ../
162-
162+
163163
1. The output from `cmake ../` may generate a number of errors and warnings about missing packages. You must install the missing packages that have errors and re-run `cmake ../`. Make sure all the build errors are resolved before continuing (they should be there from the earlier step in which you installed prerequisites). Warnings alert of optional packages that are missing.
164164

165165
1. Make note of your install path, which is output from `cmake` and should look like:
@@ -203,7 +203,7 @@ To install from source, you should first install the SDFormat package, then buil
203203

204204
, then `/usr/local/lib` is not in load path (default behavior for Ubuntu). Run the following commands and then try running gazebo again:
205205

206-
echo '/usr/local/lib' | sudo tee /etc/ld.so.conf.d/gazebo.conf
206+
echo '/usr/local/lib' | sudo tee /etc/ld.so.conf.d/gazebo.conf
207207
sudo ldconfig
208208

209209
1. If you are interested in using Gazebo with [ROS](http://www.ros.org), see (Installing gazebo_ros_pkgs](http://gazebosim.org/tutorials?cat=connect_ros).

install_old_versions/tutorial_2-2.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,14 +133,14 @@ To install from source, you should first install the SDFormat package, then buil
133133

134134
mkdir ~/gazebo_source
135135
cd ~/gazebo_source/
136-
hg clone https://bitbucket.org/osrf/sdformat
136+
git clone https://github.com/osrf/sdformat
137137

138138
1. Change directory into the sdformat repository and switch to the 1.4 branch
139139

140140
cd sdformat
141-
hg up sdf_1.4
141+
git checkout sdf_1.4
142142

143-
**Note: the `default` branch is the development branch where you'll find the bleeding edge code, your cloned repository should be on this branch by default but we recommend you switch to the 1.4 branch if you desire more stability**
143+
**Note: the `master` branch is the development branch where you'll find the bleeding edge code, your cloned repository should be on this branch by default but we recommend you switch to the 1.4 branch if you desire more stability**
144144

145145
1. Create a build directory and go there
146146

install_old_versions/tutorial_3-0.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,14 +142,14 @@ To install from source, you should first install the SDFormat package, then buil
142142

143143
mkdir ~/gazebo_source
144144
cd ~/gazebo_source/
145-
hg clone https://bitbucket.org/osrf/sdformat
145+
git clone https://github.com/osrf/sdformat
146146

147147
1. Change directory into the sdformat repository and switch to the 2.0 branch
148148

149149
cd sdformat
150-
hg up sdf_2.0
150+
git checkout sdf_2.0
151151

152-
**Note: the `default` branch is the development branch where you'll find the bleeding edge code, your cloned repository should be on this branch by default but we recommend you switch to the 2.0 branch if you desire more stability**
152+
**Note: the `master` branch is the development branch where you'll find the bleeding edge code, your cloned repository should be on this branch by default but we recommend you switch to the 2.0 branch if you desire more stability**
153153

154154
1. Create a build directory and go there
155155

0 commit comments

Comments
 (0)