FlightGear Git: data developers

Anyone contributing data to FlightGear, like aircraft models, dialogs or textures, is a data developer. This article helps those in setting up a correct workflow, to ease the inclusion of their work into the simulator.

Note about aircraft

As of September 2014, all aircraft but the Cessna 172P and the UFO have been copied over to a new SVN repository. Changes to those aircraft should be made there instead of in the Git fgdata repository discussed in this article.

Preparations

The steps described in this section are only required once, at the initialization of your development environment.

Cloning the repository

The first thing to do as a prospective developer is to register at SourceForge if you haven't already done so. This will enable you to publish your edits and have them incorporated into the main project.

After logging in, you can create a personal "clone" of the data repository. This clone is where you will be working in, without touching the main repository. To create a clone, navigate to the fgdata repository on https://sourceforge.net/p/flightgear/fgdata and click the Fork button. In general the default name is fine, but you can change it to whatever you like. SourceForge will now clone the data repository. Due to the size of our repository, this can take some time.

Obtaining the data

Before you can start editing, you first need to retrieve the data to your computer. There are two ways to do this. At the time of writing the data repository is over 1 GB. Continuing an interrupted cloning of a repository is not supported within Git. <1-- Therefore, if you have a slow or unstable connection to the internet, it is recommended to download the bundle. -->

For both approaches, Git must be installed. There is a lot of software available, but the following are often used:

• Mac: Git for OS X
• Windows: msysGit

Single clone

1. Create a directory on your computer where you'll be storing the data.
2. Change into that folder.
3. Clone the repository with the following command. This will create a /fgdata subfolder and put all the contents of the repository in there.

   git clone http://git.code.sf.net/p/flightgear/fgdata

Authentication

In order to publish edits on SourceForge, you need to generate a secret key so you can be correctly identified.

1. Navigate to your newly created fgdata directory and run:

   ssh-keygen

2. Enter the name of the file in which you prefer to save the key and press Enter.
3. Enter your password/passphrase and press Enter. You'll have to do this twice.
4. Your key is now being generated. Open the .pub file with an editor and copy the content.
5. Visit your account settings at SourceForge and navigate to "SSH settings".
6. Paste the content of the .pub file and press "Save".
7. Now run the following, again in your fgdata directory, with <url> as the line that you get by clicking RW on your fgdata clone page at SourceForge (something like ssh://~you-user-name~@git.code.sf.net/u/~you-user-name~/flightgear):

   git remote set-url origin <url>

Obtaining the simulator

In order to test your work, you'll need the FlightGear version that matches the data. Since FlightGear is under constant development, data from Git does not work with previous releases. Fortunately obtaining the latest development version of the simulator is fairly straightforward for most operating systems.

• Mac: Download the .dmg
• Windows: Download the 32-bits or 64-bits installer and follow its instructions. Let it install the binary into a clean directory.

Point $FG_ROOT to your freshly obtained fgdata directory. When using the launcher, this can be done on the first page, previous from the aircraft selection.

Making edits

It is recommended to split your new fgdata clone into separate local branches for your work. For instance, if you're working on the Boeing 747-400 and the aircraft reflection shader, you might create 2 branches named "747-400" and "reflect-shader". To do this, run the following commands:

git checkout master

git checkout -b <branch name>

Then you can make your changes to the new local branch(es), which will make merge requests easier for both yourself and committers. To switch in between branches, simply use

git checkout <branch name>

Publishing edits

To push local updates to your fgdata clone on SourceForge, perform the following steps:

1. Switch to the branch that contains your edits:

   git checkout <branch name>

2. List all the changed files:

   git status -- .

3. Now it's time to commit the changed files.
   • If you want to commit all changed files, run the following and type your commit message.

     git commit -a

   • If you only want to commit a selection of files, run the following:

     git add <path/to/file> (for single files)

     git add --all <path/to/folder> (to add all files within a certain folder)

     git rm <path/to/file> (to remove files that you've removed)

   Followed by

   git commit -m "<commit message>"

4. Check if everything went fine, by loading Gitk:

   gitk

5. Finally, push the commit to your fgdata clone SourceForge with the following command. Replace YourUID with your SourceForge account. Make sure you have correctly set up the clone as the origin as described under #Authentication.

   git push

Requesting edits to be merged

1. Click the "Request merge" button on your fgdata clone page. Loading the next page can take a while, as it will list all commits of the past years!
2. Once again write a short summary (could be the same as used with git commit), but this time, also write an explanation of your merge request (what does it do?). Make sure you set the target repository to fgdata, target branch to next and source branch to the local branch with your updates.
3. Tick the box in front of your commit and click the "Create merge request" button.
4. Everyone can see the pending request, but in order to make sure that your request gets looked at, you may contact a contributor.

Creating merge requests using this method literally means merging an entire branch into fgdata; this may not be desirable for some situations, such as small changes that only require one little commit. There's a neat method to only push certain commits to a merge request discussed by Anders Gidenstam on the FlightGear Forums.